From 7b0db200c35f877d495fafd2b37d1ec65b879912 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Wed, 22 Oct 2025 20:45:17 +0200 Subject: [PATCH] fix import Signed-off-by: Kiara Grouwstra --- deployment/check/common/nixosTest.nix | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/deployment/check/common/nixosTest.nix b/deployment/check/common/nixosTest.nix index 3da05084..d12bca3f 100644 --- a/deployment/check/common/nixosTest.nix +++ b/deployment/check/common/nixosTest.nix @@ -4,7 +4,6 @@ config, hostPkgs, sources, - modulesPath, ... }: @@ -68,19 +67,16 @@ in }; config = { - sourceFileset = fileset.unions ( - [ - # NOTE: not the flake itself; it will be overridden. - ../../../mkFlake.nix - ../../../flake.lock - ../../../npins + sourceFileset = fileset.unions [ + # NOTE: not the flake itself; it will be overridden. + ../../../mkFlake.nix + ../../../flake.lock + ../../../npins - ./sharedOptions.nix - ./targetNode.nix - ./targetResource.nix - ] - ++ (lib.optional config.useFlake "${modulesPath}/../lib/testing/nixos-test-base.nix") - ); + ./sharedOptions.nix + ./targetNode.nix + ./targetResource.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;