diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 3034f028defe7..ff7b0367c3bc8 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -59,6 +59,16 @@ "sha256": "0xzynjyyr16my0wrla4ggpjbh4g7nsqixaimz5hrsqlhaa8q9hab", "version": "6.11.10" }, + "6.10": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-v6.10.12-hardened1.patch", + "sha256": "07z35f4nqj9vgj2ynq7spgckb770a0w0906m7l28i1x0kch2kr3j", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.10.12-hardened1/linux-hardened-v6.10.12-hardened1.patch" + }, + "sha256": "1kvkwgnq5gsdqarrdg32qjrbq1dggxp1x2yy2zpsjsaq5y2mhj2j", + "version": "6.10.12" + }, "6.6": { "patch": { "extra": "-hardened1", diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 697f893345a71..a3c2b31a24a25 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -27,6 +27,18 @@ "version": "6.6.63", "hash": "sha256:0d8q0vwv3lcix3wiq2n53rir3h298flg2l0ghpify4rlh2s4l1fi" }, + "6.8": { + "version": "6.8.12", + "hash": "sha256:0fb0m0fv4521g63gq04d7lm6hy8169s1rykiav5bkd99s9b1kcqr" + }, + "6.9": { + "version": "6.9.12", + "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss" + }, + "6.10": { + "version": "6.10.14", + "hash": "sha256:0gj2z9ax1qv59n2mld0pg2svwi28lbq92ql98vy7crynd2ybrram" + }, "6.11": { "version": "6.11.11", "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532" diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 6a6fb48376eea..8073a3b73eed1 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -189,6 +189,14 @@ in { ]; }; + linux_6_10 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.10"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_6_11 = callPackage ../os-specific/linux/kernel/mainline.nix { branch = "6.11"; kernelPatches = [ @@ -283,7 +291,6 @@ in { 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_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; @@ -293,7 +300,6 @@ in { 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.9 was removed because it has reached its end of life upstream"; })); /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -622,6 +628,7 @@ in { linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); + linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10); linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11); linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); __attrsFailEvaluation = true; @@ -638,7 +645,6 @@ in { 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 }; rtPackages = {