lol

Merge pull request #171783 from Ma27/linux-kernel-updates

Linux kernels 2022-05-06

authored by

Maximilian Bosch and committed by
GitHub
7dbfd6b9 defb285c

+41 -29
+1
nixos/tests/kernel-generic.nix
··· 30 30 linux_5_4_hardened 31 31 linux_5_10_hardened 32 32 linux_5_15_hardened 33 + linux_5_17_hardened 33 34 34 35 linux_testing; 35 36 };
+35 -25
pkgs/os-specific/linux/kernel/hardened/patches.json
··· 2 2 "4.14": { 3 3 "patch": { 4 4 "extra": "-hardened1", 5 - "name": "linux-hardened-4.14.276-hardened1.patch", 6 - "sha256": "1q0w8fqn9z32r35s3lil9dllkykydnpfp1dkhgvmy5rggbm801ay", 7 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.276-hardened1/linux-hardened-4.14.276-hardened1.patch" 5 + "name": "linux-hardened-4.14.277-hardened1.patch", 6 + "sha256": "1jjbywmwglnsj80dbic14bip6wfllsgqgw7lcn9s8n12mdr42ps2", 7 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.277-hardened1/linux-hardened-4.14.277-hardened1.patch" 8 8 }, 9 - "sha256": "1rxksrmkh5raz930y9khfg85dglgphrgcvkj21n86m333pajs4mf", 10 - "version": "4.14.276" 9 + "sha256": "058vzn1gcsc194hgwrj78afawz2anm7ga8a1x5m5i4cw8p1arp73", 10 + "version": "4.14.277" 11 11 }, 12 12 "4.19": { 13 13 "patch": { 14 14 "extra": "-hardened1", 15 - "name": "linux-hardened-4.19.239-hardened1.patch", 16 - "sha256": "1w0h47av90aapz5g5ldny1vrq21n22kxag24byk4b43ndg6q0ksc", 17 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.239-hardened1/linux-hardened-4.19.239-hardened1.patch" 15 + "name": "linux-hardened-4.19.240-hardened1.patch", 16 + "sha256": "1qhrwpjfy5c75zcpvp1b0xb460vyjv04iml2inqrhnj9zcz1kgp8", 17 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.240-hardened1/linux-hardened-4.19.240-hardened1.patch" 18 18 }, 19 - "sha256": "0fsr9jy8d1rpg6ixp7av01pqz3vq50rgfcjd7vj16ccsdk15sz5z", 20 - "version": "4.19.239" 19 + "sha256": "1hj6vngynx6kjaczjl77jjwqq0kh0lm6jdqjvakd1cgrppaizb3j", 20 + "version": "4.19.240" 21 21 }, 22 22 "5.10": { 23 23 "patch": { 24 24 "extra": "-hardened1", 25 - "name": "linux-hardened-5.10.112-hardened1.patch", 26 - "sha256": "1sryrhl7bblx4r0smvlzw7p4xhc4l8bsqgwzlj2x8qamj544w464", 27 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.112-hardened1/linux-hardened-5.10.112-hardened1.patch" 25 + "name": "linux-hardened-5.10.113-hardened1.patch", 26 + "sha256": "0v6blapny74fkhsm5rksxg632hv3chh81wgc96l6ql4sy7p19riv", 27 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.113-hardened1/linux-hardened-5.10.113-hardened1.patch" 28 28 }, 29 - "sha256": "19aa7fq8n75gh0vv01mpxg4cxkfpr5lj0sv6lxiyzcgbc71isv4c", 30 - "version": "5.10.112" 29 + "sha256": "1z3dd5hrdbn2axsi2n70n41q1dq2dvg7s8aph1p6yiajpc16llc2", 30 + "version": "5.10.113" 31 31 }, 32 32 "5.15": { 33 33 "patch": { 34 34 "extra": "-hardened1", 35 - "name": "linux-hardened-5.15.35-hardened1.patch", 36 - "sha256": "10x2q01bckmfmgdzfg01khj43pav1drzzp3fr20hk718ywikvgax", 37 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.35-hardened1/linux-hardened-5.15.35-hardened1.patch" 35 + "name": "linux-hardened-5.15.36-hardened1.patch", 36 + "sha256": "1y52bayw2n1lc1vp9jz8a39fz32x81ivaw24kc6hdr23yg0a8q5g", 37 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.36-hardened1/linux-hardened-5.15.36-hardened1.patch" 38 38 }, 39 - "sha256": "1n05c4c4ish25x483a2p5177zgda8pq7g4752n1b7chfygi5l6ha", 40 - "version": "5.15.35" 39 + "sha256": "1466557034q1fzvpy8vwj8ps3cv2q8s7z76af9y1jz4kgaqmsd1n", 40 + "version": "5.15.36" 41 + }, 42 + "5.17": { 43 + "patch": { 44 + "extra": "-hardened1", 45 + "name": "linux-hardened-5.17.5-hardened1.patch", 46 + "sha256": "1cv43sp2amai7r75dw07bd2ys6fz1ri9pfra3kaajap55sbalsw0", 47 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.5-hardened1/linux-hardened-5.17.5-hardened1.patch" 48 + }, 49 + "sha256": "11z95wsgmj97pg77yck26l0383gncbla0zwpzv4gjdj4p62x3g4v", 50 + "version": "5.17.5" 41 51 }, 42 52 "5.4": { 43 53 "patch": { 44 54 "extra": "-hardened1", 45 - "name": "linux-hardened-5.4.190-hardened1.patch", 46 - "sha256": "0z4w05fq20pmiyxf4bip61ywy5xg96klbnj62yxiaha68pfwlm29", 47 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.190-hardened1/linux-hardened-5.4.190-hardened1.patch" 55 + "name": "linux-hardened-5.4.191-hardened1.patch", 56 + "sha256": "117v9xb9y3bmppxmrbya5a4d869fh6l7map25g5n03sca56g7c32", 57 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.191-hardened1/linux-hardened-5.4.191-hardened1.patch" 48 58 }, 49 - "sha256": "157ifcl59xxj721r302hg82vmbqzx5hjrlihrc5s4maxfw3ygm41", 50 - "version": "5.4.190" 59 + "sha256": "0fharjqasvq76pciwci6qamdadpfjh2n8gdyri8fj65drmgsi318", 60 + "version": "5.4.191" 51 61 } 52 62 }
+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.240"; 6 + version = "4.19.241"; 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 = "1hj6vngynx6kjaczjl77jjwqq0kh0lm6jdqjvakd1cgrppaizb3j"; 16 + sha256 = "04zyi22c2d91k7v2w0s8v112cqqf24km599mn18k2nafq79njqjc"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.15.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.15.36"; 6 + version = "5.15.37"; 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; ··· 15 15 16 16 src = fetchurl { 17 17 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; 18 - sha256 = "1466557034q1fzvpy8vwj8ps3cv2q8s7z76af9y1jz4kgaqmsd1n"; 18 + sha256 = "09n0l9ly111r6jbpgz1kw2q4n4mmcv5jxfhs5bcsiyjp44d0kgqq"; 19 19 }; 20 20 } // (args.argsOverride or { }))
+1
pkgs/top-level/linux-kernels.nix
··· 541 541 }); 542 542 linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); 543 543 linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); 544 + linux_5_17_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_17 { }); 544 545 545 546 linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); 546 547 linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);