Undo python fixes and move them to separate branch.

prinzdezibel · Dec 5, 2024 · 5407ef6 · 5407ef6
1 parent d1b8c0e
commit 5407ef6
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 10 deletions.
diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix
@@ -9,17 +9,12 @@
 , rust
 , rustc
 , stdenv
-, python3
 
 # This confusingly-named parameter indicates the *subdirectory of
 # `target/` from which to copy the build artifacts.  It is derived
 # from a stdenv platform (or a JSON file).
 , target ? stdenv.hostPlatform.rust.cargoShortTarget
 }:
-let
- inherit (python3) pythonOnBuildForHost;
- pythonInterpreter = pythonOnBuildForHost.interpreter;
-in
 {
   cargoBuildHook = callPackage ({ }:
     makeSetupHook {
@@ -80,7 +75,6 @@ in
       };
     } ./cargo-setup-hook.sh) {};
 
-
   maturinBuildHook = callPackage ({ pkgsHostTarget }:
     makeSetupHook {
       name = "maturin-build-hook.sh";
@@ -91,7 +85,6 @@ in
       ];
       substitutions = {
         inherit (rust.envVars) rustTargetPlatformSpec setEnv;
-        pythonInterpreter = builtins.elemAt (builtins.match "([0-9]+\.[0-9]+)\.*" python3.version) 0;
       };
     } ./maturin-build-hook.sh) {};
 

diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh
@@ -14,7 +14,6 @@ maturinBuildHook() {
 
     local flagsArray=(
         "--jobs=$NIX_BUILD_CORES"
-        "--interpreter=@pythonInterpreter@"
         "--offline"
         "--target" "@rustTargetPlatformSpec@"
         "--manylinux" "off"

diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-yLKt/Xml7ig6QG3T5Qn39tW7U5NIN1hSOaLiSRMiy5I=";
 
 
-  buildInputs = [python3] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.Security
     libiconv
   ];

diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix
@@ -9,7 +9,6 @@
   rustc,
   rustPlatform,
   libiconv,
-  python3
 }:
 
 buildPythonPackage rec {
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
       rustc,
       rustPlatform,
       libiconv,
-      python3
     }:
     buildPythonPackage rec {
@@ Expand Down @@