summary refs log tree commit diff
diff options
context:
space:
mode:
authorTheodore Ni <3806110+tjni@users.noreply.github.com>2023-07-28 02:27:46 -0700
committerFrederik Rietdijk <fridh@fridh.nl>2023-08-20 11:00:52 +0200
commitab5543735a9386e249c54e29789b167dc2515172 (patch)
tree146e8c615546936be2c66c90da15fee2848cd031
parent5a9dda28aa00dd88de3329c29bcdae40591d4634 (diff)
downloadnixpkgs-ab5543735a9386e249c54e29789b167dc2515172.tar
nixpkgs-ab5543735a9386e249c54e29789b167dc2515172.tar.gz
nixpkgs-ab5543735a9386e249c54e29789b167dc2515172.tar.bz2
nixpkgs-ab5543735a9386e249c54e29789b167dc2515172.tar.lz
nixpkgs-ab5543735a9386e249c54e29789b167dc2515172.tar.xz
nixpkgs-ab5543735a9386e249c54e29789b167dc2515172.tar.zst
nixpkgs-ab5543735a9386e249c54e29789b167dc2515172.zip
python3.pkgs.pip: build without bootstrapped-pip
-rw-r--r--pkgs/development/python-modules/pip/default.nix17
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index ebac5724d66..453abf20663 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -1,10 +1,11 @@
 { lib
 , buildPythonPackage
-, bootstrapped-pip
 , fetchFromGitHub
 , mock
 , scripttest
+, setuptools
 , virtualenv
+, wheel
 , pretend
 , pytest
 
@@ -15,29 +16,28 @@
 buildPythonPackage rec {
   pname = "pip";
   version = "23.0.1";
-  format = "other";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = pname;
     rev = "refs/tags/${version}";
     hash = "sha256-BSonlwKmegrlrQTTIL0avPi61/TY2M0f7kOZpSzPRQk=";
-    name = "${pname}-${version}-source";
   };
 
-  nativeBuildInputs = [ bootstrapped-pip ];
-
   postPatch = ''
     # Remove vendored Windows PE binaries
     # Note: These are unused but make the package unreproducible.
     find -type f -name '*.exe' -delete
   '';
 
-  # pip detects that we already have bootstrapped_pip "installed", so we need
-  # to force it a little.
-  pipInstallFlags = [ "--ignore-installed" ];
+  nativeBuildInputs = [
+    setuptools
+    wheel
+  ];
 
   nativeCheckInputs = [ mock scripttest virtualenv pretend pytest ];
+
   # Pip wants pytest, but tests are not distributed
   doCheck = false;
 
@@ -48,6 +48,5 @@ buildPythonPackage rec {
     license = with lib.licenses; [ mit ];
     homepage = "https://pip.pypa.io/";
     changelog = "https://pip.pypa.io/en/stable/news/#v${lib.replaceStrings [ "." ] [ "-" ] version}";
-    priority = 10;
   };
 }