From bd585822e0c892e400bf43c9e5c2f08484734e62 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Wed, 3 Sep 2025 13:58:43 +0200 Subject: [PATCH] fix data model Signed-off-by: Kiara Grouwstra --- deployment/check/common/data-model.nix | 9 +++------ deployment/data-model.nix | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/deployment/check/common/data-model.nix b/deployment/check/common/data-model.nix index 294abbde..27dd8149 100644 --- a/deployment/check/common/data-model.nix +++ b/deployment/check/common/data-model.nix @@ -105,8 +105,7 @@ let options.enable = lib.mkEnableOption "Hello in the shell"; }; implementation = cfg: { - input = cfg; - output.resources = lib.optionalAttrs cfg.enable { + resources = lib.optionalAttrs cfg.enable { hello.login-shell.packages.hello = pkgs.hello; }; }; @@ -142,8 +141,7 @@ let deployment-name, }: { - input = required-resources; - output.ssh-host = { + ssh-host = { nixos-configuration = mkNixosConfiguration environment required-resources; system = targetSystem; ssh = { @@ -166,8 +164,7 @@ let ... }: { - input = required-resources; - output.nixops4 = + nixops4 = { providers, ... }: { providers = { diff --git a/deployment/data-model.nix b/deployment/data-model.nix index 6e7bcd36..8a71efca 100644 --- a/deployment/data-model.nix +++ b/deployment/data-model.nix @@ -286,7 +286,7 @@ in }; config-mapping = mkOption { description = "Mapping from a configuration to a deployment"; - type = submodule functionType; + type = functionType; readOnly = true; default = { input-type = submodule {