From 23b573705de96bf400a30d22bc195acb0763ac12 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 22 Jun 2025 12:22:28 +0200 Subject: [PATCH] linux_6_{13,14}{,_hardened}: remove Both are EOL. --- .../os-specific/linux/kernel/kernels-org.json | 8 ----- pkgs/top-level/aliases.nix | 4 +++ pkgs/top-level/all-packages.nix | 4 --- pkgs/top-level/linux-kernels.nix | 30 +++++-------------- 4 files changed, 12 insertions(+), 34 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index f52858dba1ff..c07ea4d45058 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -27,14 +27,6 @@ "version": "6.12.35", "hash": "sha256:0j577lqmzbzx45gxvxirx627pv6cbhq9slzb50rqqmyy3nqf1x05" }, - "6.13": { - "version": "6.13.12", - "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1" - }, - "6.14": { - "version": "6.14.11", - "hash": "sha256:06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z" - }, "6.15": { "version": "6.15.4", "hash": "sha256:05psir6p8x5a89d9kxkxlv5iifln67yf803xj5rqvx82nqkxdbqf" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 609c719a3015..29ed15802044 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1154,6 +1154,10 @@ mapAliases { linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; # Added 2021-08-16 + linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened; + linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened; + linuxPackages_6_14_hardened = linuxKernel.packages.linux_6_14_hardened; + linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened; linuxPackages_latest_hardened = throw '' The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches frequently lag behind the upstream kernel. In some cases this meant that this attribute diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c3f49361d7b..9e3d918e3ebe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11087,10 +11087,6 @@ with pkgs; linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened; linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened; linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened; - linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened; - linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened; - linuxPackages_6_14_hardened = linuxKernel.packages.linux_6_14_hardened; - linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened; # GNU Linux-libre kernels linuxPackages-libre = linuxKernel.packages.linux_libre; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 9bd2dfa75fd1..ad8688611d6b 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -211,22 +211,6 @@ in ]; }; - linux_6_13 = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "6.13"; - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_6_14 = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "6.14"; - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_6_15 = callPackage ../os-specific/linux/kernel/mainline.nix { branch = "6.15"; kernelPatches = [ @@ -318,8 +302,6 @@ in linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { }; linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { }; - linux_6_13_hardened = hardenedKernelFor kernels.linux_6_13 { }; - linux_6_14_hardened = hardenedKernelFor kernels.linux_6_14 { }; } // lib.optionalAttrs config.allowAliases { @@ -327,11 +309,15 @@ in 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_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream"; + 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_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_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; + linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream"; linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; } @@ -742,8 +728,6 @@ in linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); - linux_6_13 = recurseIntoAttrs (packagesFor kernels.linux_6_13); - linux_6_14 = recurseIntoAttrs (packagesFor kernels.linux_6_14); linux_6_15 = recurseIntoAttrs (packagesFor kernels.linux_6_15); } // lib.optionalAttrs config.allowAliases { @@ -751,6 +735,8 @@ in 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 + linux_6_13 = throw "linux 6.13 was removed because it reached its end of life upstream"; # Added 2025-06-22 + linux_6_14 = throw "linux 6.14 was removed because it reached its end of life upstream"; # Added 2025-06-22 }; rtPackages = { @@ -786,8 +772,6 @@ in linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened); linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened); - linux_6_13_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_13_hardened); - linux_6_14_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_14_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); @@ -805,6 +789,8 @@ in 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_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; + linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream"; linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; } );