From fbb6a45292e5298144e85222c11ca95f4677b867 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Tue, 26 Aug 2025 23:47:03 +0200 Subject: [PATCH] adjust deployment type this is a cop-out possible until https://git.fediversity.eu/fricklerhandwerk/Fediversity/pulls/15. after that, this will require actually figuring out how to get `options` for `deployment.nix` - which may need `evalModules` with `data-model.nix`. --- deployment/check/data-model/deployment.nix | 1 + deployment/data-model-test.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deployment/check/data-model/deployment.nix b/deployment/check/data-model/deployment.nix index 36f9013b..69380519 100644 --- a/deployment/check/data-model/deployment.nix +++ b/deployment/check/data-model/deployment.nix @@ -146,6 +146,7 @@ let }; }; "example-deployment" = mkOption { + type = config.environments.single-nixos-vm.resource-mapping.output-type; default = config.environments.single-nixos-vm.deployment config."example-configuration"; }; }; diff --git a/deployment/data-model-test.nix b/deployment/data-model-test.nix index d72baf11..e754bc03 100644 --- a/deployment/data-model-test.nix +++ b/deployment/data-model-test.nix @@ -31,7 +31,7 @@ in expr = let fediversity = eval ( - { config, options, ... }: + { config, ... }: { config = { resources.login-shell = { @@ -148,7 +148,7 @@ in }; }; "example-deployment" = mkOption { - type = options.deployments.nestedType; + type = config.environments.single-nixos-vm.resource-mapping.output-type; readOnly = true; default = config.environments.single-nixos-vm.deployment config."example-configuration"; };