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: 64b75ad5c0fb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 75d9e713d985
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Nov 5, 2020

  1. python3.pkgs.pip: 20.1.1 -> 20.2.4 

    Reproducible builds of pyproject projects using pip is resolved.

Fixes pypa/pip#7808
Fixes #81441

The more recent c409f69 caused trouble
with pyproject troubles and had to be reverted anyway.
#102222 (comment)

Revert "pythonPackages.pip: make reproducible (#102222)"

This reverts commit c409f69.

Revert "python3Packages.pip: allow setting reproducible temporary directory via NIX_PIP_INSTALL_TMPDIR"

This reverts commit aedbade.
    @FRidh
    FRidh committed Nov 5, 2020
    Copy the full SHA
    75d9e71 View commit details
4 changes: 1 addition & 3 deletions pkgs/development/interpreters/python/hooks/pip-install-hook.sh
View file
Original file line number Diff line number Diff line change
@@ -11,9 +11,7 @@ pipInstallPhase() {
export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH"

pushd dist || return 1
mkdir tmpbuild
@pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags
rm -rf tmpbuild
@pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags --build tmpbuild
popd || return 1

runHook postInstall
5 changes: 0 additions & 5 deletions pkgs/development/python-modules/bootstrapped-pip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,6 @@ stdenv.mkDerivation rec {
];

postPatch = ''
# Apply the pip reproducible patch
pushd "${pip.src.name}"
patch -p1 < ${../pip/reproducible.patch}
popd
mkdir -p $out/bin
'';

8 changes: 2 additions & 6 deletions pkgs/development/python-modules/pip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,21 +14,17 @@

buildPythonPackage rec {
pname = "pip";
version = "20.1.1";
version = "20.2.4";
format = "other";

src = fetchFromGitHub {
owner = "pypa";
repo = pname;
rev = version;
sha256 = "01wq01ysv0ijcrg8a4mj72zb8al15b8vw8g3ywhxq53kbsyhfxn4";
sha256 = "eMVV4ftgV71HLQsSeaOchYlfaJVgzNrwUynn3SA1/Do=";
name = "${pname}-${version}-source";
};

# Remove when solved https://github.com/NixOS/nixpkgs/issues/81441
# See also https://github.com/pypa/pip/issues/7808
patches = [ ./reproducible.patch ];

nativeBuildInputs = [ bootstrapped-pip ];

# pip detects that we already have bootstrapped_pip "installed", so we need
25 changes: 0 additions & 25 deletions pkgs/development/python-modules/pip/reproducible.patch
View file

This file was deleted.