diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-11-01 11:29:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 11:29:59 +0100 |
| commit | f8232491252438cd70b93554e31fe8238a573636 (patch) | |
| tree | d9d1d10cb1b6c49a7e1a1098f22bb21a0eff76fc /pkgs | |
| parent | 6d7a5212c5c2cb8a873477927078ed53a028307b (diff) | |
| parent | 256a798f826696ba7babda4cd150cb952519ff29 (diff) | |
Merge pull request #144079 from xaverdh/linux-5.15
Linux 5.15
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-5.15.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 10 |
2 files changed, 27 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix new file mode 100644 index 0000000000000..739a31f635c67 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.15"; + + # 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-V7LPaZGRDjtnobNJACLooGdLaWXHTBLaHpnRONGZHug="; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index fd230246c49ab..14d809e6948f3 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -174,6 +174,13 @@ in { ]; }; + linux_5_15 = callPackage ../os-specific/linux/kernel/linux-5.15.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -468,6 +475,7 @@ in { linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_14 = recurseIntoAttrs (packagesFor kernels.linux_5_14); + linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); }; rtPackages = { @@ -513,7 +521,7 @@ in { packageAliases = { linux_default = packages.linux_5_10; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_5_14; + linux_latest = packages.linux_5_15; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_5_11; |