diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-25 17:45:22 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-27 08:15:07 -0400 |
| commit | cdf9a78a3ebb535fa6ba88fce88c655776d2474f (patch) | |
| tree | 494af986a0c2adc37a3c6d1173a0dc563ae96174 /lib | |
| parent | b0482248fefbf3b6cdd9c92053cfb49778a3a3a8 (diff) | |
| download | nixpkgs-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.tar nixpkgs-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.tar.gz nixpkgs-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.tar.bz2 nixpkgs-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.tar.lz nixpkgs-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.tar.xz nixpkgs-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.tar.zst nixpkgs-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.zip | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/meta.nix | 2 | ||||
| -rw-r--r-- | lib/systems/inspect.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/meta.nix b/lib/meta.nix index 199030c103a..8516cc1cd6f 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 e8ea2bed25f..2f0c402f398 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; }) |