From 5407ef613c4f3ff6371477d9df2728a387270df3 Mon Sep 17 00:00:00 2001
From: Michael Jenny <michael.jenny@projekt-und-partner.de>
Date: Thu, 5 Dec 2024 18:57:29 +0100
Subject: [PATCH] Undo python fixes and move them to separate branch.

---
 pkgs/build-support/rust/hooks/default.nix           | 7 -------
 pkgs/build-support/rust/hooks/maturin-build-hook.sh | 1 -
 pkgs/by-name/ma/maturin/package.nix                 | 2 +-
 pkgs/development/python-modules/rpds-py/default.nix | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix
index fd0455796b306..2997f0f15ff65 100644
--- 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
index 172104ee857a1..2eab2124e70be 100644
--- 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
index 43512ea1b91ed..d7cdb89f312cb 100644
--- 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
index c5272d45004e0..aa855d102ad9f 100644
--- 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 {