dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

python2.pkgs.pip: fix regression in 20.2

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-11-05 16:09:24 +01:00
parent 75d9e713d9
commit b66f954dfc
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/bootstrapped-pip/default.nix
View File

@ -2,6 +2,7 @@
, pipInstallHook , pipInstallHook
, setuptoolsBuildHook , setuptoolsBuildHook
, wheel, pip, setuptools , wheel, pip, setuptools
, isPy27
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -24,6 +25,10 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
mkdir -p $out/bin mkdir -p $out/bin
'' + stdenv.lib.optionalString isPy27 ''
pushd "${pip.src.name}"
patch -p1 < ${builtins.elemAt pip.patches 0}
popd
''; '';
nativeBuildInputs = [ makeWrapper unzip ]; nativeBuildInputs = [ makeWrapper unzip ];

9
pkgs/development/python-modules/pip/default.nix
View File

@ -10,6 +10,8 @@
, pytest , pytest
, setuptools , setuptools
, wheel , wheel
, isPy27
, fetchpatch
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -27,6 +29,13 @@ buildPythonPackage rec {
nativeBuildInputs = [ bootstrapped-pip ]; 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 # pip detects that we already have bootstrapped_pip "installed", so we need
# to force it a little. # to force it a little.
pipInstallFlags = [ "--ignore-installed" ]; pipInstallFlags = [ "--ignore-installed" ];