feat(submodules): make submoduleDefinitionOptions as subtree and not submodule

This commit is contained in:
Jaka Hudoklin 2019-03-01 09:54:34 +01:00
parent 59691c6ea9
commit d530750ffe
No known key found for this signature in database
GPG key ID: 6A08896BFD32BD95

View file

@ -60,38 +60,32 @@ let
}; };
submoduleDefinitionOptions = { submoduleDefinitionOptions = {
options = { name = mkOption {
name = mkOption { description = "Module name";
description = "Module name"; type = types.str;
type = types.str; };
};
description = mkOption { description = mkOption {
description = "Module description"; description = "Module description";
type = types.str; type = types.str;
default = ""; default = "";
}; };
version = mkOption { version = mkOption {
description = "Module version"; description = "Module version";
type = types.str; type = types.str;
default = "1.0.0"; default = "1.0.0";
}; };
tags = mkOption { tags = mkOption {
description = "List of submodule tags"; description = "List of submodule tags";
type = types.listOf types.str; type = types.listOf types.str;
default = []; default = [];
};
}; };
}; };
submoduleOptions = { submoduleOptions = {
options.submodule = mkOption { options.submodule = submoduleDefinitionOptions;
description = "Submodule options";
type = types.submodule submoduleDefinitionOptions;
default = {};
};
}; };
specialArgs = cfg.specialArgs // { specialArgs = cfg.specialArgs // {
@ -179,10 +173,11 @@ in {
default = [config.module]; default = [config.module];
}; };
definition = mkOption { definition = submoduleDefinitionOptions;
type = types.submodule submoduleDefinitionOptions; };
default = submoduleDefinition;
}; config.definition = {
inherit (submoduleDefinition) name description version tags;
}; };
}) })
) )