Merge pull request #130281 from TredwellGit/linux

authored by Sandro and committed by GitHub 0a143359 cc31ece9

+11 -11
+2 -2
pkgs/os-specific/linux/kernel/linux-4.4.nix
··· 1 1 { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: 2 2 3 3 buildLinux (args // rec { 4 - version = "4.4.274"; 4 + version = "4.4.275"; 5 5 extraMeta.branch = "4.4"; 6 6 extraMeta.broken = stdenv.isAarch64; 7 7 8 8 src = fetchurl { 9 9 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 10 - sha256 = "1n4wawk8fi5s22177994vq9hzay49cackdabl9r1x8y2i9jcqmg4"; 10 + sha256 = "1aiwq6019sibsw5smj6ii28cr64dv24c19k4n8c09nakhmhcg94i"; 11 11 }; 12 12 13 13 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];
+2 -2
pkgs/os-specific/linux/kernel/linux-4.9.nix
··· 1 1 { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: 2 2 3 3 buildLinux (args // rec { 4 - version = "4.9.274"; 4 + version = "4.9.275"; 5 5 extraMeta.branch = "4.9"; 6 6 extraMeta.broken = stdenv.isAarch64; 7 7 8 8 src = fetchurl { 9 9 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 10 - sha256 = "0xdi33f25lbpplx36cz7chdsn7a6xdjvwxgvnmvrw7b2y0g45m95"; 10 + sha256 = "08mz7mzmhk5n1gwadrc5fw8s40jk0rayvdpjcricl4sv56574lb6"; 11 11 }; 12 12 13 13 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];
+2 -2
pkgs/os-specific/linux/kernel/linux-5.13.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.13.1"; 6 + version = "5.13.2"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; 16 - sha256 = "140a9ngzlarin84mnnwgx6z3ckw431d578aixxl60ll5853gdakj"; 16 + sha256 = "0dx9khk7fh003xyb3xix0kc0rmjncg7ric5p830zhadnrw4hv563"; 17 17 }; 18 18 19 19 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];
+2 -2
pkgs/os-specific/linux/kernel/linux-libre.nix
··· 1 1 { stdenv, lib, fetchsvn, linux 2 2 , scripts ? fetchsvn { 3 3 url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; 4 - rev = "18132"; 5 - sha256 = "01mgpfx5cddq4bgffydkxpm3xlgf7zfjr1c1icsyn7f2pibd114q"; 4 + rev = "18165"; 5 + sha256 = "17birwp6byxr4yb8cbc0afssli84ds1p2sisjl4g6rx3r7yqvsxn"; 6 6 } 7 7 , ... 8 8 }:
+3 -3
pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
··· 6 6 , ... } @ args: 7 7 8 8 let 9 - version = "5.4.123-rt59"; # updated by ./update-rt.sh 9 + version = "5.4.129-rt61"; # updated by ./update-rt.sh 10 10 branch = lib.versions.majorMinor version; 11 11 kversion = builtins.elemAt (lib.splitString "-" version) 0; 12 12 in buildLinux (args // { ··· 14 14 15 15 src = fetchurl { 16 16 url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; 17 - sha256 = "1pi223dls52piw65s3v4ml23wdyy73xpbdvp511187b6zgzk7zlf"; 17 + sha256 = "1ps64gx85lmbriq445hd2hcv4g4b1d1cwf4r3nd90x6i2cj4c9j4"; 18 18 }; 19 19 20 20 kernelPatches = let rt-patch = { 21 21 name = "rt"; 22 22 patch = fetchurl { 23 23 url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; 24 - sha256 = "1m1mnmk7h35p7dv6mg3pla6pw3b645hbbccjmp1jc3fyn6qiy6fq"; 24 + sha256 = "0b3hp6a7afkjqd7an4hj423nq6flwzd42kjcyk4pifv5fx6c7pgq"; 25 25 }; 26 26 }; in [ rt-patch ] ++ kernelPatches; 27 27