ansible-dev-shell: fix shell, add extraAnsiblePy argument

flake.nix

@@ -118,7 +118,11 @@
           system = null;
         }).config.system.build.toplevel;
 
-        ansibleDevShell = pkgs.mkAnsibleDevShell {};
+        ansibleDevShell = pkgs.mkAnsibleDevShell { };
+
+        ansibleDevShellExtra = pkgs.mkAnsibleDevShell {
+          extraAnsiblePy = [ "jmespath" ];
+        };
       }
     );
 

overlay.nix

@@ -1,9 +1,9 @@
 final: prev:
   (prev.lib.mapAttrs (pkg: _: prev.callPackage "${./pkgs}/${pkg}" {}) (builtins.readDir ./pkgs)) // {
-    mkAnsibleDevShell = { packages ? [], ... }@args: final.mkShell args // {
+    mkAnsibleDevShell = { extraAnsiblePy ? [], packages ? [], ... }@args: final.mkShell (args // {
       packages = with final; packages ++ [
-        ansible-mgit
+        (ansible-mgit.mkCustom extraAnsiblePy)
         age
       ];
-    };
+    });
   }

pkgs/ansible-mgit/default.nix

@@ -1,22 +1,5 @@
-{ ansible
-, python3
-, python3Packages
-}:
+{ callPackage }:
 
-let
-  extraPy = ps: with ps; [
-    hcloud
-    cryptography
-    pyopenssl
-  ];
-  py = python3.withPackages extraPy;
-in
-ansible.overrideAttrs (a: {
-  name = "${a.name}-MGIT";
-  # add missing hcloud dependency to ansible
-  propagatedBuildInputs = a.propagatedBuildInputs ++ (extraPy python3Packages);
-
-  preFixup = ''
-    makeWrapperArgs+=(--prefix PYTHONPATH : "${py}/${py.sitePackages}")
-  '';
-})
+(callPackage ./package.nix {}) // {
+  mkCustom = extraAnsiblePy: callPackage ./package.nix { inherit extraAnsiblePy; };
+}

pkgs/ansible-mgit/package.nix

@@ -0,0 +1,24 @@
+{ ansible
+, python3
+, python3Packages
+, extraAnsiblePy ? []
+}:
+
+let
+  extraPy = ps: with ps; [
+    hcloud
+    cryptography
+    pyopenssl
+  ] ++ (builtins.map (name: ps.${name}) extraAnsiblePy);
+
+  py = python3.withPackages extraPy;
+in
+ansible.overrideAttrs (a: {
+  name = "${a.name}-MGIT";
+  # add missing hcloud dependency to ansible
+  propagatedBuildInputs = a.propagatedBuildInputs ++ (extraPy python3Packages);
+
+  preFixup = ''
+    makeWrapperArgs+=(--prefix PYTHONPATH : "${py}/${py.sitePackages}")
+  '';
+})