linux_5_4_hardened: drop

Already marked as broken, and due for removal anyway in
<https://github.com/NixOS/nixpkgs/pull/432561>.
This commit is contained in:
Emily
2025-08-22 23:01:59 +01:00
parent df0c0570c8
commit 796e4f546b
2 changed files with 2 additions and 12 deletions
-2
View File
@@ -10714,8 +10714,6 @@ with pkgs;
# hardened kernels
linuxPackages_hardened = linuxKernel.packages.linux_hardened;
linux_hardened = linuxPackages_hardened.kernel;
linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened;
linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened;
linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened;
linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
+2 -10
View File
@@ -12,7 +12,6 @@
newScope,
lib,
fetchurl,
gcc10Stdenv,
}:
# When adding a kernel:
@@ -297,14 +296,6 @@ in
linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };
linux_5_4_hardened = markBroken (
hardenedKernelFor kernels.linux_5_4 {
stdenv = gcc10Stdenv;
buildPackages = buildPackages // {
stdenv = buildPackages.gcc10Stdenv;
};
}
);
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
@@ -321,6 +312,7 @@ in
linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream";
linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
linux_5_4_hardened = throw "linux_5_4_hardened was removed because it was broken";
linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";
linux_6_10_hardened = throw "linux 6.10 was removed because it has reached its end of life upstream";
linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";
@@ -779,7 +771,6 @@ in
linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);
linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened);
linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened);
linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);
linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);
@@ -799,6 +790,7 @@ in
}
// lib.optionalAttrs config.allowAliases {
linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
linux_5_4_hardened = throw "linux_5_4_hardened was removed because it was broken";
linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";
linux_6_10_hardened = throw "linux 6.10 was removed because it has reached its end of life upstream";
linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";