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

linux_5_4_hardened: don't build on x86_64-linux anymore

Browse Source 
5.4 hasn't configured successfully on x86_64-linux for months.
People don't seem to care, but the 5.4 packages clutter failure lists
on Hydra + tools.
https://hydra.nixos.org/job/nixpkgs/trunk/linux_5_4_hardened.x86_64-linux/all

Perhaps surprisingly, it works on aarch64-linux and also on older kernels.
This commit is contained in:
Vladimír Čunát 2022-08-19 10:25:05 +02:00
parent 7ea33d2d0d
commit 55812d7b48
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,13 +8,14 @@
#
# See also <nixos/modules/profiles/hardened.nix>
{ lib, version }:
{ stdenv, lib, version }:
with lib;
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.

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

@ -36,7 +36,7 @@ let
modDirVersion' = builtins.replaceStrings [ kernel.version ] [ version ] kernel.modDirVersion;
in kernel.override {
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
inherit lib version;
inherit stdenv lib version;
};
argsOverride = {
inherit version;