linux_latest: 5.13.13 -> 5.14

This commit is contained in:
Alyssa Ross 2021-08-30 08:33:52 +00:00
parent ff0dfaaee0
commit 8bfb576250
2 changed files with 27 additions and 1 deletions

View file

@ -0,0 +1,18 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
with lib;
buildLinux (args // rec {
version = "5.14";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1cki6af9r30k8820j73qdyycp23mwpf2a2rjwl82p9i61mg8n1ky";
};
} // (args.argsOverride or { }))

View file

@ -21263,6 +21263,13 @@ with pkgs;
]; ];
}; };
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 { linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix {
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
@ -21553,7 +21560,7 @@ with pkgs;
# Update this when adding the newest kernel major version! # Update this when adding the newest kernel major version!
# And update linux_latest_for_hardened below if the patches are already available # 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; linux_latest = linuxPackages_latest.kernel;
# Realtime kernel packages. # Realtime kernel packages.
@ -21578,6 +21585,7 @@ with pkgs;
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13); linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13);
linuxPackages_5_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_14);
# When adding to the list above: # When adding to the list above:
# - Update linuxPackages_latest to the latest version # - Update linuxPackages_latest to the latest version