python-packages-base: use extends instead of overrideAttrs

NixOS · Dec 17, 2022 · 8dcf2d3 · 8dcf2d3
1 parent 20c596c
commit 8dcf2d3
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix
@@ -17,11 +17,16 @@ let
   makeOverridablePythonPackage = f: origArgs:
     let
       ff = f origArgs;
+      args = lib.fix (lib.extends
+        (_: previousAttrs: {
+          passthru = (previousAttrs.passthru or { }) // {
+            overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs);
+          };
+        })
+        (_: origArgs));
       overrideWith = newArgs: origArgs // (if pkgs.lib.isFunction newArgs then newArgs origArgs else newArgs);
     in
-      if builtins.isAttrs ff then ff.overrideAttrs (previousAttrs: { passthru = (previousAttrs.passthru or {}) // {
-        overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs);
-      };})
+      if builtins.isAttrs ff then f args
       else if builtins.isFunction ff then {
         overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs);
         __functor = self: ff;