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