diff options
Diffstat (limited to 'pkgs/top-level/linux-kernels.nix')
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index c80c5f6613ddd..0e61796ef2816 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -162,12 +162,7 @@ in { linux_5_16 = throw "linux 5.16 was removed because it has reached its end of life upstream"; - linux_5_17 = callPackage ../os-specific/linux/kernel/linux-5.17.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; + linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream"; linux_5_18 = callPackage ../os-specific/linux/kernel/linux-5.18.nix { kernelPatches = [ @@ -189,7 +184,7 @@ in { else testing; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_5_17; + kernel = linux_5_18; kernelPatches = kernel.kernelPatches; }; @@ -243,7 +238,6 @@ in { linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; - linux_5_17_hardened = hardenedKernelFor kernels.linux_5_17 { }; linux_5_18_hardened = hardenedKernelFor kernels.linux_5_18 { }; })); @@ -282,6 +276,8 @@ in { apfs = callPackage ../os-specific/linux/apfs { }; + ax99100 = callPackage ../os-specific/linux/ax99100 {}; + batman_adv = callPackage ../os-specific/linux/batman-adv {}; bbswitch = callPackage ../os-specific/linux/bbswitch {}; @@ -357,6 +353,10 @@ in { nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; nvidia_x11 = nvidiaPackages.stable; + # this is not a replacement for nvidia_x11 + # only the opensource kernel driver exposed for hydra to build + nvidia_x11_beta_open = nvidiaPackages.beta.open; + openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { }; ply = callPackage ../os-specific/linux/ply { }; @@ -511,7 +511,7 @@ in { linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23 - linux_5_17 = recurseIntoAttrs (packagesFor kernels.linux_5_17); + linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 linux_5_18 = recurseIntoAttrs (packagesFor kernels.linux_5_18); }; @@ -551,7 +551,6 @@ in { }); linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); - linux_5_17_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_17 { }); linux_5_18_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_18 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); @@ -567,7 +566,7 @@ in { }); packageAliases = { - linux_default = if stdenv.hostPlatform.is32bit then packages.linux_5_10 else packages.linux_5_15; + linux_default = packages.linux_5_15; # Update this when adding the newest kernel major version! linux_latest = packages.linux_5_18; linux_mptcp = packages.linux_mptcp_95; |