Merge pull request #51603 from veprbl/pr/drop_python_pkgs_lz4

pythonPackages.lz4: remove in favor of pythonPackages.python-lz4

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

pkgs/development/python-modules/lz4/default.nix

@@ -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;
-  };
-
-}

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 ];
@@ -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 ];
   };
 }

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;

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 { };
 

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 { };