diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-07 19:52:18 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-07 19:52:18 +0000 |
commit | 182718fecc3b6c35419ee0d085a87b579c4965f8 (patch) | |
tree | 3932c5f76c0c4a1c1cd7b093bad530707d1938d1 /pkgs/top-level/linux-kernels.nix | |
parent | f33fceca13083254086639741c2bd52b51e45bcb (diff) | |
parent | 4309990c6fffe6c810d6aba0b12ecb350970f0c4 (diff) |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/top-level/linux-kernels.nix
Diffstat (limited to 'pkgs/top-level/linux-kernels.nix')
-rw-r--r-- | pkgs/top-level/linux-kernels.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 7d9061ac43b8a..cc06c76b1a27d 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 = [ @@ -281,7 +272,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 +281,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 +592,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 +600,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 +632,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); |