git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #130562 from TredwellGit/linux

Kernels 2021-07-18

commit7961d53cbcbbde6e6e9dbeb96ff71ec624a3500c authorMaximilian Bosch <maximilian@mbosch.me> dateSun 18 Jul 2021, 20:55 (5 years ago) parenteb0aa6ef011a85
7 files changed+27−27
compare with master
unifiedsplit
pkgs/os-specific/linux/kernel/hardened/patches.json+15−15 pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.10.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.12.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2 pkgs/os-specific/linux/kernel/linux-rt-5.10.nix+2−2
pkgs/os-specific/linux/kernel/hardened/patches.json+15−15
@@ -1,32 +1,32 @@
11{
22 "4.14": {
33 "extra": "-hardened1",
4− "name": "linux-hardened-4.14.238-hardened1.patch",
5− "sha256": "13wld3dm9ymwcsk5f06l64z9q49ff7rh7dqfqxxhkngdx2i1h566",
6− "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.238-hardened1/linux-hardened-4.14.238-hardened1.patch"
4+ "name": "linux-hardened-4.14.239-hardened1.patch",
5+ "sha256": "1yfg6c75y1dp627qn8c4795sc9vwywc5dl95ngg8zk15n5d7j9in",
6+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.239-hardened1/linux-hardened-4.14.239-hardened1.patch"
77 },
88 "4.19": {
99 "extra": "-hardened1",
10− "name": "linux-hardened-4.19.196-hardened1.patch",
11− "sha256": "1wna5j1g1703gl4xw4x5z8dmc8gjqg879zq4xnmlyc0vryqjrxyq",
12− "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.196-hardened1/linux-hardened-4.19.196-hardened1.patch"
10+ "name": "linux-hardened-4.19.197-hardened1.patch",
11+ "sha256": "1cbcas5kl6k8hn60p08pvw073mrv8lkrav3pc9sxvdcscdbwkkpr",
12+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.197-hardened1/linux-hardened-4.19.197-hardened1.patch"
1313 },
1414 "5.10": {
1515 "extra": "-hardened1",
16− "name": "linux-hardened-5.10.48-hardened1.patch",
17− "sha256": "1drfh4ljiih4y5fn2bvg15wrmz10s50q5qyhn89r63b5qkb1lp21",
18− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.48-hardened1/linux-hardened-5.10.48-hardened1.patch"
16+ "name": "linux-hardened-5.10.50-hardened1.patch",
17+ "sha256": "0z57cdvyaarl5p0b6sj93pag34wvf128s30ymkc4m50a60kp7cr8",
18+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.50-hardened1/linux-hardened-5.10.50-hardened1.patch"
1919 },
2020 "5.12": {
2121 "extra": "-hardened1",
22− "name": "linux-hardened-5.12.15-hardened1.patch",
23− "sha256": "1d81z67y9659icgmkchj0y2jlcs4nh4grlzf7ppbq6vmrr92xq8x",
24− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.15-hardened1/linux-hardened-5.12.15-hardened1.patch"
22+ "name": "linux-hardened-5.12.17-hardened1.patch",
23+ "sha256": "09vh04a1sa80shm0z5if31j5r8s4syrqv4i22q5pnnfnlzhbqk59",
24+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.17-hardened1/linux-hardened-5.12.17-hardened1.patch"
2525 },
2626 "5.4": {
2727 "extra": "-hardened1",
28− "name": "linux-hardened-5.4.130-hardened1.patch",
29− "sha256": "0d7q6pkl74hkx65p25jxjjky08zdprsfbcyik9cdlsfrbiidwn53",
30− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.130-hardened1/linux-hardened-5.4.130-hardened1.patch"
28+ "name": "linux-hardened-5.4.132-hardened1.patch",
29+ "sha256": "0a4n8ss16qqbrbxajlad4j7nc10ipdnl70yz6ppryyw94i5lf5pb",
30+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.132-hardened1/linux-hardened-5.4.132-hardened1.patch"
3131 }
3232}
pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "4.14.238";
6+ version = "4.14.239";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "1phjgm1fhyfpm2h9b2bngcbh91v2qrxcm7vma86q7pdqrcbh1fih";
16+ sha256 = "167zwm3giizv42m0xjz71xnb2swlwiaw0xw0dg8j8mb74hz1drx0";
1717 };
1818
1919 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];
pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "4.19.196";
6+ version = "4.19.197";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "0liapgaczv6lq7223wnq2cbwfb6w93iw14dv1xidcb3bnakm4h5f";
16+ sha256 = "10kj442qaky6rpl65k5rrvd3p6mdgz4p321zvf4s312ixfdja0g6";
1717 };
1818
1919 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];
pkgs/os-specific/linux/kernel/linux-5.10.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "5.10.48";
6+ version = "5.10.50";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "0pn24bkz9mkphv9f634117zam0ak6q3pbpfwv0l5kf71h0s1klfv";
16+ sha256 = "0dmlpy9k7am99495bxcm46i4y6g34d1fzdkzz3wgzb4mgmx35nlb";
1717 };
1818
1919 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
pkgs/os-specific/linux/kernel/linux-5.12.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "5.12.15";
6+ version = "5.12.17";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "1nlgwcxfhxzf5wak8c0gamn4k8vpdllzqlpqqn5fa08cdjcymz27";
16+ sha256 = "1ghyqxfxslxzr7273vj2yn14pkdnkja3wk50xxhavpvf87i8c40j";
1717 };
1818
1919 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];
pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "5.4.130";
6+ version = "5.4.132";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "0ywwy6g0fd05fxgwsrycz2l6khjljxa3qbi6hywp3rjgmgxp2ak6";
16+ sha256 = "1vq0dmrn7gl2vprm08l8by5ja3xjgggrcd38vqg7b7jpnfzssrl4";
1717 };
1818
1919 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix+2−2
@@ -6,7 +6,7 @@
66, ... } @ args:
77
88let
9− version = "5.10.47-rt45"; # updated by ./update-rt.sh
9+ version = "5.10.47-rt46"; # updated by ./update-rt.sh
1010 branch = lib.versions.majorMinor version;
1111 kversion = builtins.elemAt (lib.splitString "-" version) 0;
1212in buildLinux (args // {
@@ -25,7 +25,7 @@ in buildLinux (args // {
2525 name = "rt";
2626 patch = fetchurl {
2727 url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
28− sha256 = "0s3y636ymrhm8rg6n47wdk1pvvmpsnynmyhyy5681f2pw5z2c1ay";
28+ sha256 = "12jnnwnh3bgz2ygc173r45sbqm74rz3f2nlp7m2fb8dlxdby460q";
2929 };
3030 }; in [ rt-patch ] ++ kernelPatches;
3131