Merge pull request #123043 from TredwellGit/linux

authored by Martin Weinelt and committed by GitHub d47f3f1e ef95fa40

+17 -17
+9 -9
pkgs/os-specific/linux/kernel/hardened/patches.json
··· 13 13 }, 14 14 "5.10": { 15 15 "extra": "-hardened1", 16 - "name": "linux-hardened-5.10.36-hardened1.patch", 17 - "sha256": "0pkci99h0lrxyx5p7ml3m4194bl359m2ihm9izw0b33n35alkvbc", 18 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.36-hardened1/linux-hardened-5.10.36-hardened1.patch" 16 + "name": "linux-hardened-5.10.37-hardened1.patch", 17 + "sha256": "16bmvb6w55bdcd3nfz1ixwp081gcyx0hq885i0ixjnjz7n5q80wq", 18 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.37-hardened1/linux-hardened-5.10.37-hardened1.patch" 19 19 }, 20 20 "5.11": { 21 21 "extra": "-hardened1", 22 - "name": "linux-hardened-5.11.20-hardened1.patch", 23 - "sha256": "06jf2r9xr8kzybia590x21p20mfags8j1flj0g4ci6r0fsfbmymf", 24 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.20-hardened1/linux-hardened-5.11.20-hardened1.patch" 22 + "name": "linux-hardened-5.11.21-hardened1.patch", 23 + "sha256": "087zg8mphpbzcac9xi9qqfzl7ccd3qb93jif2gqjvsm3q2pk2m3g", 24 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.21-hardened1/linux-hardened-5.11.21-hardened1.patch" 25 25 }, 26 26 "5.4": { 27 27 "extra": "-hardened1", 28 - "name": "linux-hardened-5.4.118-hardened1.patch", 29 - "sha256": "1zkcdxqysgcidary6nl4c2hrn6r23gi4r8rqhjan22xa3l3lj43b", 30 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.118-hardened1/linux-hardened-5.4.118-hardened1.patch" 28 + "name": "linux-hardened-5.4.119-hardened1.patch", 29 + "sha256": "1qbw8287jv96fqar5wi52yh1g6v9nnr53y2vpr3777sadcr19mm9", 30 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.119-hardened1/linux-hardened-5.4.119-hardened1.patch" 31 31 } 32 32 }
+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.36"; 6 + version = "5.10.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; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; 16 - sha256 = "0s5jw7y17hnl66iybw6f4pbc5j5rilphqbv3iql22wq053vyg749"; 16 + sha256 = "0xz01g017s9kcc9awlg6p9wrm8pzxyk4fizrf3mq9i5gklqf7md8"; 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.11.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.11.20"; 6 + version = "5.11.21"; 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 = "15q7pw1wvl6ndvb6154p6vjr4qa4fa6lpbqpxvwy2kywc2jyxykk"; 16 + sha256 = "0zw7mpq6lfbw2ycv4lvkya93h1h18gvc8c66m82bca5y02xsasrn"; 17 17 }; 18 18 19 19 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];
+2 -2
pkgs/os-specific/linux/kernel/linux-5.12.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.12.3"; 6 + version = "5.12.4"; 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 = "13c7jbizf254rh4arvlgzk87vx7sz6psba47jnax23lbgal18dqk"; 16 + sha256 = "0wv89gwf5v8m7wi2f3bv9mdr8n9raq998sy4m1m2lwwjhkpgwq2s"; 17 17 }; 18 18 19 19 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];
+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.118"; 6 + version = "5.4.119"; 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 = "06w2vhw6pdy49n3dcnq12bn50glbg9pwaqvs4nlzbljg4yf50w6r"; 16 + sha256 = "185jxk0cfnk8c6rfc78id2qwd9k2597xyc4dv2pahjc13v7xxrvi"; 17 17 }; 18 18 19 19 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];