diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-03-21 09:10:31 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-28 18:34:31 +0000 |
commit | beb132986026e9ba63e8042416bf61f558b05ac3 (patch) | |
tree | a51e0a07fc5fd799b764851bb8fec2d85027ace5 | |
parent | a4e58117f6532c65455e0d605531cd802b8115c0 (diff) |
linux_latest: 5.16.14 -> 5.17
(cherry picked from commit 58ae11758e853ac307b4cd1032d2f0436a77bc50)
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-5.17.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/linux-kernels.nix | 10 |
3 files changed, 29 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-5.17.nix b/pkgs/os-specific/linux/kernel/linux-5.17.nix new file mode 100644 index 000000000000..f05ab1486aba --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.17.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.17"; + + # 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 = "sha256-VV/vYd3bWRqD1i3QTiUnkvmvS6nvFGg/ZIQORvogsbE="; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 58c9f9b0986b..6600e8112f9c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -481,6 +481,7 @@ mapAliases ({ linuxPackages_5_10 = linuxKernel.packages.linux_5_10; linuxPackages_5_15 = linuxKernel.packages.linux_5_15; linuxPackages_5_16 = linuxKernel.packages.linux_5_16; + linuxPackages_5_17 = linuxKernel.packages.linux_5_17; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; linux_rpi1 = linuxKernel.kernels.linux_rpi1; @@ -497,6 +498,7 @@ mapAliases ({ linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; linux_5_15 = linuxKernel.kernels.linux_5_15; linux_5_16 = linuxKernel.kernels.linux_5_16; + linux_5_17 = linuxKernel.kernels.linux_5_17; # added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 3a0c6d84d1c2..06702c421c32 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -166,6 +166,13 @@ in { ]; }; + linux_5_17 = callPackage ../os-specific/linux/kernel/linux-5.17.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -466,6 +473,7 @@ in { linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_5_16 = recurseIntoAttrs (packagesFor kernels.linux_5_16); + linux_5_17 = recurseIntoAttrs (packagesFor kernels.linux_5_17); }; rtPackages = { @@ -510,7 +518,7 @@ in { packageAliases = { linux_default = packages.linux_5_10; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_5_16; + linux_latest = packages.linux_5_17; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_5_10; |