From aa51704ba5aa3012397024d9fb719c0bc62e573e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 29 Jan 2023 14:44:42 +0000 Subject: [PATCH] lib.systems.inspect.patterns.isEfi: drop ARMv5 I'm not aware of any ARMv5 EFI implementation. gnu-efi doesn't support it, so the build of systemd for armv5tel-linux is broken if it's isEfi. --- lib/systems/inspect.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index b40a82b3321e..6a9f0fadcd3d 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -81,8 +81,13 @@ rec { isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ]; isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; - isEfi = map (family: { cpu.family = family; }) - [ "x86" "arm" "riscv" ]; + isEfi = [ + { cpu = { family = "arm"; version = "6"; }; } + { cpu = { family = "arm"; version = "7"; }; } + { cpu = { family = "arm"; version = "8"; }; } + { cpu = { family = "riscv"; }; } + { cpu = { family = "x86"; }; } + ]; }; matchAnyAttrs = patterns: