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

fix import

Browse source 
Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
This commit is contained in:
Kiara Grouwstra 2025-10-22 20:45:17 +02:00
parent 20ac7d6aff
commit 7b0db200c3
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
deployment/check/common/nixosTest.nix
View file

@ -4,7 +4,6 @@
config,
hostPkgs,
sources,
modulesPath,
...
}:
@ -68,8 +67,7 @@ in
};
config = {
sourceFileset = fileset.unions (
[
sourceFileset = fileset.unions [
# NOTE: not the flake itself; it will be overridden.
../../../mkFlake.nix
../../../flake.lock
@ -78,9 +76,7 @@ in
./sharedOptions.nix
./targetNode.nix
./targetResource.nix
]
++ (lib.optional config.useFlake "${modulesPath}/../lib/testing/nixos-test-base.nix")
);
];
acmeNodeIP = config.nodes.acme.networking.primaryIPAddress;
@ -118,7 +114,7 @@ in
(genAttrs config.targetMachines (_: {
imports = [
./targetNode.nix
] ++ (lib.optional config.useFlake (modulesPath + "/../lib/testing/nixos-test-base.nix"));
] ++ (lib.optional config.useFlake "${sources.nixpkgs}/nixos/lib/testing/nixos-test-base.nix");
_module.args = { inherit inputs sources; };
enableAcme = config.enableAcme;
acmeNodeIP = if config.enableAcme then config.nodes.acme.networking.primaryIPAddress else null;