Skip to content

Commit b0e3728

Browse files
committed
python3Packages.pip: 20.2.4 -> 20.3
1 parent 76966f8 commit b0e3728

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

pkgs/development/python-modules/bootstrapped-pip/default.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ stdenv.mkDerivation rec {
2525

2626
postPatch = ''
2727
mkdir -p $out/bin
28-
'' + stdenv.lib.optionalString isPy27 ''
29-
pushd "${pip.src.name}"
30-
patch -p1 < ${builtins.elemAt pip.patches 0}
31-
popd
3228
'';
3329

3430
nativeBuildInputs = [ makeWrapper unzip ];

pkgs/development/python-modules/pip/default.nix

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,23 @@
1010
, pytest
1111
, setuptools
1212
, wheel
13-
, isPy27
14-
, fetchpatch
1513
}:
1614

1715
buildPythonPackage rec {
1816
pname = "pip";
19-
version = "20.2.4";
17+
version = "20.3";
2018
format = "other";
2119

2220
src = fetchFromGitHub {
2321
owner = "pypa";
2422
repo = pname;
2523
rev = version;
26-
sha256 = "eMVV4ftgV71HLQsSeaOchYlfaJVgzNrwUynn3SA1/Do=";
24+
sha256 = "e/2/0MrGY3myELmvuTAbNfXCBuT8kmvz9qTwITdDtQU=";
2725
name = "${pname}-${version}-source";
2826
};
2927

3028
nativeBuildInputs = [ bootstrapped-pip ];
3129

32-
patches = lib.optionals isPy27 [
33-
(fetchpatch {
34-
url = "https://github.com/pypa/pip/commit/94fbb6cf78c267bf7cdf83eeeb2536ad56cfe639.patch";
35-
sha256 = "Z6x5yxBp8QkU/GOfb1ltI0dVt//MaI09XK3cdY42kFs=";
36-
})
37-
];
38-
3930
# pip detects that we already have bootstrapped_pip "installed", so we need
4031
# to force it a little.
4132
pipInstallFlags = [ "--ignore-installed" ];

0 commit comments

Comments
 (0)