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 24 pin your kernel onto a non-longterm version, expect your evaluation to fail as 25 25 soon as the version is out of maintenance. 26 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 + 27 33 Longterm versions of kernels will be removed before the next stable NixOS that will 28 34 exceed the maintenance period of the kernel version. 29 35
-1
nixos/tests/kernel-generic.nix
··· 36 36 kernels = pkgs.linuxKernel.vanillaPackages // { 37 37 inherit (pkgs.linuxKernel.packages) 38 38 linux_6_12_hardened 39 - linux_6_15_hardened 40 39 linux_rt_5_4 41 40 linux_rt_5_10 42 41 linux_rt_5_15
-10
pkgs/os-specific/linux/kernel/hardened/patches.json
··· 8 8 }, 9 9 "sha256": "09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb", 10 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 11 } 22 12 }
-5
pkgs/os-specific/linux/kernel/kernels-org.json
··· 34 34 "hash": "sha256:1bmx2vpxy6nkxnmm2a3zmv9smaajfhvslj6id54j4yq2sc722l5n", 35 35 "lts": true 36 36 }, 37 - "6.15": { 38 - "version": "6.15.11", 39 - "hash": "sha256:14sxwrvw9p4ybizb8ky1rgahc62q0aw5qkmzqp3cpnavqfgldaw9", 40 - "lts": false 41 - }, 42 37 "6.16": { 43 38 "version": "6.16.4", 44 39 "hash": "sha256:08mnd8qir2vxjmgblhnqfrfbv2zlig68f4r5askk7d8h3b3y79fn",
+4 -11
pkgs/top-level/linux-kernels.nix
··· 210 210 ]; 211 211 }; 212 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 213 linux_6_16 = callPackage ../os-specific/linux/kernel/mainline.nix { 222 214 branch = "6.16"; 223 215 kernelPatches = [ ··· 295 287 linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel; 296 288 297 289 linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { }; 298 - linux_6_15_hardened = hardenedKernelFor kernels.linux_6_15 { }; 299 290 300 291 linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; 301 292 } ··· 306 297 linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream"; 307 298 linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream"; 308 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"; 309 301 310 302 linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; 311 303 linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; ··· 319 311 linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream"; 320 312 linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; 321 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"; 322 315 323 316 linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; 324 317 } ··· 738 731 linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); 739 732 linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); 740 733 linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); 741 - linux_6_15 = recurseIntoAttrs (packagesFor kernels.linux_6_15); 742 734 linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16); 743 735 } 744 736 // lib.optionalAttrs config.allowAliases { ··· 748 740 linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23 749 741 linux_6_13 = throw "linux 6.13 was removed because it reached its end of life upstream"; # Added 2025-06-22 750 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 751 744 }; 752 745 753 746 rtPackages = { ··· 778 771 linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened); 779 772 780 773 linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened); 781 - linux_6_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_15_hardened); 782 774 783 775 linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); 784 776 linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); ··· 805 797 linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream"; 806 798 linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; 807 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"; 808 801 linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; 809 802 } 810 803 );