From 2680e0beca7d793ef2c56834adfdd446d332029a Mon Sep 17 00:00:00 2001 From: Winter Date: Mon, 19 May 2025 01:55:26 -0400 Subject: [PATCH 1/2] nixos/tests: don't explicitly set `meta.platforms` This prevents the tests from running on Darwin for no real reason. --- nixos/tests/bitbox-bridge.nix | 11 ++++------- nixos/tests/cosmic.nix | 5 +---- nixos/tests/limine/checksum.nix | 5 ----- nixos/tests/limine/uefi.nix | 5 ----- nixos/tests/lomiri-calendar-app.nix | 6 +----- nixos/tests/lomiri-music-app.nix | 6 +----- nixos/tests/shadps4.nix | 1 - nixos/tests/velocity.nix | 8 +------- nixos/tests/wstunnel.nix | 2 -- 9 files changed, 8 insertions(+), 41 deletions(-) diff --git a/nixos/tests/bitbox-bridge.nix b/nixos/tests/bitbox-bridge.nix index 0fe4ea94acb9..ab1140e2511c 100644 --- a/nixos/tests/bitbox-bridge.nix +++ b/nixos/tests/bitbox-bridge.nix @@ -5,13 +5,10 @@ let in { name = "bitbox-bridge"; - meta = { - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ - izelnakri - tensor5 - ]; - }; + meta.maintainers = with lib.maintainers; [ + izelnakri + tensor5 + ]; nodes.machine = { services.bitbox-bridge = { diff --git a/nixos/tests/cosmic.nix b/nixos/tests/cosmic.nix index 3f48a384913a..00b1f478d81e 100644 --- a/nixos/tests/cosmic.nix +++ b/nixos/tests/cosmic.nix @@ -10,10 +10,7 @@ { name = testName; - meta = { - platforms = lib.platforms.linux; - maintainers = lib.teams.cosmic.members; - }; + meta.maintainers = lib.teams.cosmic.members; nodes.machine = { imports = [ ./common/user-account.nix ]; diff --git a/nixos/tests/limine/checksum.nix b/nixos/tests/limine/checksum.nix index 78352bf5da83..db01f8ccea92 100644 --- a/nixos/tests/limine/checksum.nix +++ b/nixos/tests/limine/checksum.nix @@ -6,11 +6,6 @@ phip1611 programmerlexi ]; - meta.platforms = [ - "aarch64-linux" - "i686-linux" - "x86_64-linux" - ]; nodes.machine = { ... }: { diff --git a/nixos/tests/limine/uefi.nix b/nixos/tests/limine/uefi.nix index 12f2f695a865..4c9d0309d25b 100644 --- a/nixos/tests/limine/uefi.nix +++ b/nixos/tests/limine/uefi.nix @@ -6,11 +6,6 @@ phip1611 programmerlexi ]; - meta.platforms = [ - "aarch64-linux" - "i686-linux" - "x86_64-linux" - ]; nodes.machine = { ... }: { diff --git a/nixos/tests/lomiri-calendar-app.nix b/nixos/tests/lomiri-calendar-app.nix index c42e0f96e52c..41061a066638 100644 --- a/nixos/tests/lomiri-calendar-app.nix +++ b/nixos/tests/lomiri-calendar-app.nix @@ -1,11 +1,7 @@ { pkgs, lib, ... }: { name = "lomiri-calendar-app-standalone"; - meta = { - maintainers = lib.teams.lomiri.members; - # This needs a Linux VM - platforms = lib.platforms.linux; - }; + meta.maintainers = lib.teams.lomiri.members; nodes.machine = { config, pkgs, ... }: diff --git a/nixos/tests/lomiri-music-app.nix b/nixos/tests/lomiri-music-app.nix index 354103f90e88..87722db239d7 100644 --- a/nixos/tests/lomiri-music-app.nix +++ b/nixos/tests/lomiri-music-app.nix @@ -8,11 +8,7 @@ let in { name = "lomiri-music-app-standalone"; - meta = { - maintainers = lib.teams.lomiri.members; - # This needs a Linux VM - platforms = lib.platforms.linux; - }; + meta.maintainers = lib.teams.lomiri.members; nodes.machine = { config, pkgs, ... }: diff --git a/nixos/tests/shadps4.nix b/nixos/tests/shadps4.nix index a41f952d6cb8..71d056cf001b 100644 --- a/nixos/tests/shadps4.nix +++ b/nixos/tests/shadps4.nix @@ -3,7 +3,6 @@ name = "shadps4-openorbis-example"; meta = { inherit (pkgs.shadps4.meta) maintainers; - platforms = lib.intersectLists lib.platforms.linux pkgs.shadps4.meta.platforms; }; nodes.machine = diff --git a/nixos/tests/velocity.nix b/nixos/tests/velocity.nix index 1e701977514d..d9ae4e75d87e 100644 --- a/nixos/tests/velocity.nix +++ b/nixos/tests/velocity.nix @@ -1,13 +1,7 @@ { lib, pkgs, ... }: { name = "velocity"; - meta = { - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; - maintainers = [ lib.maintainers.Tert0 ]; - }; + meta.maintainers = [ lib.maintainers.Tert0 ]; nodes.server = { ... }: diff --git a/nixos/tests/wstunnel.nix b/nixos/tests/wstunnel.nix index 753f78061e7b..12547213f20b 100644 --- a/nixos/tests/wstunnel.nix +++ b/nixos/tests/wstunnel.nix @@ -8,8 +8,6 @@ in { name = "wstunnel"; - meta.platforms = lib.platforms.linux; - nodes = { server = { virtualisation.vlans = [ 1 ]; From f3db57edfaebb32fa3ed3d3ba3e2b2c83513275e Mon Sep 17 00:00:00 2001 From: Winter Date: Mon, 19 May 2025 01:55:26 -0400 Subject: [PATCH 2/2] nixos/tests/installer: include x86_64-darwin in platforms for uefi tests Also makes it so that we only set `meta.platforms` in cases where we need to restrict it; otherwise, we go with the default. --- nixos/tests/installer.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 7ee3a771184a..30496a51e171 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -651,14 +651,11 @@ let # put global maintainers here, individuals go into makeInstallerTest fkt call maintainers = (meta.maintainers or [ ]); # non-EFI tests can only run on x86 - platforms = - if isEfi then - platforms.linux - else - [ - "x86_64-linux" - "i686-linux" - ]; + platforms = lib.mkIf (!isEfi) [ + "x86_64-linux" + "x86_64-darwin" + "i686-linux" + ]; }; nodes = let