about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2018-05-05 07:27:10 +0200
committerRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2018-05-05 07:27:10 +0200
commitb99d7727b9acfdb80d85f4179423d7273d10d9a9 (patch)
treee6d23ce2710bde183dbee6a319f481c71d6a96ea
parentc63a32357a807a6e967c5853220293b86c439549 (diff)
downloadnixlib-b99d7727b9acfdb80d85f4179423d7273d10d9a9.tar
nixlib-b99d7727b9acfdb80d85f4179423d7273d10d9a9.tar.gz
nixlib-b99d7727b9acfdb80d85f4179423d7273d10d9a9.tar.bz2
nixlib-b99d7727b9acfdb80d85f4179423d7273d10d9a9.tar.lz
nixlib-b99d7727b9acfdb80d85f4179423d7273d10d9a9.tar.xz
nixlib-b99d7727b9acfdb80d85f4179423d7273d10d9a9.tar.zst
nixlib-b99d7727b9acfdb80d85f4179423d7273d10d9a9.zip
python.pkgs.bootstrapped-pip: remove pkg_resources patch
-rw-r--r--pkgs/development/python-modules/bootstrapped-pip/default.nix10
1 files changed, 0 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 28962d0c9361..e6f751714451 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -14,14 +14,6 @@ let
     sha256 = "8010754433e3211b9cdbbf784b50f30e80bf40fc6b05eb5f865fab83300599b8";
   };
 
-  # TODO: Shouldn't be necessary anymore for pip >= 10!
-  # https://github.com/NixOS/nixpkgs/issues/26392
-  # https://github.com/pypa/setuptools/issues/885
-  pkg_resources = fetchurl {
-    url = "https://raw.githubusercontent.com/pypa/setuptools/v36.0.1/pkg_resources/__init__.py";
-    sha256 = "1wdnq3mammk75mifkdmmjx7yhnpydvnvi804na8ym4mj934l2jkv";
-  };
-
 in stdenv.mkDerivation rec {
   pname = "pip";
   version = "10.0.1";
@@ -38,8 +30,6 @@ in stdenv.mkDerivation rec {
     unzip -d $out/${python.sitePackages} $src
     unzip -d $out/${python.sitePackages} ${setuptools_source}
     unzip -d $out/${python.sitePackages} ${wheel_source}
-    # TODO: Shouldn't be necessary anymore for pip >= 10!
-    cp ${pkg_resources} $out/${python.sitePackages}/pip/_vendor/pkg_resources/__init__.py
   '';
 
   patchPhase = ''