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 fb25554c7b
commit 96a69c628e
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

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

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