diff options
Diffstat (limited to 'pkgs/top-level/linux-kernels.nix')
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 91a8c2f539267..54ab7e6b85385 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -40,6 +40,7 @@ let }; argsOverride = { inherit version; + pname = "linux-hardened"; modDirVersion = modDirVersion' + kernelPatches.hardened.${kernel.meta.branch}.extra; src = fetchurl { url = "mirror://kernel/linux/kernel/v${major}.x/linux-${version}.tar.xz"; @@ -193,6 +194,16 @@ in { kernelPatches.rust_1_75 kernelPatches.rust_1_76 kernelPatches.rust_1_77-6_8 + kernelPatches.rust_1_78 + ]; + }; + + linux_6_9 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.9"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.rust_1_77-6_9 ]; }; @@ -204,7 +215,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.rust_1_77-6_9 + kernelPatches.rust_1_78 ]; }; latest = packageAliases.linux_latest.kernel; @@ -260,6 +271,8 @@ in { linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { }; + linux_6_8_hardened = hardenedKernelFor kernels.linux_6_8 { }; + linux_6_9_hardened = hardenedKernelFor kernels.linux_6_9 { }; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; @@ -406,6 +419,7 @@ in { nvidia_x11_legacy340 = nvidiaPackages.legacy_340; nvidia_x11_legacy390 = nvidiaPackages.legacy_390; nvidia_x11_legacy470 = nvidiaPackages.legacy_470; + nvidia_x11_legacy535 = nvidiaPackages.legacy_535; nvidia_x11_production = nvidiaPackages.production; nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; nvidia_dc = nvidiaPackages.dc; @@ -538,7 +552,7 @@ in { virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; - vm-tools = callPackage ../os-specific/linux/vm-tools { }; + mm-tools = callPackage ../os-specific/linux/mm-tools { }; vmm_clock = callPackage ../os-specific/linux/vmm_clock { }; @@ -587,6 +601,7 @@ in { hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30 sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14 rtl8723bs = throw "rtl8723bs was added in mainline kernel version 4.12"; # Added 2023-06-14 + vm-tools = self.mm-tools; xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18"; }); @@ -601,6 +616,7 @@ in { linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_8 = recurseIntoAttrs (packagesFor kernels.linux_6_8); + linux_6_9 = recurseIntoAttrs (packagesFor kernels.linux_6_9); __attrsFailEvaluation = true; } // 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 @@ -646,6 +662,8 @@ in { linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened); + linux_6_8_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_8_hardened); + linux_6_9_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_9_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); @@ -668,9 +686,9 @@ in { packageAliases = { linux_default = packages.linux_6_6; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_8; + linux_latest = packages.linux_6_9; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; - linux_rt_default = packages.linux_rt_5_4; + linux_rt_default = packages.linux_rt_5_15; linux_rt_latest = packages.linux_rt_6_6; } // { __attrsFailEvaluation = true; }; |