From f594f608dc84a391f8ac547680dd06b76af94d96 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 29 Oct 2024 05:21:34 +0000 Subject: [PATCH] =?UTF-8?q?tests.nixos-functions:=20don=E2=80=99t=20omit?= =?UTF-8?q?=20derivations=20on=20non=E2=80=90Linux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hydra can handle packages that `throw` but not attributes that disappear depending on platform, and it seems okay for evaluation to fail here for non‐Linux platforms. --- pkgs/test/nixos-functions/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix index bdd5e3c6d8b4..fc9a726570ff 100644 --- a/pkgs/test/nixos-functions/default.nix +++ b/pkgs/test/nixos-functions/default.nix @@ -17,15 +17,13 @@ let versionSuffix = "test"; label = "test"; }; -in lib.optionalAttrs stdenv.hostPlatform.isLinux ( - pkgs.recurseIntoAttrs { +in pkgs.recurseIntoAttrs { - nixos-test = (pkgs.nixos { - system.nixos = dummyVersioning; - boot.loader.grub.enable = false; - fileSystems."/".device = "/dev/null"; - system.stateVersion = lib.trivial.release; - }).toplevel; + nixos-test = (pkgs.nixos { + system.nixos = dummyVersioning; + boot.loader.grub.enable = false; + fileSystems."/".device = "/dev/null"; + system.stateVersion = lib.trivial.release; + }).toplevel; - } -) +}