colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux_5_4_hardened: use meta.broken, not assert

Browse Source 
Respects NIXPKGS_ALLOW_BROKEN and allows attributes to be accessed.
This commit is contained in:
Alyssa Ross 2023-02-21 23:41:34 +00:00
parent a3c21220fd
commit bfef542b67
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/os-specific/linux/kernel/hardened/config.nix
View File

@ -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.

3
pkgs/top-level/linux-kernels.nix
View File

@ -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}