about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2013-12-29 19:15:22 +0100
committerDomen Kožar <domen@dev.si>2013-12-29 19:15:36 +0100
commitc73f118af62c355310b3f06c885a812c951eb163 (patch)
treeefb6e3847b51faf3ee1d2a9dbbea15c4ff3f4dcb
parent952a0a37973b8d4618d85bedea607dc433806198 (diff)
setuptools: 0.9.8 -> 2.0.2
-rw-r--r--pkgs/development/python-modules/setuptools/default.nix12
1 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index bd1cb756f27e5..952cbe1ff4d63 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -4,18 +4,13 @@ stdenv.mkDerivation rec {
   shortName = "setuptools-${version}";
   name = "${python.executable}-${shortName}";
 
-  version = "0.9.8";
+  version = "2.0.2";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
-    sha256 = "037b8x3fdhx8s6xafqndi3yr8x2vr42n1kzs7jxk6j9s9fd65gs2";
+    sha256 = "09nv5x45y8fgc0kjmmw4gig3hr0is9xlc5rq053vnbmkxr5q5xmi";
   };
 
-  patches = [
-    # https://bitbucket.org/pypa/setuptools/issue/55/1-failure-lc_all-c-python33m-setuppy-test
-    ./distribute-skip-sdist_with_utf8_encoded_filename.patch
-  ];
-
   buildInputs = [ python wrapPython ];
 
   buildPhase = "${python}/bin/${python.executable} setup.py build --build-base $out";
@@ -29,8 +24,7 @@ stdenv.mkDerivation rec {
       wrapPythonPrograms
     '';
 
-  # tests fail on darwin, see http://bitbucket.org/pypa/setuptools/issue/55/1-failure-lc_all-c-python33m-setuppy-test 
-  doCheck = (!stdenv.isDarwin);
+  doCheck = true;
 
   checkPhase = ''
     ${python}/bin/${python.executable} setup.py test