From 76ea4df5f9aa27161d85d591b58fda6ed5c7b16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 18 Jun 2017 10:59:17 +0100 Subject: [PATCH] pythonPackages.keystoneauth1: fix missing argparse dep --- .../python-modules/keystoneauth1/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------ 2 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/keystoneauth1/default.nix diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix new file mode 100644 index 00000000000..033f08f9587 --- /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 7aac6f2c306..e85fc22e3b9 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}";