fricklerhandwerk/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

revert submodule wrapper to align with module functions already doing types #2

Closed
kiara wants to merge 37 commits from kiara/Fediversity:fix-submodule-type into main
pull from: kiara/Fediversity:fix-submodule-type
merge into: fricklerhandwerk:main
Conversation 1 Commits 37 Files changed 73 +9 -9
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 421d7b6f93 - Show all commits

5
deployment/data-model-test.nix
View file

@ -164,7 +164,8 @@ in
{ {
inherit (fediversity) example-deployment; inherit (fediversity) example-deployment;
}; };
expected = { expected =
}; {
};
}; };
} }

4
deployment/data-model.nix
View file

@ -17,7 +17,7 @@ let
; ;
functionType = import ./function.nix; functionType = import ./function.nix;
application-resources = { application-resources = submodule {
options.resources = mkOption { options.resources = mkOption {
# TODO: maybe transpose, and group the resources by type instead # TODO: maybe transpose, and group the resources by type instead
type = attrsOf ( type = attrsOf (
@ -25,7 +25,7 @@ let
); );
}; };
}; };
nixops4Deployment = inputs.nixops4.modules.nixops4Deployment.default; nixops4Deployment = submodule inputs.nixops4.modules.nixops4Deployment.default;
in in
{ {
options = { options = {

9
deployment/function.nix
View file

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