From 816b6de30727a67fc45d01802ee46af46ac277e8 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 4 May 2025 22:20:35 -0700 Subject: [PATCH] nixosTests: fix pure eval by setting system to null --- nixos/tests/boot.nix | 3 +++ nixos/tests/ec2.nix | 1 + nixos/tests/image-contents.nix | 1 + nixos/tests/openstack-image.nix | 1 + nixos/tests/systemd-machinectl.nix | 1 + 5 files changed, 7 insertions(+) diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index 2cf3a4aa89ce..e15797765462 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -65,6 +65,7 @@ let iso = (import ../lib/eval-config.nix { + system = null; modules = [ ../modules/installer/cd-dvd/installation-cd-minimal.nix ../modules/testing/test-instrumentation.nix @@ -74,6 +75,7 @@ let sd = (import ../lib/eval-config.nix { + system = null; modules = [ ../modules/installer/sd-card/sd-image-x86_64.nix ../modules/testing/test-instrumentation.nix @@ -111,6 +113,7 @@ let let config = (import ../lib/eval-config.nix { + system = null; modules = [ ../modules/installer/netboot/netboot.nix ../modules/testing/test-instrumentation.nix diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index 6040e9320d8f..b83d7e150207 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -12,6 +12,7 @@ with import common/ec2.nix { inherit makeTest pkgs; }; let imageCfg = (import ../lib/eval-config.nix { + system = null; modules = [ ../maintainers/scripts/ec2/amazon-image.nix ../modules/testing/test-instrumentation.nix diff --git a/nixos/tests/image-contents.nix b/nixos/tests/image-contents.nix index a13eb425efa9..bfa4f08adc40 100644 --- a/nixos/tests/image-contents.nix +++ b/nixos/tests/image-contents.nix @@ -14,6 +14,7 @@ with import common/ec2.nix { inherit makeTest pkgs; }; let config = (import ../lib/eval-config.nix { + system = null; modules = [ ../modules/testing/test-instrumentation.nix ../modules/profiles/qemu-guest.nix diff --git a/nixos/tests/openstack-image.nix b/nixos/tests/openstack-image.nix index e0b99be6e4dc..83c34fefef1f 100644 --- a/nixos/tests/openstack-image.nix +++ b/nixos/tests/openstack-image.nix @@ -12,6 +12,7 @@ with import common/ec2.nix { inherit makeTest pkgs; }; let image = (import ../lib/eval-config.nix { + system = null; modules = [ ../maintainers/scripts/openstack/openstack-image.nix ../modules/testing/test-instrumentation.nix diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix index 0e36e00e6b26..2e35d160f533 100644 --- a/nixos/tests/systemd-machinectl.nix +++ b/nixos/tests/systemd-machinectl.nix @@ -26,6 +26,7 @@ import ./make-test-python.nix ( containerSystem = (import ../lib/eval-config.nix { + system = null; modules = [ container ]; }).config.system.build.toplevel;