diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-02-21 23:41:34 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-22 21:34:27 +0000 |
| commit | bfef542b67ccfff0cfdc6f827db72910c965092e (patch) | |
| tree | 259eae8dba8ad420a0d4382d0e467a394c830d47 /pkgs | |
| parent | a3c21220fdfe6264f71e98ac7c9dc63fdf671b1f (diff) | |
linux_5_4_hardened: use meta.broken, not assert
Respects NIXPKGS_ALLOW_BROKEN and allows attributes to be accessed.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/hardened/config.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index efc64e81af551..5a1a710ba3b78 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -15,7 +15,6 @@ with lib.kernel; with (lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); -assert (stdenv.hostPlatform.isx86_64 -> versions.majorMinor version != "5.4"); { # Report BUG() conditions and kill the offending process. diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 013a252a2073a..8feb3c41c2e1a 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -45,6 +45,9 @@ let url = "mirror://kernel/linux/kernel/v${major}.x/linux-${version}.tar.xz"; inherit sha256; }; + extraMeta = { + broken = kernel.meta.broken || (stdenv.isx86_64 && lib.versions.majorMinor version == "5.4"); + }; }; kernelPatches = kernel.kernelPatches ++ [ kernelPatches.hardened.${kernel.meta.branch} |