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
2 changed files with 19 additions and 5 deletions
Showing only changes of commit b49e426ed4 - Show all commits

View file

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

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 in
{ {
options = { options = {