Merge: linux_6_15: remove (#436253)

authored by

Maximilian Bosch and committed by
GitHub
1c599680 98a86cad

+10 -27
+6
nixos/doc/manual/configuration/linux-kernel.chapter.md
··· 24 pin your kernel onto a non-longterm version, expect your evaluation to fail as 25 soon as the version is out of maintenance. 26 27 Longterm versions of kernels will be removed before the next stable NixOS that will 28 exceed the maintenance period of the kernel version. 29
··· 24 pin your kernel onto a non-longterm version, expect your evaluation to fail as 25 soon as the version is out of maintenance. 26 27 + A kernel will be removed from nixpkgs when the first batch of stable kernels 28 + _after_ the final release is published. E.g. when 6.15.11 is the final release 29 + of the 6.15 series and is released together with 6.16.3 and 6.12.43, it will be 30 + removed on the release of 6.16.4 and 6.12.44. Custom kernel variants such 31 + as linux-hardened are also affected by this. 32 + 33 Longterm versions of kernels will be removed before the next stable NixOS that will 34 exceed the maintenance period of the kernel version. 35
-1
nixos/tests/kernel-generic.nix
··· 36 kernels = pkgs.linuxKernel.vanillaPackages // { 37 inherit (pkgs.linuxKernel.packages) 38 linux_6_12_hardened 39 - linux_6_15_hardened 40 linux_rt_5_4 41 linux_rt_5_10 42 linux_rt_5_15
··· 36 kernels = pkgs.linuxKernel.vanillaPackages // { 37 inherit (pkgs.linuxKernel.packages) 38 linux_6_12_hardened 39 linux_rt_5_4 40 linux_rt_5_10 41 linux_rt_5_15
-10
pkgs/os-specific/linux/kernel/hardened/patches.json
··· 8 }, 9 "sha256": "09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb", 10 "version": "6.12.41" 11 - }, 12 - "6.15": { 13 - "patch": { 14 - "extra": "-hardened1", 15 - "name": "linux-hardened-v6.15.9-hardened1.patch", 16 - "sha256": "132h0cgv8kzrlz7jprqvwcnragc2v793a759bhg0q6w3ninmncjc", 17 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.15.9-hardened1/linux-hardened-v6.15.9-hardened1.patch" 18 - }, 19 - "sha256": "0zcma8ycdwwzd4yci9752acsv85wh27lahclh5x2yc4jakw3lkz9", 20 - "version": "6.15.9" 21 } 22 }
··· 8 }, 9 "sha256": "09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb", 10 "version": "6.12.41" 11 } 12 }
-5
pkgs/os-specific/linux/kernel/kernels-org.json
··· 34 "hash": "sha256:1bmx2vpxy6nkxnmm2a3zmv9smaajfhvslj6id54j4yq2sc722l5n", 35 "lts": true 36 }, 37 - "6.15": { 38 - "version": "6.15.11", 39 - "hash": "sha256:14sxwrvw9p4ybizb8ky1rgahc62q0aw5qkmzqp3cpnavqfgldaw9", 40 - "lts": false 41 - }, 42 "6.16": { 43 "version": "6.16.4", 44 "hash": "sha256:08mnd8qir2vxjmgblhnqfrfbv2zlig68f4r5askk7d8h3b3y79fn",
··· 34 "hash": "sha256:1bmx2vpxy6nkxnmm2a3zmv9smaajfhvslj6id54j4yq2sc722l5n", 35 "lts": true 36 }, 37 "6.16": { 38 "version": "6.16.4", 39 "hash": "sha256:08mnd8qir2vxjmgblhnqfrfbv2zlig68f4r5askk7d8h3b3y79fn",
+4 -11
pkgs/top-level/linux-kernels.nix
··· 210 ]; 211 }; 212 213 - linux_6_15 = callPackage ../os-specific/linux/kernel/mainline.nix { 214 - branch = "6.15"; 215 - kernelPatches = [ 216 - kernelPatches.bridge_stp_helper 217 - kernelPatches.request_key_helper 218 - ]; 219 - }; 220 - 221 linux_6_16 = callPackage ../os-specific/linux/kernel/mainline.nix { 222 branch = "6.16"; 223 kernelPatches = [ ··· 295 linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel; 296 297 linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { }; 298 - linux_6_15_hardened = hardenedKernelFor kernels.linux_6_15 { }; 299 300 linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; 301 } ··· 306 linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream"; 307 linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream"; 308 linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream"; 309 310 linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; 311 linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; ··· 319 linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream"; 320 linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; 321 linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream"; 322 323 linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; 324 } ··· 738 linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); 739 linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); 740 linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); 741 - linux_6_15 = recurseIntoAttrs (packagesFor kernels.linux_6_15); 742 linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16); 743 } 744 // lib.optionalAttrs config.allowAliases { ··· 748 linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23 749 linux_6_13 = throw "linux 6.13 was removed because it reached its end of life upstream"; # Added 2025-06-22 750 linux_6_14 = throw "linux 6.14 was removed because it reached its end of life upstream"; # Added 2025-06-22 751 }; 752 753 rtPackages = { ··· 778 linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened); 779 780 linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened); 781 - linux_6_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_15_hardened); 782 783 linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); 784 linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); ··· 805 linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream"; 806 linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; 807 linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream"; 808 linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; 809 } 810 );
··· 210 ]; 211 }; 212 213 linux_6_16 = callPackage ../os-specific/linux/kernel/mainline.nix { 214 branch = "6.16"; 215 kernelPatches = [ ··· 287 linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel; 288 289 linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { }; 290 291 linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; 292 } ··· 297 linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream"; 298 linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream"; 299 linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream"; 300 + linux_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream"; 301 302 linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; 303 linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; ··· 311 linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream"; 312 linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; 313 linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream"; 314 + linux_6_15_hardened = throw "linux 6.15 was removed because it has reached its end of life upstream"; 315 316 linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; 317 } ··· 731 linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); 732 linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); 733 linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); 734 linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16); 735 } 736 // lib.optionalAttrs config.allowAliases { ··· 740 linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23 741 linux_6_13 = throw "linux 6.13 was removed because it reached its end of life upstream"; # Added 2025-06-22 742 linux_6_14 = throw "linux 6.14 was removed because it reached its end of life upstream"; # Added 2025-06-22 743 + linux_6_15 = throw "linux 6.15 was removed because it reached its end of life upstream"; # Added 2025-08-23 744 }; 745 746 rtPackages = { ··· 771 linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened); 772 773 linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened); 774 775 linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); 776 linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); ··· 797 linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream"; 798 linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; 799 linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream"; 800 + linux_6_15_hardened = throw "linux 6.15 was removed because it has reached its end of life upstream"; 801 linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; 802 } 803 );