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 +19 -5
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b49e426ed4 - Show all commits

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

@ -106,7 +106,7 @@ in
module =
{ ... }:
{
enable = lib.mkEnableOption "Hello in the shell";
options.enable = lib.mkEnableOption "Hello in the shell";
};
implementation =
cfg:
@ -162,10 +162,13 @@ in
);
in
{
inherit (fediversity) example-deployment;
config = fediversity.example-configuration;
};
expected =
{
expected = {
config = {
enable = true;
applications.hello.enable = true;
};
};
};
}

13
deployment/data-model.nix
View file

@ -25,7 +25,18 @@ let
);
};
};
nixops4Deployment = submodule inputs.nixops4.modules.nixops4Deployment.default;
nixops4Deployment = types.deferredModuleWith {
staticModules = [
inputs.nixops4.modules.nixops4Deployment.default
{
_module.args = {
resourceProviderSystem = builtins.currentSystem;
resources = { };
};
}
];
};
in
{
options = {