diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2023-07-11 11:48:24 +0200 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2023-07-11 12:22:57 +0200 |
| commit | eb410eab821b013017196cc39a401c030051937c (patch) | |
| tree | 1401aa15d3d35bd8b6fb4fb41a288d70264bfec1 /lib/modules.nix | |
| parent | 65de18210d67a513ffd90d17b91738b597476f7a (diff) | |
| download | nixpkgs-eb410eab821b013017196cc39a401c030051937c.tar nixpkgs-eb410eab821b013017196cc39a401c030051937c.tar.gz nixpkgs-eb410eab821b013017196cc39a401c030051937c.tar.bz2 nixpkgs-eb410eab821b013017196cc39a401c030051937c.tar.lz nixpkgs-eb410eab821b013017196cc39a401c030051937c.tar.xz nixpkgs-eb410eab821b013017196cc39a401c030051937c.tar.zst nixpkgs-eb410eab821b013017196cc39a401c030051937c.zip | |
lib/modules.nix: Apply argument `modules` of old old old byName
Diffstat (limited to 'lib/modules.nix')
| -rw-r--r-- | lib/modules.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index b97d288228a..2b05e872625 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -540,7 +540,7 @@ let mergeModules' = prefix: options: configs: let # an attrset 'name' => list of submodules that declare ‘name’. - declsByName = (modules: + declsByName = zipAttrsWith (n: concatLists) (map (module: let subtree = module.options; in if !(builtins.isAttrs subtree) then @@ -555,9 +555,9 @@ let [{ inherit (module) _file; options = option; }] ) module) subtree - ) modules)) options; + ) options); # an attrset 'name' => list of submodules that define ‘name’. - defnsByName = (modules: + defnsByName = zipAttrsWith (n: concatLists) (map (module: let subtree = module.config; in if !(builtins.isAttrs subtree) then @@ -576,9 +576,9 @@ let map (config: { inherit (module) file; inherit config; }) (pushDownProperties value) ) module) subtree - ) modules)) configs; + ) configs); # extract the definitions for each loc - defnsByName' = (modules: + defnsByName' = zipAttrsWith (n: concatLists) (map (module: let subtree = module.config; in if !(builtins.isAttrs subtree) then @@ -597,7 +597,7 @@ let [{ inherit (module) file; inherit value; }] ) module) subtree - ) modules)) configs; + ) configs); # Convert an option tree decl to a submodule option decl optionTreeToOption = decl: |