Compare commits

..

4 commits

2 changed files with 8 additions and 8 deletions

View file

@ -9,7 +9,6 @@ let
attrsOf
attrTag
deferredModuleWith
submodule
submoduleWith
optionType
functionTo
@ -170,7 +169,7 @@ in
};
implementation = mkOption {
description = "Mapping of resources required by applications to available resources; the result can be deployed";
type = functionTo environment.config.resource-mapping.output-type;
type = functionTo raw;
};
resource-mapping = mkOption {
description = "Function type for the mapping from resources to a (NixOps4) deployment";
@ -180,13 +179,13 @@ in
};
readOnly = true;
default = {
input-type = submodule configuration;
input-type = configuration;
output-type = raw;
};
};
deployment = mkOption {
description = "Generate a deployment from a configuration";
type = functionTo environment.config.resource-mapping.output-type;
type = functionTo raw;
readOnly = true;
default =
cfg:

View file

@ -5,6 +5,7 @@
let
inherit (lib) mkOption types;
inherit (types)
deferredModule
submodule
functionTo
optionType
@ -13,10 +14,10 @@ in
{
options = {
input-type = mkOption {
type = optionType;
type = deferredModule;
};
output-type = mkOption {
type = optionType;
type = deferredModule;
};
function-type = mkOption {
type = optionType;
@ -24,10 +25,10 @@ in
default = functionTo (submodule {
options = {
input = mkOption {
type = config.input-type;
type = submodule config.input-type;
};
output = mkOption {
type = config.output-type;
type = submodule config.output-type;
};
};
});