diff --git a/deployment/check/common/deployerNode.nix b/deployment/check/common/deployerNode.nix index 4a01f2cd..94cf491c 100644 --- a/deployment/check/common/deployerNode.nix +++ b/deployment/check/common/deployerNode.nix @@ -74,20 +74,18 @@ in ## configuration and the store paths needed to build it and ## dump them in `system.extraDependencies`. machine = - (pkgs.nixos ( - [ - ./targetNode.nix - # ../../../infra/common/nixos/repart.nix - config.system.extraDependenciesFromModule - { - nixpkgs.hostPlatform = "x86_64-linux"; - _module.args = { inherit inputs sources; }; - enableAcme = config.enableAcme; - acmeNodeIP = config.acmeNodeIP; - } - ] - ++ (lib.optional config.useFlake "${modulesPath}/../lib/testing/nixos-test-base.nix") - )).config; + (pkgs.nixos [ + ./targetNode.nix + # ../../../infra/common/nixos/repart.nix + "${modulesPath}/../lib/testing/nixos-test-base.nix" + config.system.extraDependenciesFromModule + { + nixpkgs.hostPlatform = "x86_64-linux"; + _module.args = { inherit inputs sources; }; + enableAcme = config.enableAcme; + acmeNodeIP = config.acmeNodeIP; + } + ]).config; in [ diff --git a/deployment/check/common/nixosTest.nix b/deployment/check/common/nixosTest.nix index 5dcc81c9..98b110a2 100644 --- a/deployment/check/common/nixosTest.nix +++ b/deployment/check/common/nixosTest.nix @@ -4,6 +4,7 @@ config, hostPkgs, sources, + modulesPath, ... }: @@ -112,7 +113,7 @@ in (genAttrs config.targetMachines (_: { imports = [ ./targetNode.nix - ] ++ (lib.optional config.useFlake "${sources.nixpkgs}/nixos/lib/testing/nixos-test-base.nix"); + ] ++ (lib.optional config.useFlake "${modulesPath}/../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;