about summary refs log tree commit diff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2016-11-14 21:58:43 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2016-11-15 00:05:56 +0100
commitd83d2ba4f3b831ded72c7b29a2ddb9b7a528efca (patch)
tree4be305673c0af9d3a6dc8810437ede3681be7adb /pkgs/development/python-modules
parent84e9328028daabfd16e9f6e756ffe30b73a9e4f7 (diff)
downloadnixlib-d83d2ba4f3b831ded72c7b29a2ddb9b7a528efca.tar
nixlib-d83d2ba4f3b831ded72c7b29a2ddb9b7a528efca.tar.gz
nixlib-d83d2ba4f3b831ded72c7b29a2ddb9b7a528efca.tar.bz2
nixlib-d83d2ba4f3b831ded72c7b29a2ddb9b7a528efca.tar.lz
nixlib-d83d2ba4f3b831ded72c7b29a2ddb9b7a528efca.tar.xz
nixlib-d83d2ba4f3b831ded72c7b29a2ddb9b7a528efca.tar.zst
nixlib-d83d2ba4f3b831ded72c7b29a2ddb9b7a528efca.zip
pythonPackages.setuptools: 26.1.1 -> 28.8.0
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/bootstrapped-pip/default.nix4
-rw-r--r--pkgs/development/python-modules/setuptools/default.nix9
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 0fd6c1873b53..7039755198c0 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -6,8 +6,8 @@ let
     sha256 = "ea8033fc9905804e652f75474d33410a07404c1a78dd3c949a66863bd1050ebd";
   };
   setuptools_source = fetchurl {
-    url = "https://files.pythonhosted.org/packages/3b/c7/e9724e6f81c96248fba5876054418c11d327b3093d075790903cd66fad44/setuptools-26.1.1-py2.py3-none-any.whl";
-    sha256 = "226c9ce65e76c6069e805982b036f36dc4b227b37dd87fc219aef721ec8604ae";
+    url = "https://files.pythonhosted.org/packages/3b/7e/293d19ccd106119e35db4bf3e111b1895098f618b455b758aa636496cf03/setuptools-28.8.0-py2.py3-none-any.whl";
+    sha256 = "2e59d06ac798efce29c567ee0e0687514efca529a665b8f364cf497cd10d21b2";
   };
   argparse_source = fetchurl {
     url = "https://pypi.python.org/packages/2.7/a/argparse/argparse-1.4.0-py2.py3-none-any.whl";
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 3a38dee3174f..bba5a6c942b0 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -1,14 +1,15 @@
 { stdenv, lib, fetchurl, python, wrapPython }:
 
 stdenv.mkDerivation rec {
-  shortName = "setuptools-${version}";
+  pname = "setuptools";
+  shortName = "${pname}-${version}";
   name = "${python.libPrefix}-${shortName}";
 
-  version = "26.1.1";  # 18.4 and up breaks python34Packages.characteristic and many others
+  version = "28.8.0";
 
   src = fetchurl {
-    url = "mirror://pypi/s/setuptools/${shortName}.tar.gz";
-    sha256 = "475ce28993d7cb75335942525b9fac79f7431a7f6e8a0079c0f2680641379481";
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${shortName}.tar.gz";
+    sha256 = "432a1ad4044338c34c2d09b0ff75d509b9849df8cf329f4c1c7706d9c2ba3c61";
   };
 
   buildInputs = [ python wrapPython ];