Commit bfef542b authored by Alyssa Ross's avatar Alyssa Ross
Browse files

linux_5_4_hardened: use meta.broken, not assert 

Respects NIXPKGS_ALLOW_BROKEN and allows attributes to be accessed.
parent a3c21220

pkgs/os-specific/linux/kernel/hardened/config.nix

+0 −1
Original line number Diff line number Diff line
@@ -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.

pkgs/top-level/linux-kernels.nix

+3 −0
Original line number Diff line number Diff line
@@ -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}