diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-10 03:01:54 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-01-10 16:32:48 +0000 |
commit | 0a99fa0331b842cb75e942114de73b545ee71ed1 (patch) | |
tree | d14530d23bb40a3894b0ec7278ee0165c15712f7 /pkgs | |
parent | ed0a6c2827e370b29006e10c69f8f38e52bd7ac6 (diff) |
linux_latest: 5.15.12 -> 5.16
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-5.16.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.16.nix b/pkgs/os-specific/linux/kernel/linux-5.16.nix new file mode 100644 index 0000000000000..9a7b5208d474f --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.16"; + + # 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 = "1fq86dbx2p124vi4j8nan68gj4zyw4xnqh4jxq9aqsdvi24pwz82"; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 823e6976a02d1..47dd8f3e6cb01 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -508,6 +508,7 @@ mapAliases ({ linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_5_10 = linuxKernel.packages.linux_5_10; linuxPackages_5_15 = linuxKernel.packages.linux_5_15; + linuxPackages_5_16 = linuxKernel.packages.linux_5_16; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; linux_rpi1 = linuxKernel.kernels.linux_rpi1; @@ -523,6 +524,7 @@ mapAliases ({ linux_5_10 = linuxKernel.kernels.linux_5_10; 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; # 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 edc1a89985b54..57aeb9d39986d 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -166,6 +166,13 @@ in { ]; }; + linux_5_16 = callPackage ../os-specific/linux/kernel/linux-5.16.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -474,6 +481,7 @@ in { linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); 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); }; rtPackages = { @@ -518,7 +526,7 @@ in { packageAliases = { linux_default = packages.linux_5_10; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_5_15; + linux_latest = packages.linux_5_16; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_5_10; |