diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/python-modules/pip')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/default.nix | 8 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/reproducible.patch | 13 |
2 files changed, 2 insertions, 19 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/default.nix index fa566c8951ab..f35ed6b3d116 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/default.nix @@ -14,21 +14,17 @@ buildPythonPackage rec { pname = "pip"; - version = "20.1.1"; + version = "20.3"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "01wq01ysv0ijcrg8a4mj72zb8al15b8vw8g3ywhxq53kbsyhfxn4"; + sha256 = "e/2/0MrGY3myELmvuTAbNfXCBuT8kmvz9qTwITdDtQU="; name = "${pname}-${version}-source"; }; - # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441 - # Also update pkgs/development/interpreters/python/hooks/pip-install-hook.sh accordingly - patches = [ ./reproducible.patch ]; - nativeBuildInputs = [ bootstrapped-pip ]; # pip detects that we already have bootstrapped_pip "installed", so we need diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/reproducible.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/reproducible.patch deleted file mode 100644 index 528ac2b49b03..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/reproducible.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py -index e7315ee4..4e36b03d 100644 ---- a/src/pip/_internal/operations/install/wheel.py -+++ b/src/pip/_internal/operations/install/wheel.py -@@ -615,6 +615,8 @@ def install_wheel( - direct_url=None, # type: Optional[DirectUrl] - ): - # type: (...) -> None -+ _temp_dir_for_testing = ( -+ _temp_dir_for_testing or os.environ.get("NIX_PIP_INSTALL_TMPDIR")) - with TempDirectory( - path=_temp_dir_for_testing, kind="unpacked-wheel" - ) as unpacked_dir, ZipFile(wheel_path, allowZip64=True) as z: |