linux: Add 5.4

Change linux_latest to 5.4
This commit is contained in:
Tim Steinbach 2019-11-25 09:21:27 -05:00
parent bdf74811ce
commit 9b67ea9106
No known key found for this signature in database
GPG Key ID: 6C654787275A64F1
2 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,18 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
with stdenv.lib;
buildLinux (args // rec {
version = "5.4";
# 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 = "14glqppn90z79b36k4c76mv90q933i2bg54rgwlcl2v7n608jcxz";
};
} // (args.argsOverride or {}))

View File

@ -16233,6 +16233,12 @@ in
];
};
linux_5_4 = callPackage ../os-specific/linux/kernel/linux-5.4.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
];
};
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@ -16429,7 +16435,7 @@ in
linux = linuxPackages.kernel;
# Update this when adding the newest kernel major version!
linuxPackages_latest = linuxPackages_5_3;
linuxPackages_latest = linuxPackages_5_4;
linux_latest = linuxPackages_latest.kernel;
# Build the kernel modules for the some of the kernels.
@ -16443,6 +16449,7 @@ in
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
linuxPackages_5_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_3);
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
# When adding to this list:
# - Update linuxPackages_latest to the latest version