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

simplify deployment/nixos.nix

Browse source
This commit is contained in:
Kiara Grouwstra 2025-08-31 17:34:03 +02:00
parent cc66348444
commit 12c51f1d11
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
deployment/check/data-model-ssh/nixosTest.nix
View file

@ -58,10 +58,10 @@ in
}; };
extraTestScript = '' extraTestScript = ''
with subtest("ssh: Check the status before deployment"): with subtest("Check the status before deployment"):
ssh.fail("hello 1>&2") ssh.fail("hello 1>&2")
with subtest("ssh: Run the deployment"): with subtest("Run the deployment"):
deployer.succeed(""" deployer.succeed("""
set -euo pipefail set -euo pipefail

16
deployment/nixos.nix
View file

@ -11,13 +11,15 @@ let
}; };
modules = [ configuration ]; modules = [ configuration ];
}; };
os = { toplevel =
inherit (eval) pkgs config options; {
system = eval.config.system.build.toplevel; inherit (eval) pkgs config options;
inherit (eval.config.system.build) vm vmWithBootLoader; system = eval.config.system.build.toplevel;
}; inherit (eval.config.system.build) vm vmWithBootLoader;
}
.config.system.build.toplevel;
in in
{ {
drv_path = os.config.system.build.toplevel.drvPath; drv_path = toplevel.drvPath;
out_path = os.config.system.build.toplevel; out_path = toplevel;
} }