From 2a5454490e7596e4ac2e7b24498ccd59e3d8a06a Mon Sep 17 00:00:00 2001 From: nicoo Date: Mon, 19 Aug 2024 14:51:18 +0000 Subject: [PATCH] nixosTests.systemd-boot.memtest86: only run when `memtest86plus` is available (#335825) The blocks the `nixos-unstable` channel due to an [evaluation error] for `aarch64-linux`. [evaluation error]: https://gist.github.com/nbraud/8820dda48156922f998bba987eb229c6 --- nixos/tests/systemd-boot.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index c94050cf816a..ee724a63f67f 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -269,9 +269,9 @@ in ''; }; - memtest86 = makeTest { + memtest86 = with pkgs.lib; optionalAttrs (meta.availableOn { inherit system; } pkgs.memtest86plus) (makeTest { name = "systemd-boot-memtest86"; - meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; + meta.maintainers = with maintainers; [ julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -282,7 +282,7 @@ in machine.succeed("test -e /boot/loader/entries/memtest86.conf") machine.succeed("test -e /boot/efi/memtest86/memtest.efi") ''; - }; + }); netbootxyz = makeTest { name = "systemd-boot-netbootxyz";