diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fd1e82d28a68..18b35816844d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -837,17 +837,12 @@ mapAliases { linux-rt_5_15 = linuxKernel.kernels.linux_rt_5_15; linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; linux-rt_6_1 = linuxKernel.kernels.linux_rt_6_1; - linuxPackages_4_14 = linuxKernel.packages.linux_4_14; linuxPackages_4_19 = linuxKernel.packages.linux_4_19; linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_5_10 = linuxKernel.packages.linux_5_10; linuxPackages_5_15 = linuxKernel.packages.linux_5_15; linuxPackages_6_1 = linuxKernel.packages.linux_6_1; - linuxPackages_6_4 = linuxKernel.packages.linux_6_4; - linuxPackages_6_5 = linuxKernel.packages.linux_6_5; linuxPackages_6_6 = linuxKernel.packages.linux_6_6; - linuxPackages_6_7 = linuxKernel.packages.linux_6_7; - linuxPackages_6_8 = linuxKernel.packages.linux_6_8; linuxPackages_6_9 = linuxKernel.packages.linux_6_9; linuxPackages_6_10 = linuxKernel.packages.linux_6_10; linuxPackages_6_11 = linuxKernel.packages.linux_6_11; @@ -864,17 +859,12 @@ mapAliases { linuxPackages_rt_5_15 = linuxKernel.packages.linux_rt_5_15; linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; linuxPackages_rt_6_1 = linuxKernel.packages.linux_rt_6_1; - linux_4_14 = linuxKernel.kernels.linux_4_14; linux_4_19 = linuxKernel.kernels.linux_4_19; linux_5_4 = linuxKernel.kernels.linux_5_4; linux_5_10 = linuxKernel.kernels.linux_5_10; linux_5_15 = linuxKernel.kernels.linux_5_15; linux_6_1 = linuxKernel.kernels.linux_6_1; - linux_6_4 = linuxKernel.kernels.linux_6_4; - linux_6_5 = linuxKernel.kernels.linux_6_5; linux_6_6 = linuxKernel.kernels.linux_6_6; - linux_6_7 = linuxKernel.kernels.linux_6_7; - linux_6_8 = linuxKernel.kernels.linux_6_8; linux_6_9 = linuxKernel.kernels.linux_6_9; linux_6_10 = linuxKernel.kernels.linux_6_10; linux_6_11 = linuxKernel.kernels.linux_6_11; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8a8cc8652d28..1f6e65066908 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -303,24 +303,12 @@ in { linux_6_13_hardened = hardenedKernelFor kernels.linux_6_13 { }; } // lib.optionalAttrs config.allowAliases { - linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; - linux_6_4 = throw "linux 6.4 was removed because it has reached its end of life upstream"; - linux_6_5 = throw "linux 6.5 was removed because it has reached its end of life upstream"; - linux_6_7 = throw "linux 6.7 was removed because it has reached its end of life upstream"; - linux_6_8 = throw "linux 6.8 was removed because it has reached its end of life upstream"; linux_6_9 = throw "linux 6.9 was removed because it has reached its end of life upstream"; linux_6_10 = throw "linux 6.10 was removed because it has reached its end of life upstream"; linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream"; - linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; - - linux_4_14_hardened = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; - linux_6_4_hardened = throw "linux 6.4 was removed because it has reached its end of life upstream"; - linux_6_5_hardened = throw "linux 6.5 was removed because it has reached its end of life upstream"; - linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream"; - linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream"; 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"; @@ -684,12 +672,7 @@ in { linux_6_13 = recurseIntoAttrs (packagesFor kernels.linux_6_13); linux_6_14 = recurseIntoAttrs (packagesFor kernels.linux_6_14); } // lib.optionalAttrs config.allowAliases { - linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11 linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21 - linux_6_4 = throw "linux 6.4 was removed because it reached its end of life upstream"; # Added 2023-10-02 - linux_6_5 = throw "linux 6.5 was removed because it reached its end of life upstream"; # Added 2024-02-28 - linux_6_7 = throw "linux 6.7 was removed because it reached its end of life upstream"; # Added 2024-04-04 - linux_6_8 = throw "linux 6.8 was removed because it reached its end of life upstream"; # Added 2024-08-02 linux_6_9 = throw "linux 6.9 was removed because it reached its end of life upstream"; # Added 2024-08-02 linux_6_10 = throw "linux 6.10 was removed because it reached its end of life upstream"; # Added 2024-10-23 linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23 @@ -739,15 +722,10 @@ in { linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre); __recurseIntoDerivationForReleaseJobs = true; } // lib.optionalAttrs config.allowAliases { - linux_4_14_hardened = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; - linux_6_4_hardened = throw "linux 6.4 was removed because it has reached its end of life upstream"; - linux_6_5_hardened = throw "linux 6.5 was removed because it has reached its end of life upstream"; - linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream"; - linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream"; 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"; - linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; }); packageAliases = {