python3Packages.pip: 20.2.4 -> 20.3

This commit is contained in:
Frederik Rietdijk 2020-12-01 14:35:06 +01:00
parent 76966f8ddd
commit b0e372864a
2 changed files with 2 additions and 15 deletions

View file

@ -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 ];

View file

@ -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" ];