Retropex/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib.modules: simplified logic in usage of zipAttrsWith and minor cleanup (#388748)

Browse Source
This commit is contained in:
Robert Hensing 2025-04-01 00:48:56 +02:00 committed by GitHub
commit d2c9829366
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/modules.nix
View File

@ -320,7 +320,6 @@ let
prefix ? [],
}:
evalModules (evalModulesArgs // {
inherit class;
modules = regularModules ++ modules;
specialArgs = evalModulesArgs.specialArgs or {} // specialArgs;
prefix = extendArgs.prefix or evalModulesArgs.prefix or [];
@ -335,8 +334,7 @@ let
options = checked options;
config = checked (removeAttrs config [ "_module" ]);
_module = checked (config._module);
inherit extendModules type;
class = class;
inherit extendModules type class;
};
in result;
@ -602,7 +600,7 @@ let
# an attrset 'name' => list of submodules that declare ‘name’.
declsByName =
zipAttrsWith
(n: concatLists)
(n: v: v)
(map
(module: let subtree = module.options; in
if !(isAttrs subtree) then
@ -614,7 +612,7 @@ let
else
mapAttrs
(n: option:
[{ inherit (module) _file; pos = unsafeGetAttrPos n subtree; options = option; }]
{ inherit (module) _file; pos = unsafeGetAttrPos n subtree; options = option; }
)
subtree
)
@ -657,12 +655,12 @@ let
# extract the definitions for each loc
rawDefinitionsByName =
zipAttrsWith
(n: concatLists)
(n: v: v)
(map
(module:
mapAttrs
(n: value:
[{ inherit (module) file; inherit value; }]
{ inherit (module) file; inherit value; }
)
module.config
)