aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-12-01 14:35:06 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2020-12-01 14:44:26 +0100
commitb0e372864a4ed1413968b13fa13b7ddf3f4673e8 (patch)
tree73897157774cb72dd5c9f838caae516377b72b03
parent76966f8dddf9b0b5bb2d21128c5fd3e4cf3d6256 (diff)
python3Packages.pip: 20.2.4 -> 20.3
-rw-r--r--pkgs/development/python-modules/bootstrapped-pip/default.nix4
-rw-r--r--pkgs/development/python-modules/pip/default.nix13
2 files changed, 2 insertions, 15 deletions
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 09648036ea87..9679edd95127 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -25,10 +25,6 @@ stdenv.mkDerivation rec {
postPatch = ''
mkdir -p $out/bin
- '' + stdenv.lib.optionalString isPy27 ''
- pushd "${pip.src.name}"
- patch -p1 < ${builtins.elemAt pip.patches 0}
- popd
'';
nativeBuildInputs = [ makeWrapper unzip ];
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index d451ca4a9b25..f35ed6b3d116 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -10,32 +10,23 @@
, pytest
, setuptools
, wheel
-, isPy27
-, fetchpatch
}:
buildPythonPackage rec {
pname = "pip";
- version = "20.2.4";
+ version = "20.3";
format = "other";
src = fetchFromGitHub {
owner = "pypa";
repo = pname;
rev = version;
- sha256 = "eMVV4ftgV71HLQsSeaOchYlfaJVgzNrwUynn3SA1/Do=";
+ sha256 = "e/2/0MrGY3myELmvuTAbNfXCBuT8kmvz9qTwITdDtQU=";
name = "${pname}-${version}-source";
};
nativeBuildInputs = [ bootstrapped-pip ];
- patches = lib.optionals isPy27 [
- (fetchpatch {
- url = "https://github.com/pypa/pip/commit/94fbb6cf78c267bf7cdf83eeeb2536ad56cfe639.patch";
- sha256 = "Z6x5yxBp8QkU/GOfb1ltI0dVt//MaI09XK3cdY42kFs=";
- })
- ];
-
# pip detects that we already have bootstrapped_pip "installed", so we need
# to force it a little.
pipInstallFlags = [ "--ignore-installed" ];