From cdf9a78a3ebb535fa6ba88fce88c655776d2474f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 25 Mar 2018 17:45:22 -0400 Subject: kexectools: Disable only on RISC-V if Linux. The isKexecable flag treated Linux without kexec as just a normal variant, when it really should be treated as a special case incurring complexity debt to support. --- lib/meta.nix | 2 ++ lib/systems/inspect.nix | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/meta.nix b/lib/meta.nix index 199030c103af5..8516cc1cd6f1b 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -86,4 +86,6 @@ rec { then { system = elem; } else { parsed = elem; }; in lib.matchAttrs pattern platform; + + enableIfAvailable = p: if p.meta.available or true then [ p ] else []; } diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index e8ea2bed25f55..2f0c402f39816 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -39,8 +39,6 @@ rec { isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; - isKexecable = map (family: { kernel = kernels.linux; cpu.family = family; }) - [ "x86" "arm" "aarch64" "mips" ]; isEfi = map (family: { cpu.family = family; }) [ "x86" "arm" "aarch64" ]; isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; }) -- cgit 1.4.1