diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2023-07-11 11:57:39 +0200 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2023-07-11 12:22:58 +0200 |
| commit | 448b153f819c1fc43db5954ee9788f6f51b93b27 (patch) | |
| tree | b27fb77038e522509b2533f9d60864ad09d0c856 /lib/modules.nix | |
| parent | fb988c6193788f57ab4d53d8cbc8c014e88952ae (diff) | |
| download | nixpkgs-448b153f819c1fc43db5954ee9788f6f51b93b27.tar nixpkgs-448b153f819c1fc43db5954ee9788f6f51b93b27.tar.gz nixpkgs-448b153f819c1fc43db5954ee9788f6f51b93b27.tar.bz2 nixpkgs-448b153f819c1fc43db5954ee9788f6f51b93b27.tar.lz nixpkgs-448b153f819c1fc43db5954ee9788f6f51b93b27.tar.xz nixpkgs-448b153f819c1fc43db5954ee9788f6f51b93b27.tar.zst nixpkgs-448b153f819c1fc43db5954ee9788f6f51b93b27.zip | |
lib/modules.nix: Rename defnsByName' -> rawDefinitionsByName
Diffstat (limited to 'lib/modules.nix')
| -rw-r--r-- | lib/modules.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index 0f416f099b8..14efb39b8a0 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -578,7 +578,7 @@ let subtree ) configs); # extract the definitions for each loc - defnsByName' = + rawDefinitionsByName = zipAttrsWith (n: concatLists) (map (module: let subtree = module.config; in if !(builtins.isAttrs subtree) then @@ -620,7 +620,7 @@ let let loc = prefix ++ [name]; defns = defnsByName.${name} or []; - defns' = defnsByName'.${name} or []; + defns' = rawDefinitionsByName.${name} or []; optionDecls = filter (m: isOption m.options) decls; in if length optionDecls == length decls then @@ -663,7 +663,7 @@ let # Propagate all unmatched definitions from nested option sets mapAttrs (n: v: v.unmatchedDefns) resultsByName # Plus the definitions for the current prefix that don't have a matching option - // removeAttrs defnsByName' (attrNames matchedOptions); + // removeAttrs rawDefinitionsByName (attrNames matchedOptions); in { inherit matchedOptions; |