python2.pkgs.pip: fix regression in 20.2
This commit is contained in:
parent
61a04f735a
commit
c7176d55ac
|
@ -2,6 +2,7 @@
|
|||
, pipInstallHook
|
||||
, setuptoolsBuildHook
|
||||
, wheel, pip, setuptools
|
||||
, isPy27
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -24,6 +25,10 @@ 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 ];
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
, pytest
|
||||
, setuptools
|
||||
, wheel
|
||||
, isPy27
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -27,6 +29,13 @@ buildPythonPackage rec {
|
|||
|
||||
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" ];
|
||||
|
|
Loading…
Reference in a new issue