diff options
author | Artturin <Artturin@artturin.com> | 2023-07-28 17:06:35 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2023-07-28 17:41:01 +0300 |
commit | 3716ef19d837998c35cc102c80ad800d26517d7e (patch) | |
tree | d4377816f21ccb188d49e3cd446c36ce0cc36e9b /pkgs/development/interpreters | |
parent | cb13669b0049e795c3421987fe9367d82a0525b1 (diff) |
lib.makeScopeWithSplicing: provide default for keep,extra
These are often unneeded by the user.
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/lua-5/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/perl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/passthrufun.nix | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index b0c6182caddd..918c3375b0d4 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 6eb439ea4a9e..faf9e26cff7f 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 a4a04164ef31..91ff48d95719 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; |