Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 61a04f735af6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c7176d55ac8a
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 5, 2020

  1. python2.pkgs.pip: fix regression in 20.2

    @FRidh
    FRidh committed Nov 5, 2020
    Copy the full SHA
    c7176d5 View commit details
Showing with 14 additions and 0 deletions.
  1. +5 −0 pkgs/development/python-modules/bootstrapped-pip/default.nix
  2. +9 −0 pkgs/development/python-modules/pip/default.nix
5 changes: 5 additions & 0 deletions pkgs/development/python-modules/bootstrapped-pip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
9 changes: 9 additions & 0 deletions pkgs/development/python-modules/pip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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" ];