diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-05-29 08:53:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-29 08:53:49 +0200 |
commit | 03ba5ef6d3d45d140dbb233beabfbadc94da4283 (patch) | |
tree | c2abc406e38664f04a08e99d48e55fa3e317b107 /pkgs | |
parent | 868529b2ce5f49ea153276783069d3d0631a0230 (diff) | |
parent | 21e3b2ff551c8dbf16a010fc377c5f60283034e4 (diff) | |
download | nixlib-03ba5ef6d3d45d140dbb233beabfbadc94da4283.tar nixlib-03ba5ef6d3d45d140dbb233beabfbadc94da4283.tar.gz nixlib-03ba5ef6d3d45d140dbb233beabfbadc94da4283.tar.bz2 nixlib-03ba5ef6d3d45d140dbb233beabfbadc94da4283.tar.lz nixlib-03ba5ef6d3d45d140dbb233beabfbadc94da4283.tar.xz nixlib-03ba5ef6d3d45d140dbb233beabfbadc94da4283.tar.zst nixlib-03ba5ef6d3d45d140dbb233beabfbadc94da4283.zip |
Merge pull request #26198 from risicle/varied-minor-python-pkgs-fixes
python.pkgs: hypothesis, pylibmc, ldap, pylint: minor build fixes
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/hypothesis.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/ldap.nix | 6 | ||||
-rw-r--r-- | pkgs/development/python-modules/pylibmc/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/python-modules/pylint/default.nix | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix index b9f95d1a0313..cb0db6dc2e0c 100644 --- a/pkgs/development/python-modules/hypothesis.nix +++ b/pkgs/development/python-modules/hypothesis.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, python , pythonOlder, pythonAtLeast, enum34 -, doCheck ? true, pytest, flake8, flaky +, doCheck ? true, pytest, pytest_xdist, flake8, flaky }: buildPythonPackage rec { # http://hypothesis.readthedocs.org/en/latest/packaging.html @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1s911pd3y9hvk0hq2fr6i68dqv1ciagryhgp13wgyfqh8hz8j6zv"; }; - checkInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ]; + checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky ]; propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]; inherit doCheck; diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix index e2625e2bfbfa..3e715bbe419a 100644 --- a/pkgs/development/python-modules/ldap.nix +++ b/pkgs/development/python-modules/ldap.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, isPy3k, fetchurl +{ buildPythonPackage, isPy3k, fetchPypi , openldap, cyrus_sasl, openssl }: buildPythonPackage rec { @@ -7,8 +7,8 @@ buildPythonPackage rec { name = "${pname}-${version}"; disabled = isPy3k; - src = fetchurl { - url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779"; }; diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index ff53e3d304fe..7f57f17efeb1 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -1,11 +1,11 @@ -{ buildPythonPackage, fetchurl, stdenv, libmemcached, zlib }: +{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib }: buildPythonPackage rec { version = "1.5.2"; pname = "pylibmc"; name = "${pname}-${version}"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/pylibmc/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33"; }; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 2922faafa7f7..130aef60f971 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPythonPackage, python, astroid, isort, - pytest, mccabe, configparser, backports_functools_lru_cache }: + pytest, pytestrunner, mccabe, configparser, backports_functools_lru_cache }: buildPythonPackage rec { name = "${pname}-${version}"; @@ -11,7 +11,7 @@ sha256 = "8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a"; }; - buildInputs = [ pytest mccabe configparser backports_functools_lru_cache ]; + buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; propagatedBuildInputs = [ astroid isort ]; |