From 84cc06af6fc0bfded90c3bafd97c1588fb3c5702 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 1 Aug 2022 08:32:28 +0000 Subject: [PATCH] linux_latest: 5.18.15 -> 5.19 --- pkgs/os-specific/linux/kernel/linux-5.19.nix | 18 ++++++++++++++++++ pkgs/top-level/linux-kernels.nix | 10 +++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-5.19.nix diff --git a/pkgs/os-specific/linux/kernel/linux-5.19.nix b/pkgs/os-specific/linux/kernel/linux-5.19.nix new file mode 100644 index 000000000000..5c622c24a576 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.19.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.19"; + + # 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 = "1a05a3hw4w3k530mxhns96xw7hag743xw5w967yazqcykdbhq97z"; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index f4c46ab97cc1..7c51912fe8f0 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -175,6 +175,13 @@ in { ]; }; + linux_5_19 = callPackage ../os-specific/linux/kernel/linux-5.19.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -522,6 +529,7 @@ in { linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23 linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 linux_5_18 = recurseIntoAttrs (packagesFor kernels.linux_5_18); + linux_5_19 = recurseIntoAttrs (packagesFor kernels.linux_5_19); }; rtPackages = { @@ -578,7 +586,7 @@ in { packageAliases = { linux_default = packages.linux_5_15; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_5_18; + linux_latest = packages.linux_5_19; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_5_10;