From b51aaaa36c4f806ce052778a1b494dcc058af8ac Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 5 Dec 2018 21:24:28 -0500 Subject: [PATCH] pythonPackages.lz4: remove in favor of pythonPackages.python-lz4 lz4 packages the same package as python-lz4, but an outdated version --- .../python-modules/lz4/default.nix | 29 ------------------- pkgs/top-level/python-packages.nix | 3 +- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/development/python-modules/lz4/default.nix diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix deleted file mode 100644 index a9a7783fe77..00000000000 --- a/pkgs/development/python-modules/lz4/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, pytestrunner -, pytest -, psutil -, pkgconfig -, setuptools_scm -}: - -buildPythonPackage rec { - pname = "lz4"; - version = "2.1.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "ec265f7c3fc3df706e9579bde632ceeef9278858d7ae87c376a2954d11e9ea39"; - }; - - buildInputs = [ setuptools_scm pytestrunner pkgconfig ]; - checkInputs = [ pytest psutil ]; - - meta = with stdenv.lib; { - description = "Compression library"; - homepage = https://github.com/python-lz4/python-lz4; - license = licenses.bsd3; - }; - -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8fbcaa194c..a64ce4e869c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -648,6 +648,7 @@ in { python-hosts = callPackage ../development/python-modules/python-hosts { }; python-lz4 = callPackage ../development/python-modules/python-lz4 { }; + lz4 = self.python-lz4; # alias 2018-12-05 python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; @@ -3268,8 +3269,6 @@ in { ldappool = callPackage ../development/python-modules/ldappool { }; - lz4 = callPackage ../development/python-modules/lz4 { }; - retrying = callPackage ../development/python-modules/retrying { }; fasteners = callPackage ../development/python-modules/fasteners { };