ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

kexectools: Disable only on RISC-V if Linux.

Browse Source 
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.
This commit is contained in:
Shea Levy 2018-03-25 17:45:22 -04:00
parent b0482248fe
commit cdf9a78a3e
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/meta.nix
View File

@ -86,4 +86,6 @@ rec {
then { system = elem; } then { system = elem; }
else { parsed = elem; }; else { parsed = elem; };
in lib.matchAttrs pattern platform; in lib.matchAttrs pattern platform;
enableIfAvailable = p: if p.meta.available or true then [ p ] else [];
} }

2
lib/systems/inspect.nix
View File

@ -39,8 +39,6 @@ rec {
isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; 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; }) isEfi = map (family: { cpu.family = family; })
[ "x86" "arm" "aarch64" ]; [ "x86" "arm" "aarch64" ];
isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; }) isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })

2
nixos/modules/system/boot/kexec.nix
View File

@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
config = lib.mkIf (pkgs.kexectools != null) { config = lib.mkIf (pkgs.kexectools.meta.available) {
environment.systemPackages = [ pkgs.kexectools ]; environment.systemPackages = [ pkgs.kexectools ];
systemd.services."prepare-kexec" = systemd.services."prepare-kexec" =

1
pkgs/os-specific/linux/kexectools/default.nix
View File

@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
homepage = http://horms.net/projects/kexec/kexec-tools; homepage = http://horms.net/projects/kexec/kexec-tools;
description = "Tools related to the kexec Linux feature"; description = "Tools related to the kexec Linux feature";
platforms = platforms.linux; platforms = platforms.linux;
badPlatforms = platforms.riscv;
}; };
} }

3
pkgs/os-specific/linux/systemd/default.nix
View File

@ -41,7 +41,8 @@ in stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ linuxHeaders libcap kmod xz pam acl [ linuxHeaders libcap kmod xz pam acl
/* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2 /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor libmicrohttpd ] ++ stdenv.lib.meta.enableIfAvailable kexectools ++
[ libseccomp libffi audit lz4 bzip2 libapparmor
iptables gnu-efi iptables gnu-efi
# This is actually native, but we already pull it from buildPackages # This is actually native, but we already pull it from buildPackages
pythonLxmlEnv pythonLxmlEnv

4
pkgs/top-level/all-packages.nix
View File

@ -3131,9 +3131,7 @@ with pkgs;
keepalived = callPackage ../tools/networking/keepalived { }; keepalived = callPackage ../tools/networking/keepalived { };
kexectools = if hostPlatform.isKexecable kexectools = callPackage ../os-specific/linux/kexectools { };
then callPackage ../os-specific/linux/kexectools { }
else null;
keybase = callPackage ../tools/security/keybase { }; keybase = callPackage ../tools/security/keybase { };