pythonPackages.keystoneauth1: fix missing argparse dep

2 files changed, 28 insertions, 18 deletions

diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix
new file mode 100644
index 000000000000..033f08f9587c
--- /dev/null
+++ b/pkgs/development/python-modules/keystoneauth1/default.nix
@@ -0,0 +1,27 @@
+{ buildPythonPackage, isPyPy, fetchPypi, python
+, pbr, testtools, testresources, testrepository, mock
+, pep8, fixtures, mox3, requests-mock
+, iso8601, requests, six, stevedore, webob, oslo-config
+}:
+
+buildPythonPackage rec {
+  pname = "keystoneauth1";
+  version = "1.1.0";
+  name = "${pname}-${version}";
+  disabled = isPyPy; # a test fails
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05fc6xsp5mal52ijvj84sf7mrw706ihadfdf5mnq9zxn7pfl4118";
+  };
+
+  buildInputs = [ pbr testtools testresources testrepository mock
+                  pep8 fixtures mox3 requests-mock ];
+  propagatedBuildInputs = [ iso8601 requests six stevedore
+                            webob oslo-config ];
+
+  postPatch = ''
+    sed -i 's@python@${python.interpreter}@' .testr.conf
+    substituteInPlace requirements.txt --replace "argparse"
+  '';
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7aac6f2c306c..e85fc22e3b93 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17046,24 +17046,7 @@ in {
     '';
   };
 
-  keystoneauth1 = buildPythonPackage rec {
-    name = "keystoneauth1-${version}";
-    version = "1.1.0";
-    disabled = isPyPy; # a test fails
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/keystoneauth1/${name}.tar.gz";
-      sha256 = "05fc6xsp5mal52ijvj84sf7mrw706ihadfdf5mnq9zxn7pfl4118";
-    };
-
-    buildInputs = with self; [ pbr testtools testresources testrepository mock
-                               pep8 fixtures mox3 requests-mock ];
-    propagatedBuildInputs = with self; [ argparse iso8601 requests six stevedore
-                                         webob oslo-config ];
-    patchPhase = ''
-      sed -i 's@python@${python.interpreter}@' .testr.conf
-    '';
-  };
+  keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 {};
 
   requests-mock = buildPythonPackage rec {
     name = "requests-mock-${version}";