diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2017-06-18 10:47:42 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2017-06-18 11:03:09 +0100 |
commit | f79d21da658869cfe09120f5dff4228224db8832 (patch) | |
tree | 4811024ed3daca051ecac8e840ea1cd786ee7313 | |
parent | 2fd359c978eaf423a0e1ba8d89257149be1f9b92 (diff) | |
download | nixlib-f79d21da658869cfe09120f5dff4228224db8832.tar nixlib-f79d21da658869cfe09120f5dff4228224db8832.tar.gz nixlib-f79d21da658869cfe09120f5dff4228224db8832.tar.bz2 nixlib-f79d21da658869cfe09120f5dff4228224db8832.tar.lz nixlib-f79d21da658869cfe09120f5dff4228224db8832.tar.xz nixlib-f79d21da658869cfe09120f5dff4228224db8832.tar.zst nixlib-f79d21da658869cfe09120f5dff4228224db8832.zip |
oslo-config: fix argparse dependencies
-rw-r--r-- | pkgs/development/python-modules/oslo-config/default.nix | 22 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 16 |
2 files changed, 23 insertions, 15 deletions
diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix new file mode 100644 index 000000000000..7cdfb9061fb2 --- /dev/null +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock }: + +buildPythonPackage rec { + pname = "oslo.config"; + version = "2.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "043mavrzj7vjn7kh1dddci4sf67qwqnnn6cm0k1d19alks9hismz"; + }; + + propagatedBuildInputs = [ pbr six netaddr stevedore ]; + buildInputs = [ mock ]; + + # TODO: circular import on oslo-i18n + doCheck = false; + + postPatch = '' + substituteInPlace requirements.txt --replace "argparse" + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 332fa5f83a08..7aac6f2c306c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17006,21 +17006,7 @@ in { ''; }; - oslo-config = buildPythonPackage rec { - name = "oslo.config-${version}"; - version = "2.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.config/${name}.tar.gz"; - sha256 = "043mavrzj7vjn7kh1dddci4sf67qwqnnn6cm0k1d19alks9hismz"; - }; - - propagatedBuildInputs = with self; [ argparse pbr six netaddr stevedore ]; - buildInputs = [ self.mock ]; - - # TODO: circular import on oslo-i18n - doCheck = false; - }; + oslo-config = callPackage ../development/python-modules/oslo-config { }; oslotest = buildPythonPackage rec { name = "oslotest-${version}"; |