Merge master into staging-next

2023-01-07 18:01:08 +00:00
parent 76d33189ba 716cab1403
commit 3b3114f45d
54 changed files with 1868 additions and 1925 deletions
@@ -5,9 +5,8 @@
 , db
 , lib
 , libffiBoot
-, newScope
+, makeScopeWithSplicing
 , pythonPackagesExtensions
-, splicePackages
 , stdenv
 }:

@@ -71,9 +70,7 @@
            overrides
          ]);
          aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super);
-        in lib.makeScopeWithSplicing
-          splicePackages
-          newScope
+        in makeScopeWithSplicing
          otherSplices
          keep
          extra