Merge pull request #136235 from NixOS/backport-136150-to-release-21.05

[Backport release-21.05] linux_latest: 5.13.13 -> 5.14
This commit is contained in:
Maximilian Bosch
2021-09-04 13:42:13 +02:00
committed by GitHub
3 changed files with 29 additions and 3 deletions
+9 -1
View File
@@ -20461,6 +20461,13 @@ in
];
};
linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -20743,7 +20750,7 @@ in
# Update this when adding the newest kernel major version!
# And update linux_latest_for_hardened below if the patches are already available
linuxPackages_latest = linuxPackages_5_13;
linuxPackages_latest = linuxPackages_5_14;
linux_latest = linuxPackages_latest.kernel;
# Realtime kernel packages.
@@ -20768,6 +20775,7 @@ in
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13);
linuxPackages_5_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_14);
# When adding to the list above:
# - Update linuxPackages_latest to the latest version