diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-02 11:37:32 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-02 17:27:32 +0000 |
commit | ae3682cb17b93d2d3bedf4be439c4a9688760881 (patch) | |
tree | 7a05ebd5481cbf413202f5bc443ff8575deb75c5 /pkgs/top-level/linux-kernels.nix | |
parent | 4c969d6925c720369fda56dbab14b708170dab73 (diff) |
linux_6_4: drop (EOL)
It's still in kernels-org.json, because even if I remove it the update script will keep putting it back, but nothing references it, and it'll be removed from that file when kernels are next updated after it's been delisted from kernel.org. linux_testing_bcachefs still needs to be updated for >6.4, so for now I've just inlined the Linux 6.4 definition in linux_testing_bcachefs's definition.
Diffstat (limited to 'pkgs/top-level/linux-kernels.nix')
-rw-r--r-- | pkgs/top-level/linux-kernels.nix | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 7b746286f055b..ce2e18ae6626c 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -183,15 +183,6 @@ in { ]; }; - linux_6_4 = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "6.4"; - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.dell_xps_regression - ]; - }; - linux_6_5 = callPackage ../os-specific/linux/kernel/mainline.nix { branch = "6.5"; kernelPatches = [ @@ -218,9 +209,15 @@ in { linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { # Pinned on the last version which Kent's commits can be cleany rebased up. - kernel = linux_6_4; - kernelPatches = linux_6_4.kernelPatches; - }; + kernel = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.4"; + }; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.dell_xps_regression + ]; + }; linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { kernelPatches = [ @@ -281,7 +278,6 @@ in { linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; - linux_6_4_hardened = hardenedKernelFor kernels.linux_6_4 { }; linux_6_5_hardened = hardenedKernelFor kernels.linux_6_5 { }; } // lib.optionalAttrs config.allowAliases { @@ -291,6 +287,7 @@ in { linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream"; linux_6_2 = throw "linux 6.2 was removed because it has reached its end of life upstream"; linux_6_3 = throw "linux 6.3 was removed because it has reached its end of life upstream"; + linux_6_4 = throw "linux 6.4 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"; @@ -601,7 +598,6 @@ in { linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); - linux_6_4 = recurseIntoAttrs (packagesFor kernels.linux_6_4); linux_6_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5); } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 @@ -610,6 +606,7 @@ in { linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20 linux_6_2 = throw "linux 6.2 was removed because it reached its end of life upstream"; # Added 2023-05-26 linux_6_3 = throw "linux 6.3 was removed because it reached its end of life upstream"; # Added 2023-07-22 + linux_6_4 = throw "linux 6.4 was removed because it reached its end of life upstream"; # Added 2023-10-02 }; rtPackages = { @@ -641,7 +638,6 @@ in { linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened); linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); - linux_6_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_4_hardened); linux_6_5_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_5_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); |