From 0e4de9bc5099d412d874f4d201b568955091d801 Mon Sep 17 00:00:00 2001
From: Mark Keller <8452750+keller00@users.noreply.github.com>
Date: Wed, 20 Nov 2024 09:15:02 -0800
Subject: [PATCH 1/2] maintainers: add keller00

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e1f60b5be9dd..4b365cf4e071 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11421,6 +11421,12 @@
     githubId = 15373888;
     name = "Claudius Holeksa";
   };
+  keller00 = {
+    name = "Mark Keller";
+    email = "markooo.keller@gmail.com";
+    github = "keller00";
+    githubId = 8452750;
+  };
   kennyballou = {
     email = "kb@devnulllabs.io";
     github = "kennyballou";

From 6229cb20ccf3923682ccac168ca491d5245592b2 Mon Sep 17 00:00:00 2001
From: Mark Keller <8452750+keller00@users.noreply.github.com>
Date: Tue, 19 Nov 2024 23:20:58 -0800
Subject: [PATCH 2/2] aactivator: init at 2.0.0

---
 pkgs/by-name/aa/aactivator/package.nix | 41 ++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/aa/aactivator/package.nix

diff --git a/pkgs/by-name/aa/aactivator/package.nix b/pkgs/by-name/aa/aactivator/package.nix
new file mode 100644
index 000000000000..776b9e2d6dd6
--- /dev/null
+++ b/pkgs/by-name/aa/aactivator/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "aactivator";
+  version = "2.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Yelp";
+    repo = "aactivator";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-vnBDtLEvU1jHbb5/MXAulXaBaugdCZdLQSP2b8P6SiQ=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+    wheel
+  ];
+
+  nativeCheckInputs = with python3Packages; [
+    pytestCheckHook
+    pexpect
+  ];
+
+  disabledTestPaths = [
+    # presumably because of shell manipulations
+    "tests/integration_test.py"
+  ];
+
+  meta = {
+    description = "Automatically activate Python virtualenvs (and other environments)";
+    homepage = "https://github.com/Yelp/aactivator";
+    license = lib.licenses.mit;
+    mainProgram = "aactivator";
+    maintainers = with lib.maintainers; [ keller00 ];
+  };
+}