From e95bd0bf1c57f935c8eab658e3affbdde77a2ffa Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Wed, 26 Nov 2025 22:16:28 -0800 Subject: [PATCH] nixos/systemd-boot: use new combined memtest86plus binary memtest86plus puts the path to the binary at a passthru attr after memtest86plus 8 there's a single combined EFI+legacy file --- .../modules/system/boot/loader/systemd-boot/systemd-boot.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 487c9995e0c8..c4275d0410c3 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -391,7 +391,7 @@ in type = types.attrsOf types.path; default = { }; example = literalExpression '' - { "efi/memtest86/memtest.efi" = "''${pkgs.memtest86plus}/memtest.efi"; } + { "efi/memtest86/memtest.efi" = pkgs.memtest86plus.efi; } ''; description = '' A set of files to be copied to {file}`$BOOT`. @@ -578,7 +578,7 @@ in boot.loader.systemd-boot.extraFiles = mkMerge [ (mkIf cfg.memtest86.enable { - "efi/memtest86/memtest.efi" = "${pkgs.memtest86plus.efi}"; + "efi/memtest86/memtest.efi" = pkgs.memtest86plus.efi; }) (mkIf cfg.netbootxyz.enable { "efi/netbootxyz/netboot.xyz.efi" = "${pkgs.netbootxyz-efi}";