pythonPackages.keystoneclient: fix build

2 files changed, 53 insertions, 37 deletions

diff --git a/pkgs/development/python-modules/keystoneclient/default.nix b/pkgs/development/python-modules/keystoneclient/default.nix
new file mode 100644
index 000000000000..5b09992295f7
--- /dev/null
+++ b/pkgs/development/python-modules/keystoneclient/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, python
+
+, pbr, testtools, testresources, testrepository
+, requests-mock, fixtures, openssl, oslotest, pep8
+
+, oslo-serialization, oslo-config, oslo-i18n, oslo-utils
+, Babel, prettytable, requests, six, iso8601, stevedore
+, netaddr, debtcollector, bandit, webob, mock, pycrypto
+}:
+
+buildPythonPackage rec {
+  name = "keystoneclient-${version}";
+  version = "1.8.1";
+
+  src = fetchFromGitHub {
+    owner = "openstack";
+    repo = "python-keystoneclient";
+    rev = version;
+    sha256 = "0yayn1hb3mncqb0isy8vy6d519xya7mhf5pcbn60fzdqjrkj2prq";
+  };
+
+  PBR_VERSION = "${version}";
+
+  buildInputs = [
+    pbr testtools testresources testrepository requests-mock fixtures openssl
+    oslotest pep8
+  ];
+  propagatedBuildInputs = [
+    oslo-serialization oslo-config oslo-i18n oslo-utils
+    Babel prettytable requests six iso8601 stevedore
+    netaddr debtcollector bandit webob mock pycrypto
+  ];
+
+  postPatch = ''
+    sed -i 's@python@${python.interpreter}@' .testr.conf
+    sed -ie '/argparse/d' requirements.txt
+    '';
+
+  doCheck = false; # The checkPhase below is broken
+
+  checkPhase = ''
+    patchShebangs run_tests.sh
+    ./run_tests.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/openstack/python-novaclient/;
+    description = "Client library and command line tool for the OpenStack Nova API";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d7a965315f63..f2cf42e6fc1a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22887,43 +22887,7 @@ in {
     };
   };
 
-  keystoneclient = buildPythonPackage rec {
-    name = "keystoneclient-${version}";
-    version = "1.8.1";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/openstack/python-keystoneclient/archive/${version}.tar.gz";
-      sha256 = "0lijri0xa5fvmynvq148z13kw4xd3bam4zrfd8aj0gb3lnzh9y6v";
-    };
-
-    PBR_VERSION = "${version}";
-
-    buildInputs = with self; [
-        pbr testtools testresources testrepository requests-mock fixtures pkgs.openssl
-        oslotest pep8 ];
-    propagatedBuildInputs = with self; [
-        oslo-serialization oslo-config oslo-i18n oslo-utils
-        Babel argparse prettytable requests six iso8601 stevedore
-        netaddr debtcollector bandit webob mock pycrypto ];
-
-    patchPhase = ''
-      sed -i 's@python@${python.interpreter}@' .testr.conf
-    '';
-
-    doCheck = false; # The checkPhase below is broken
-
-    checkPhase = ''
-      patchShebangs run_tests.sh
-      ./run_tests.sh
-    '';
-
-    meta = {
-      homepage = https://github.com/openstack/python-novaclient/;
-      description = "Client library and command line tool for the OpenStack Nova API";
-      license = stdenv.lib.licenses.asl20;
-      platforms = stdenv.lib.platforms.linux;
-    };
-  };
+  keystoneclient = callPackage ../development/python-modules/keystoneclient { };
 
   keystonemiddleware = buildPythonPackage rec {
     name = "keystonemiddleware-${version}";