From b51aaaa36c4f806ce052778a1b494dcc058af8ac Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 5 Dec 2018 21:24:28 -0500 Subject: [PATCH 1/5] 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 { }; From 6ef6d4339a499f30cb83ea768e8cbb3fb662469b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 5 Dec 2018 21:25:22 -0500 Subject: [PATCH 2/5] pythonPackages.python-lz4: fix license --- pkgs/development/python-modules/python-lz4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index a0fe6666d84..df95ce50a80 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "LZ4 Bindings for Python"; homepage = https://github.com/python-lz4/python-lz4; - license = lib.licenses.bsd0; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ costrouc ]; }; } From fdc9826c195ec0f7396a67b2979005ab9298bcb0 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 5 Dec 2018 23:20:12 -0500 Subject: [PATCH 3/5] buildbot: replace lz4 alias with proper name lz4 used to package the same package as python-lz4, then lz4 was removed and became an alias to python-lz4 --- pkgs/development/python-modules/buildbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index c8bc14d3dc1..011cd879b1f 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, future, sqlalchemy, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, treq, txrequests, - txgithub, pyjade, boto3, moto, mock, lz4, setuptoolsTrial, isort, pylint, + txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, glibcLocales }: let @@ -55,7 +55,7 @@ let boto3 moto mock - lz4 + python-lz4 setuptoolsTrial isort pylint From be94ca4ada66eef0850e3484b0c02db3607a7632 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 5 Dec 2018 23:20:42 -0500 Subject: [PATCH 4/5] pythonPackages.python-lz4: 2.1.0 -> 2.1.2 --- pkgs/development/python-modules/python-lz4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index df95ce50a80..544d8f6254d 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "2.1.0"; + version = "2.1.2"; # get full repository inorder to run tests src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1vjfplj37jcw1mf8l810dv76dx0raia3ylgyfy7sfsb3g17brjq6"; + sha256 = "1kzzdfkrq9nnlh0wssa6ccncvv0sk4wmhivhgyndjxz6d6przl5d"; }; buildInputs = [ setuptools_scm pkgconfig pytestrunner ]; From c217d67be3f0919bf471143d8b7c37a2ede970bc Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 6 Dec 2018 02:10:30 -0500 Subject: [PATCH 5/5] mozlz4a: replace lz4 alias with proper name lz4 used to package the same package as python-lz4, then lz4 was removed and became an alias to python-lz4 --- pkgs/tools/compression/mozlz4a/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index abd09483666..ce2aa9520d6 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, python3, pylz4}: +{ stdenv, fetchurl, python3 }: + stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "mozlz4a"; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/mozlz4a" ''; - buildInputs = [ pylz4 python3 ]; + buildInputs = [ python3 python3.pkgs.python-lz4 ]; meta = { inherit version; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3650e3bcb85..962f2ed3455 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1693,9 +1693,7 @@ in mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; - mozlz4a = callPackage ../tools/compression/mozlz4a { - pylz4 = python3Packages.lz4; - }; + mozlz4a = callPackage ../tools/compression/mozlz4a { }; msr-tools = callPackage ../os-specific/linux/msr-tools { };