diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-09-04 13:42:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-04 13:42:13 +0200 |
| commit | a6800d5c8e0608800f130ba7ec9e159c8df7627f (patch) | |
| tree | db2a03dafac5d27316bc04cfa51bfdfd86c9cd6a | |
| parent | Merge pull request #136631 from primeos/chromium-backport (diff) | |
| parent | linux_latest-libre: 18260 -> 18268 (diff) | |
| download | nixpkgs-a6800d5c8e0608800f130ba7ec9e159c8df7627f.tar.gz | |
Merge pull request #136235 from NixOS/backport-136150-to-release-21.05
[Backport release-21.05] linux_latest: 5.13.13 -> 5.14
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-5.14.nix | 18 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-libre.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
3 files changed, 29 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix new file mode 100644 index 000000000000..e6a76146ce74 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.14"; + + # 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 = "1cki6af9r30k8820j73qdyycp23mwpf2a2rjwl82p9i61mg8n1ky"; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index a183b6859498..91134e18a8a2 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18260"; - sha256 = "11mmdix0vq9yrivx300ay6np3xx1gdqdr4cqdxr1wa84dbl7c2dm"; + rev = "18268"; + sha256 = "050rk485csj41yfydr1cvn60vhb3lzbb3486sm832vp55d34i8fd"; } , ... }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5e8c3df49fe..e9d2809ba21b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20461,6 +20461,13 @@ in ]; }; + linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -20743,7 +20750,7 @@ in # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_13; + linuxPackages_latest = linuxPackages_5_14; linux_latest = linuxPackages_latest.kernel; # Realtime kernel packages. @@ -20768,6 +20775,7 @@ in linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13); + linuxPackages_5_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_14); # When adding to the list above: # - Update linuxPackages_latest to the latest version |