Merge remote-tracking branch 'upstream/staging-next' into staging

2021-05-06 15:48:25 -04:00
parent c63e69cd89 5f7ad00ae9
commit a3e54cb582
34 changed files with 616 additions and 292 deletions
@@ -26,7 +26,8 @@ in lib.makeScopeWithSplicing
  splicePackages
  newScope
  otherSplices
-  {}
+  (_: {})
+  (_: {})
  (self: let
    inherit (self) mkDerivation;
  in {