public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51603 from veprbl/pr/drop_python_pkgs_lz4 

pythonPackages.lz4: remove in favor of pythonPackages.python-lz4
This commit is contained in:
Dmitry Kalinkin 2018-12-25 11:31:03 -05:00 committed by GitHub
parent 996d14a004 c217d67be3
commit 1e1219b590
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/buildbot/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
python, twisted, jinja2, zope_interface, future, sqlalchemy, python, twisted, jinja2, zope_interface, future, sqlalchemy,
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, treq, txrequests, 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 }: flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
let let
@ -55,7 +55,7 @@ let
boto3 boto3
moto moto
mock mock
lz4 python-lz4
setuptoolsTrial setuptoolsTrial
isort isort
pylint pylint

29
pkgs/development/python-modules/lz4/default.nix
View File

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

6
pkgs/development/python-modules/python-lz4/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-lz4"; pname = "python-lz4";
version = "2.1.0"; version = "2.1.2";
# get full repository inorder to run tests # get full repository inorder to run tests
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1vjfplj37jcw1mf8l810dv76dx0raia3ylgyfy7sfsb3g17brjq6"; sha256 = "1kzzdfkrq9nnlh0wssa6ccncvv0sk4wmhivhgyndjxz6d6przl5d";
}; };
buildInputs = [ setuptools_scm pkgconfig pytestrunner ]; buildInputs = [ setuptools_scm pkgconfig pytestrunner ];
@ -34,7 +34,7 @@ buildPythonPackage rec {
meta = { meta = {
description = "LZ4 Bindings for Python"; description = "LZ4 Bindings for Python";
homepage = https://github.com/python-lz4/python-lz4; homepage = https://github.com/python-lz4/python-lz4;
license = lib.licenses.bsd0; license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ costrouc ]; maintainers = with lib.maintainers; [ costrouc ];
}; };
} }

5
pkgs/tools/compression/mozlz4a/default.nix
View File

@ -1,4 +1,5 @@
{stdenv, fetchurl, python3, pylz4}: { stdenv, fetchurl, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "mozlz4a"; pname = "mozlz4a";
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
chmod a+x "$out/bin/mozlz4a" chmod a+x "$out/bin/mozlz4a"
''; '';
buildInputs = [ pylz4 python3 ]; buildInputs = [ python3 python3.pkgs.python-lz4 ];
meta = { meta = {
inherit version; inherit version;

4
pkgs/top-level/all-packages.nix
View File

@ -1693,9 +1693,7 @@ in
mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
mozlz4a = callPackage ../tools/compression/mozlz4a { mozlz4a = callPackage ../tools/compression/mozlz4a { };
pylz4 = python3Packages.lz4;
};
msr-tools = callPackage ../os-specific/linux/msr-tools { }; msr-tools = callPackage ../os-specific/linux/msr-tools { };

3
pkgs/top-level/python-packages.nix
View File

@ -648,6 +648,7 @@ in {
python-hosts = callPackage ../development/python-modules/python-hosts { }; python-hosts = callPackage ../development/python-modules/python-hosts { };
python-lz4 = callPackage ../development/python-modules/python-lz4 { }; 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 { }; python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
@ -3268,8 +3269,6 @@ in {
ldappool = callPackage ../development/python-modules/ldappool { }; ldappool = callPackage ../development/python-modules/ldappool { };
lz4 = callPackage ../development/python-modules/lz4 { };
retrying = callPackage ../development/python-modules/retrying { }; retrying = callPackage ../development/python-modules/retrying { };
fasteners = callPackage ../development/python-modules/fasteners { }; fasteners = callPackage ../development/python-modules/fasteners { };