From 796e4f546bd3b2ed74df74c679f2c3f2b9e03fe8 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Aug 2025 18:22:54 +0100 Subject: [PATCH] linux_5_4_hardened: drop Already marked as broken, and due for removal anyway in . --- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/linux-kernels.nix | 12 ++---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d5ae53a00b4..ee7493471bf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 2c9d32830b84..a34fef40385c 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -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";