Merge branch 'master' into staging-next

Had to merge NixOS/nixpkgs#245957 and
NixOS/nixpkgs#247245.

lib/customisation.nix

@@ -278,9 +278,24 @@ rec {
  };
  in self;
 
+ /* backward compatibility with old uncurried form; deprecated */
+ makeScopeWithSplicing =
+ splicePackages: newScope: otherSplices: keep: extra: f:
+ makeScopeWithSplicing' {
+ inherit splicePackages newScope otherSplices keep extra f;
+ };
+
  /* Like the above, but aims to support cross compilation. It's still ugly, but
  hopefully it helps a little bit. */
- makeScopeWithSplicing = splicePackages: newScope: otherSplices: keep: extra: f:
+ makeScopeWithSplicing' =
+ { splicePackages
+ , newScope
+ }:
+ { otherSplices
+ , keep ? (_self: {})
+ , extra ? (_spliced0: {})
+ , f
+ }:
  let
  spliced0 = splicePackages {
  pkgsBuildBuild = otherSplices.selfBuildBuild;
@@ -296,13 +311,11 @@ rec {
  callPackage = newScope spliced; # == self.newScope {};
  # N.B. the other stages of the package set spliced in are *not*
  # overridden.
- overrideScope = g: makeScopeWithSplicing
- splicePackages
- newScope
- otherSplices
- keep
- extra
- (lib.fixedPoints.extends g f);
+ overrideScope = g: (makeScopeWithSplicing'
+ { inherit splicePackages newScope; }
+ { inherit otherSplices keep extra;
+ f = lib.fixedPoints.extends g f;
+ });
  packages = f;
  };
  in self;

lib/default.nix

@@ -112,7 +112,7 @@ let
  noDepEntry fullDepEntry packEntry stringAfter;
  inherit (self.customisation) overrideDerivation makeOverridable
  callPackageWith callPackagesWith extendDerivation hydraJob
- makeScope makeScopeWithSplicing;
+ makeScope makeScopeWithSplicing makeScopeWithSplicing';
  inherit (self.derivations) lazyDerivation;
  inherit (self.meta) addMetaAttrs dontDistribute setName updateName
  appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio