Revert "lib.customisation: uncurry makeScopeWithSplicing"

2023-07-28 23:04:09 +02:00
parent 49b4b4e872
commit a0b8caf3bc
12 changed files with 67 additions and 60 deletions
@@ -48,6 +48,7 @@
      };
      hooks = import ./hooks/default.nix;
      keep = lib.extends hooks pythonPackagesFun;
+      extra = _: {};
      optionalExtensions = cond: as: lib.optionals cond as;
      pythonExtension = import ../../../top-level/python-packages.nix;
      python2Extension = import ../../../top-level/python2-packages.nix;
@@ -59,10 +60,12 @@
        overrides
      ]);
      aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super);
-    in makeScopeWithSplicing {
-      inherit otherSplices keep;
-      f = lib.extends (lib.composeExtensions aliases extensions) keep;
-    }) {
+    in makeScopeWithSplicing
+      otherSplices
+      keep
+      extra
+      (lib.extends (lib.composeExtensions aliases extensions) keep))
+    {
      overrides = packageOverrides;
      python = self;
    });