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

pythonPackages.setuptools and bootstrapped-pip: 18.2 -> 19.4

Browse Source 
Update to latest setuptools. Latest setuptools will always try to run tests.
This can cause some very vague errors. We now need to fix all packages where we do not
invoke the correct test runner.
This commit is contained in:
Frederik Rietdijk 2016-01-23 12:09:44 +01:00
parent 5c565856be
commit e0d0f8dbd2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,8 +6,8 @@ let
sha256 = "1sl642ncvipqx0hzypvl5hsiqngy0sib0kq242g4mic7vnid6bn9";
};
setuptools_source = fetchurl {
url = "https://pypi.python.org/packages/3.4/s/setuptools/setuptools-18.2-py2.py3-none-any.whl";
sha256 = "0jhafl8wmjc8xigl1ib5hqiq9crmipcz0zcga52riymgqbf2bzh4";
url = "https://pypi.python.org/packages/3.5/s/setuptools/setuptools-19.4-py2.py3-none-any.whl";
sha256 = "0801e6d862ca4ce24d918420d62f07ee2fe736dc016e3afa99d2103e7a02e9a6";
};
in stdenv.mkDerivation rec {
name = "python-${python.version}-bootstrapped-pip-${version}";

8
pkgs/development/python-modules/setuptools/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, python, wrapPython }:
{ stdenv, lib, fetchurl, python, wrapPython }:
stdenv.mkDerivation rec {
shortName = "setuptools-${version}";
name = "${python.executable}-${shortName}";
version = "18.2"; # 18.4 breaks python34Packages.characteristic and many others
version = "19.4"; # 18.4 and up breaks python34Packages.characteristic and many others
src = fetchurl {
url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
sha256 = "07avbdc26yl2a46s76fc7m4vg611g8sh39l26x9dr9byya6sb509";
sha256 = "214bf29933f47cf25e6faa569f710731728a07a19cae91ea64f826051f68a8cf";
};
buildInputs = [ python wrapPython ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Utilities to facilitate the installation of Python packages";
homepage = http://pypi.python.org/pypi/setuptools;
license = [ "PSF" "ZPL" ];
license = with lib.licenses; [ psfl zpt20 ];
platforms = platforms.all;
};
}