From 5c0735d54516e97b2b59075079600f820705bb2b Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Sat, 23 Aug 2025 12:54:56 +0200 Subject: [PATCH] move imports from paste to targetNode to increase parity between paste and nixosTest --- deployment/check/common/targetNode.nix | 4 ++++ paste | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/check/common/targetNode.nix b/deployment/check/common/targetNode.nix index 8e760888..7c24aa1e 100644 --- a/deployment/check/common/targetNode.nix +++ b/deployment/check/common/targetNode.nix @@ -3,6 +3,7 @@ config, lib, modulesPath, + sources, ... }: @@ -17,7 +18,10 @@ in imports = [ (modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/../lib/testing/nixos-test-base.nix") + "${sources.disko}/module.nix" + ../../../infra/common/proxmox-qemu-vm.nix ./sharedOptions.nix + ../../../infra/common/nixos/users.nix ]; config = mkMerge [ diff --git a/paste b/paste index 25e6190f..89b3ed52 100644 --- a/paste +++ b/paste @@ -9,11 +9,7 @@ command=(nix-instantiate --expr ' sources = import ./npins; configuration = { imports = [ - ./infra/common/proxmox-qemu-vm.nix - ./infra/common/nixos/users.nix - ./deployment/check/common/sharedOptions.nix ./deployment/check/common/targetNode.nix - "${sources.disko}/module.nix" ]; }; eval = import "${sources.nixpkgs}/nixos/lib/eval-config.nix" {