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

Merge pull request #133640 from NixOS/backport-133627-to-release-21.05

Browse Source 
[Backport release-21.05] Kernels 2021-08-12
This commit is contained in:
Maximilian Bosch 2021-08-16 11:07:50 +02:00 committed by GitHub
commit 5d89a1188e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.4.279"; version = "4.4.280";
extraMeta.branch = "4.4"; extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64; extraMeta.broken = stdenv.isAarch64;
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1d3cfhs7ixk0dhh1mc1z6y73i816a2wl16zhayl1ssp69d4ndpsb"; sha256 = "1b9jx9zkycj0xjmy35890q5phiznayaz730dmsv3mdjg4qgfn18y";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];

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

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.13.9"; version = "5.13.10";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # 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; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "16hm6sb64f1hlr0qmf2w81zv55s6flj1x8jr2q326d9ny30przkj"; sha256 = "01fpj02q4vdn7i6f6710lly0w33cd5gfvn6avgrjglcbiwdzbjih";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];

6
pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
View File

@ -6,7 +6,7 @@
, ... } @ args: , ... } @ args:
let let
version = "5.4.129-rt61"; # updated by ./update-rt.sh version = "5.4.138-rt62"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version; branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0; kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // { in buildLinux (args // {
@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "1ps64gx85lmbriq445hd2hcv4g4b1d1cwf4r3nd90x6i2cj4c9j4"; sha256 = "0mw6k9zrcmv1j4b3han5c0q8xbh38bka2wkkbl1y3ralg9r5ffd4";
}; };
kernelPatches = let rt-patch = { kernelPatches = let rt-patch = {
name = "rt"; name = "rt";
patch = fetchurl { patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0b3hp6a7afkjqd7an4hj423nq6flwzd42kjcyk4pifv5fx6c7pgq"; sha256 = "1zw7806fxx9cai9n6siv534x5r52d8fc13r07ypgw461pijcy5p6";
}; };
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;