alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

lib/types: Simplify submoduleWith shorthandOnlyDefinesConfig handling

Browse source 
The module system already uses the parent module's _file as a fallback,
so we don't need to inject the file in a weird way
This commit is contained in:
Silvan Mosberger 2020-09-27 16:39:57 +02:00 committed by Robert Hensing
parent 79441600c2
commit 907627f656
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/types.nix
View file

@ -580,19 +580,10 @@ rec {
let
inherit (lib.modules) evalModules;
shorthandToModule = if shorthandOnlyDefinesConfig == false
then value: value
else value: { config = value; };
allModules = defs: imap1 (n: { value, file }:
if isFunction value
then setFunctionArgs
(args: lib.modules.unifyModuleSyntax file "${toString file}-${toString (n + extensionOffset)}" (value args))
(functionArgs value)
else if isAttrs value
then
lib.modules.unifyModuleSyntax file "${toString file}-${toString (n + extensionOffset)}" (shorthandToModule value)
else value
if isAttrs value && shorthandOnlyDefinesConfig
then { _file = file; config = value; }
else { _file = file; imports = [ value ]; }
) defs;
base = evalModules {