kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

type: swap out nixops4 deployments for raw nixos modules

Browse source
This commit is contained in:
Kiara Grouwstra 2025-07-21 22:11:17 +02:00
parent ef0c33e4b6
commit 171404366a
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,15 +7,12 @@ let
(lib.evalModules {
specialArgs = {
inherit inputs;
# to be passed to nixops4Deployment
resourceProviderSystem = builtins.currentSystem;
};
modules = [
module
./data-model.nix
];
}).config;
nixops4Deployment = import ./deployment.nix { inherit inputs; };
in
{
test-eval = {
@ -171,10 +168,7 @@ in
};
};
example-deployment = mkOption {
type = types.submoduleWith {
class = "nixops4Deployment";
modules = [ nixops4Deployment ];
};
type = types.raw;
readOnly = true;
default = config.environments.single-nixos-vm.deployment config.example-configuration;
};

15
deployment/data-model.nix
View file

@ -1,7 +1,6 @@
{
lib,
config,
inputs,
...
}:
let
@ -13,10 +12,10 @@ let
submoduleWith
optionType
functionTo
raw
;
functionType = import ./function.nix;
nixops4Deployment = import ./deployment.nix { inherit lib inputs; };
configuration = mkOption {
description = "Configuration type declaring options to be set by operators";
@ -146,10 +145,7 @@ in
};
implementation = mkOption {
description = "Mapping of resources required by applications to available resources; the result can be deployed";
type = functionTo (submoduleWith {
class = "nixops4Deployment";
modules = [ environment.config.resource-mapping.output-type ];
});
type = functionTo environment.config.resource-mapping.output-type;
};
resource-mapping = mkOption {
description = "Function type for the mapping from resources to a (NixOps4) deployment";
@ -160,15 +156,12 @@ in
readOnly = true;
default = {
input-type = configuration;
output-type = nixops4Deployment;
output-type = raw;
};
};
deployment = mkOption {
description = "Generate a deployment from a configuration";
type = functionTo (submoduleWith {
class = "nixops4Deployment";
modules = [ environment.config.resource-mapping.output-type ];
});
type = functionTo (submodule environment.config.resource-mapping.output-type);
readOnly = true;
default =
cfg: