Merge pull request #133200 from TredwellGit/linux

authored by

Martin Weinelt and committed by
GitHub
5f746317 39ef6795

+29 -29
+12 -12
pkgs/os-specific/linux/kernel/hardened/patches.json
··· 1 1 { 2 2 "4.14": { 3 3 "extra": "-hardened1", 4 - "name": "linux-hardened-4.14.240-hardened1.patch", 5 - "sha256": "0j5zp0f8s4w3f60yam2spg3bx56bdjvv0mh632zlhchz8rdk5zs4", 6 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.240-hardened1/linux-hardened-4.14.240-hardened1.patch" 4 + "name": "linux-hardened-4.14.243-hardened1.patch", 5 + "sha256": "0ngz1ywkxjqyv92wirj9m6l99p4caj6n75h2mv0a6rhk9r4di6p6", 6 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.243-hardened1/linux-hardened-4.14.243-hardened1.patch" 7 7 }, 8 8 "4.19": { 9 9 "extra": "-hardened1", 10 - "name": "linux-hardened-4.19.198-hardened1.patch", 11 - "sha256": "18c5j00xiwc0xn5klcrwazk6wvjiy3cixbfbrw4xj7zal9r5p6q9", 12 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.198-hardened1/linux-hardened-4.19.198-hardened1.patch" 10 + "name": "linux-hardened-4.19.202-hardened1.patch", 11 + "sha256": "0bylyc7k5azs8335mmzrgsx42cg8l3vm4izzikc8kchs2grb1q5v", 12 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.202-hardened1/linux-hardened-4.19.202-hardened1.patch" 13 13 }, 14 14 "5.10": { 15 15 "extra": "-hardened1", 16 - "name": "linux-hardened-5.10.52-hardened1.patch", 17 - "sha256": "062a32rb1g5xk1npiz9fa114k7g4x9pmygycn3alc0phngjmvr98", 18 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.52-hardened1/linux-hardened-5.10.52-hardened1.patch" 16 + "name": "linux-hardened-5.10.57-hardened1.patch", 17 + "sha256": "0zqv77k0i4q5w4qhgiknvrh4fav1jc4a2i9cdracwqlrk8fgmiih", 18 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.57-hardened1/linux-hardened-5.10.57-hardened1.patch" 19 19 }, 20 20 "5.12": { 21 21 "extra": "-hardened1", ··· 25 25 }, 26 26 "5.4": { 27 27 "extra": "-hardened1", 28 - "name": "linux-hardened-5.4.134-hardened1.patch", 29 - "sha256": "0iay6dxwd1vqj02ljf0ghncrqpr6b0gby90xiza8kkk8wnh3r9hh", 30 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.134-hardened1/linux-hardened-5.4.134-hardened1.patch" 28 + "name": "linux-hardened-5.4.139-hardened1.patch", 29 + "sha256": "0lznmwy8yqc8rq5pr0akxclpnwz98pgai6ib5a3d77ncfham6fnl", 30 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.139-hardened1/linux-hardened-5.4.139-hardened1.patch" 31 31 } 32 32 }
+2 -2
pkgs/os-specific/linux/kernel/linux-4.14.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "4.14.240"; 6 + version = "4.14.243"; 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/v4.x/linux-${version}.tar.xz"; 16 - sha256 = "1k65qwzlnqnh9ym0n2fxpa8nk2qwvykwhwgaixk3b7ndzmr8b6c8"; 16 + sha256 = "0wdk93qv91pa6bd3ff1gv7manhkzh190c5blcpl14cbh9m2ms8vz"; 17 17 }; 18 18 19 19 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];
+2 -2
pkgs/os-specific/linux/kernel/linux-4.19.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "4.19.198"; 6 + version = "4.19.202"; 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/v4.x/linux-${version}.tar.xz"; 16 - sha256 = "13k0r6a4n8nbni64a18wqzy0pg4vn1zw2li78xrm78rqcrnah85y"; 16 + sha256 = "09ya7n0il8fipp8ksb8cyl894ihny2r75g70vbhclbv20q2pv0pj"; 17 17 }; 18 18 19 19 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];
+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.278"; 4 + version = "4.4.279"; 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 = "1r2sbxn8finzcg72ds5dyh4578vv2s5zwylq3b3xyw3hzr4swn4f"; 10 + sha256 = "1d3cfhs7ixk0dhh1mc1z6y73i816a2wl16zhayl1ssp69d4ndpsb"; 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.278"; 4 + version = "4.9.279"; 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 = "04byav6cbga3jqkppygm5zj73d9v44xyvx6hbrhwr22lsk282dz7"; 10 + sha256 = "01rf3xh2jcz6l2h79g0m02i8f9q51j64wvgvzi8lmq0gx9yvbv91"; 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.10.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.10.52"; 6 + version = "5.10.57"; 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 = "0ydf09wsg0pkjm9dk8y730ksg15p5rlbhq445zx8k191zah5g7kn"; 16 + sha256 = "0b8lwfjlyd6j0csk71v07bxb5lrrzp545g1wv6kdk0kzq6maxfq0"; 17 17 }; 18 18 19 19 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
+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.8"; 6 + version = "5.13.9"; 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 = "0a54r71mcyqvq7c8kff817vh6zfj0bdzmp6ql4az84wq9nwc526h"; 16 + sha256 = "16hm6sb64f1hlr0qmf2w81zv55s6flj1x8jr2q326d9ny30przkj"; 17 17 }; 18 18 19 19 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];
+2 -2
pkgs/os-specific/linux/kernel/linux-5.4.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.4.134"; 6 + version = "5.4.139"; 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 = "0haqw1w6f8p330ydbsl7iml1x0qqrv63az6921p2a70n88b8dyy9"; 16 + sha256 = "0zx3hj8fc0qpdmkn56cna5438wjxmj42a69msbkxlg4mnz6d0w84"; 17 17 }; 18 18 19 19 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];
+3 -3
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
··· 6 6 , ... } @ args: 7 7 8 8 let 9 - version = "5.10.52-rt47"; # updated by ./update-rt.sh 9 + version = "5.10.56-rt48"; # 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 // { ··· 18 18 19 19 src = fetchurl { 20 20 url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; 21 - sha256 = "0ydf09wsg0pkjm9dk8y730ksg15p5rlbhq445zx8k191zah5g7kn"; 21 + sha256 = "0szcj0lbs33wmphxzvcc8jzfdvzncgxy2q8b1s4l9yjhkighssjd"; 22 22 }; 23 23 24 24 kernelPatches = let rt-patch = { 25 25 name = "rt"; 26 26 patch = fetchurl { 27 27 url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; 28 - sha256 = "1n71nbshma0gxyrifyymrd0wii1q0plj020amc0wdzzm27xs5k2k"; 28 + sha256 = "1fi83iky7r80cc1xlxyvsd2fcfgd67hz1nhmrhxawzkx6cx6i55a"; 29 29 }; 30 30 }; in [ rt-patch ] ++ kernelPatches; 31 31