makeOverridablePythonPackage: simplify implementation

ShamrockLee · MattSturgeon · ShamrockLee · commit e8302431efb3 · 2025-12-10T19:20:01.000+08:00
Attach overridePythonAttrs by attribute set update
instead of `stdenv.mkDerivation`'s `passthru`.

Co-authored-by: Matt Sturgeon &lt;matt@sturgeon.me.uk&gt;
diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix
@@ -19,22 +19,13 @@ let
     lib.mirrorFunctionArgs f (
       origArgs:
       let
-        args = lib.fix (
-          lib.extends (_: previousAttrs: {
-            passthru = (previousAttrs.passthru or { }) // {
-              overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs);
-            };
-          }) (_: origArgs)
-        );
-        result = f args;
-        overrideWith = newArgs: args // (if pkgs.lib.isFunction newArgs then newArgs args else newArgs);
+        result = f origArgs;
+        overrideWith = newArgs: origArgs // lib.toFunction newArgs origArgs;
       in
-      if builtins.isAttrs result then
+      if lib.isAttrs result then
         result
-      else if builtins.isFunction result then
-        {
+        // {
           overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs);
-          __functor = self: result;
         }
       else
         result
