public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #136235 from NixOS/backport-136150-to-release-21.05 

[Backport release-21.05] linux_latest: 5.13.13 -> 5.14
This commit is contained in:
Maximilian Bosch 2021-09-04 13:42:13 +02:00 committed by GitHub
parent ac1fe4e3d7 4cc8956845
commit a6800d5c8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/os-specific/linux/kernel/linux-5.14.nix Normal file
View File

@ -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 { }))

4
pkgs/os-specific/linux/kernel/linux-libre.nix
View File

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux { stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn { , scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "18260"; rev = "18268";
sha256 = "11mmdix0vq9yrivx300ay6np3xx1gdqdr4cqdxr1wa84dbl7c2dm"; sha256 = "050rk485csj41yfydr1cvn60vhb3lzbb3486sm832vp55d34i8fd";
} }
, ... , ...
}: }:

10
pkgs/top-level/all-packages.nix
View File

@ -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 { linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix {
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
@ -20743,7 +20750,7 @@ in
# Update this when adding the newest kernel major version! # Update this when adding the newest kernel major version!
# And update linux_latest_for_hardened below if the patches are already available # 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; linux_latest = linuxPackages_latest.kernel;
# Realtime kernel packages. # Realtime kernel packages.
@ -20768,6 +20775,7 @@ in
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13); linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13);
linuxPackages_5_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_14);
# When adding to the list above: # When adding to the list above:
# - Update linuxPackages_latest to the latest version # - Update linuxPackages_latest to the latest version