buildPython*: remove stdenv arg in overrideStdenvCompat

MattSturgeon · MattSturgeon · commit 32ecc2256b17 · 2025-12-11T01:07:55.000Z
Avoid passing `stdenv` to the underlying function when it is already
handled in overrideStdenvCompat.
diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix
@@ -51,7 +51,7 @@ let
         lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511) ''
           Passing `stdenv` directly to `buildPythonPackage` or `buildPythonApplication` is deprecated. You should use their `.override` function instead, e.g:
             buildPythonPackage.override { stdenv = customStdenv; } { }
-        '' (f.override { inherit (args) stdenv; } args)
+        '' (f.override { inherit (args) stdenv; } (removeAttrs args [ "stdenv" ]))
       else
         f args
     )

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ let`
`51`	`51`	`lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511) ''`
`52`	`52`	Passing `stdenv` directly to `buildPythonPackage` or `buildPythonApplication` is deprecated. You should use their `.override` function instead, e.g:
`53`	`53`	`buildPythonPackage.override { stdenv = customStdenv; } { }`
`54`		`- '' (f.override { inherit (args) stdenv; } args)`
	`54`	`+ '' (f.override { inherit (args) stdenv; } (removeAttrs args [ "stdenv" ]))`
`55`	`55`	`else`
`56`	`56`	`f args`
`57`	`57`	`)`