diff options
Diffstat (limited to 'lib/modules.nix')
-rw-r--r-- | lib/modules.nix | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index c25972999dfe..3a420451bf8e 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -121,7 +121,9 @@ rec { }; config = { - _module.args = args; + _module.args = { + inherit extendModules; + } // args; }; }; @@ -186,24 +188,26 @@ rec { checked = builtins.seq checkUnmatched; + extendModules = extendArgs@{ + modules ? [], + specialArgs ? {}, + prefix ? [], + }: + evalModules (evalModulesArgs // { + modules = evalModulesArgs.modules ++ modules; + specialArgs = evalModulesArgs.specialArgs or {} // specialArgs; + prefix = extendArgs.prefix or evalModulesArgs.prefix; + }); + + type = lib.types.submoduleWith { + inherit modules specialArgs; + }; + result = { options = checked options; config = checked (removeAttrs config [ "_module" ]); _module = checked (config._module); - - extendModules = extendArgs@{ - modules ? [], - specialArgs ? {}, - prefix ? [], - }: - evalModules (evalModulesArgs // { - modules = evalModulesArgs.modules ++ modules; - specialArgs = evalModulesArgs.specialArgs or {} // specialArgs; - prefix = extendArgs.prefix or evalModulesArgs.prefix; - }); - type = lib.types.submoduleWith { - inherit modules specialArgs; - }; + inherit extendModules type; }; in result; |