feat(submodules): pass instance name directly

This commit is contained in:
Jaka Hudoklin 2019-02-17 19:43:04 +01:00
parent b4c4f17cc9
commit 4d08da78e0
No known key found for this signature in database
GPG key ID: 916062A1C4748647
2 changed files with 24 additions and 14 deletions

View file

@ -19,7 +19,6 @@ let
modules = opts' ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
in (evalModules {
inherit modules specialArgs;
args.name = last loc;
prefix = loc;
}).config;
getSubOptions = prefix: (evalModules
@ -203,9 +202,7 @@ in {
description = "Submodule instance ${config.name} for ${submoduleDefinition.name}:${submoduleDefinition.version} config";
type = submoduleWithSpecialArgs ({...}: {
imports = submodule.modules ++ cfg.defaults ++ [submoduleOptions ./submodules.nix];
_module.args.submodule = {
name = config.name;
};
_module.args.name = config.name;
}) specialArgs;
default = {};
};