From 3716ef19d837998c35cc102c80ad800d26517d7e Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 28 Jul 2023 17:06:35 +0300 Subject: lib.makeScopeWithSplicing: provide default for keep,extra These are often unneeded by the user. --- lib/customisation.nix | 10 +++++++++- pkgs/desktops/xfce/default.nix | 6 ------ pkgs/development/interpreters/lua-5/default.nix | 4 +--- pkgs/development/interpreters/perl/default.nix | 4 +--- pkgs/development/interpreters/python/passthrufun.nix | 3 +-- pkgs/development/libraries/qt-5/5.15/default.nix | 2 -- pkgs/games/steam/default.nix | 3 --- pkgs/os-specific/bsd/freebsd/default.nix | 2 -- pkgs/os-specific/bsd/netbsd/default.nix | 2 -- pkgs/top-level/all-packages.nix | 4 ---- pkgs/top-level/darwin-packages.nix | 1 - 11 files changed, 12 insertions(+), 29 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index a46913dc5bd..5c66169f215 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -279,7 +279,15 @@ rec { /* 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; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 41de05a41de..1593deca9c3 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -5,14 +5,8 @@ , makeScopeWithSplicing }: -let - keep = _self: { }; - extra = _spliced0: { }; - -in makeScopeWithSplicing { otherSplices = generateSplicesForMkScope "xfce"; - inherit keep extra; f = (self: let inherit (self) callPackage; diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index b0c6182cadd..918c3375b0d 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -39,15 +39,13 @@ let selfHostHost = luaOnHostForHost.pkgs; selfTargetTarget = luaOnTargetForTarget.pkgs or {}; }; - keep = self: { }; - extra = spliced0: {}; extensions = lib.composeManyExtensions [ generatedPackages overriddenPackages overrides ]; in makeScopeWithSplicing { - inherit otherSplices keep extra; + inherit otherSplices; f = lib.extends extensions luaPackagesFun; }) { diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 6eb439ea4a9..faf9e26cff7 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -34,10 +34,8 @@ let selfHostHost = perlOnHostForHost.pkgs; selfTargetTarget = perlOnTargetForTarget.pkgs or {}; }; - keep = self: { }; - extra = spliced0: {}; in makeScopeWithSplicing { - inherit otherSplices keep extra; + inherit otherSplices; f = perlPackagesFun; }) { diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index a4a04164ef3..91ff48d9571 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -48,7 +48,6 @@ }; 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; @@ -61,7 +60,7 @@ ]); aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super); in makeScopeWithSplicing { - inherit otherSplices keep extra; + inherit otherSplices keep; f = lib.extends (lib.composeExtensions aliases extensions) keep; }) { overrides = packageOverrides; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 45310664383..289af985e04 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -336,7 +336,5 @@ let in makeScopeWithSplicing { otherSplices = generateSplicesForMkScope "qt5"; - keep = _: {}; - extra = _: {}; f = addPackages; } diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index ebd0570d351..487175970cd 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -32,10 +32,7 @@ let steamcmd = callPackage ./steamcmd.nix { }; }; - keep = self: { }; - extra = spliced0: { }; in makeScopeWithSplicing { otherSplices = generateSplicesForMkScope "steamPackages"; - inherit keep extra; f = steamPackagesFun; } diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index e68b4ef87b3..e7541125436 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -68,8 +68,6 @@ let in makeScopeWithSplicing { otherSplices = generateSplicesForMkScope "freebsd"; - keep = _: {}; - extra = _: {}; f = (self: let inherit (self) mkDerivation; in { diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 6782bbf9df6..f12f5d2b18e 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -28,8 +28,6 @@ let in makeScopeWithSplicing { otherSplices = generateSplicesForMkScope "netbsd"; - keep = _: {}; - extra = _: {}; f = (self: let inherit (self) mkDerivation; in { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6047098baed..601955b0ac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27215,9 +27215,6 @@ with pkgs; }; xorg = let - keep = _self: { }; - extra = _spliced0: { }; - # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage` # so as not to have the newly bound xorg items already in scope, which would # have created a cycle. @@ -27234,7 +27231,6 @@ with pkgs; xorgPackages = makeScopeWithSplicing { otherSplices = generateSplicesForMkScope "xorg"; - inherit keep extra; f = lib.extends overrides generatedPackages; }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 55f908db980..c30d1c1c192 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -17,7 +17,6 @@ in makeScopeWithSplicing { otherSplices = generateSplicesForMkScope "darwin"; - keep = _: {}; extra = spliced: spliced.apple_sdk.frameworks; f = (self: let inherit (self) mkDerivation callPackage; -- cgit 1.4.1