diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix new file mode 100644 index 00000000000..648be21f4cd --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.1"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "0hghjkxgf1p8mfm04a9ckjvyrnp71jp3pbbp0qsx35rzwzk7nsnh"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 676858dc511..701342281fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15070,6 +15070,13 @@ in ]; }; + linux_5_1 = callPackage ../os-specific/linux/kernel/linux-5.1.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.modinst_arg_list_too_long + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -15262,7 +15269,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_5_0; + linuxPackages_latest = linuxPackages_5_1; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -15273,6 +15280,8 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_0); + linuxPackages_5_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_1); + # When adding to this list: # - Update linuxPackages_latest to the latest version # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one.