From d7353f445ef4ef03ddc8869f3c95c4678fa934f4 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:07:58 +0000 Subject: [PATCH 1/8] linux: 5.10.47 -> 5.10.48 (cherry picked from commit 9462b074a8f2f34f3a4dd6b56ff22f760a8301f0) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index deec1b3a475..fd29ff465f8 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.47"; + version = "5.10.48"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ig1kb10729xyawm2zqzx8slpdbylgwms7b5vkhw3q6iwqpjmd9h"; + sha256 = "0pn24bkz9mkphv9f634117zam0ak6q3pbpfwv0l5kf71h0s1klfv"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From fef417a72697f7e00e7e739fa49d98e802839d75 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:08:03 +0000 Subject: [PATCH 2/8] linux: 5.12.14 -> 5.12.15 (cherry picked from commit e0f9f09c1740d0d80ead4002016bd3df0fc1b197) --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 93e7499c8dd..3a482d92a44 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.14"; + version = "5.12.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1b3xnb62n53vm6larkvv2vzd9w7cjnqh8zh6jzq9lpcg12c3pjlh"; + sha256 = "1nlgwcxfhxzf5wak8c0gamn4k8vpdllzqlpqqn5fa08cdjcymz27"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From f0b011fd73aa00f8b71e10598da4f394179d9144 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:08:10 +0000 Subject: [PATCH 3/8] linux: 5.13 -> 5.13.1 (cherry picked from commit ea4cb239528062ac52fc1d4aa2bbf115df9105dc) --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index eb01fb6289c..c13b37a74aa 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13"; + version = "5.13.1"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "sha256-P2uql/N1GEOfUd8uTz1lqCLKX/AWqo5g0sxTuVpsidk="; + sha256 = "140a9ngzlarin84mnnwgx6z3ckw431d578aixxl60ll5853gdakj"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From 2d453b51a6c29db307b9ae5c0f28c869635c3143 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:08:16 +0000 Subject: [PATCH 4/8] linux: 5.4.129 -> 5.4.130 (cherry picked from commit 32235d48681bf913b9d5435c518494b77d63f933) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index c5b4e390582..0c8355d101e 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.129"; + version = "5.4.130"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ps64gx85lmbriq445hd2hcv4g4b1d1cwf4r3nd90x6i2cj4c9j4"; + sha256 = "0ywwy6g0fd05fxgwsrycz2l6khjljxa3qbi6hywp3rjgmgxp2ak6"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 2e9e07c10bb316561293d19fc2ffb7a196514de2 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:08:56 +0000 Subject: [PATCH 5/8] linux-rt_5_10: 5.10.41-rt42 -> 5.10.47-rt45 (cherry picked from commit 25b73ac6a2422711dda132bf88ad510a37df95f2) --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 5567022edcc..6add438d0ac 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.41-rt42"; # updated by ./update-rt.sh + version = "5.10.47-rt45"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0wb739q7dha8nxkd72x42k4in5nw633yw065ppwc8rq7x2fpa17n"; + sha256 = "1ig1kb10729xyawm2zqzx8slpdbylgwms7b5vkhw3q6iwqpjmd9h"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1z8jgsq5fkg486xxawg4c4wk1l9xra7x1cfqaf4grhw0csbbx883"; + sha256 = "0s3y636ymrhm8rg6n47wdk1pvvmpsnynmyhyy5681f2pw5z2c1ay"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From 84cb8b4796ae938a63fcf68a41cbb5039292cbc7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:09:29 +0000 Subject: [PATCH 6/8] linux/hardened/patches/5.10: 5.10.47-hardened1 -> 5.10.48-hardened1 (cherry picked from commit b36d829bb1af3c8fdd38d2f217d31450b02b8526) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index bd1a5397f60..c0ad3d334fb 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.47-hardened1.patch", - "sha256": "0qkwz3d83p2l5p7lhj3imfx8cr17smciw76xhj00zv171vc3q7xm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.47-hardened1/linux-hardened-5.10.47-hardened1.patch" + "name": "linux-hardened-5.10.48-hardened1.patch", + "sha256": "1drfh4ljiih4y5fn2bvg15wrmz10s50q5qyhn89r63b5qkb1lp21", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.48-hardened1/linux-hardened-5.10.48-hardened1.patch" }, "5.12": { "extra": "-hardened1", From 50cc793e1814f40458ec973529713549662b5bfe Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:09:30 +0000 Subject: [PATCH 7/8] linux/hardened/patches/5.12: 5.12.14-hardened1 -> 5.12.15-hardened1 (cherry picked from commit 9af983cd004bb51a80c05945eddf922c56359ccd) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c0ad3d334fb..9f7e64a3a73 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.14-hardened1.patch", - "sha256": "0c5zi03j5bjhr706wad1qf5kr4nv0s2bzkx4z5mr6wqgra5dg22v", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.14-hardened1/linux-hardened-5.12.14-hardened1.patch" + "name": "linux-hardened-5.12.15-hardened1.patch", + "sha256": "1d81z67y9659icgmkchj0y2jlcs4nh4grlzf7ppbq6vmrr92xq8x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.15-hardened1/linux-hardened-5.12.15-hardened1.patch" }, "5.4": { "extra": "-hardened1", From cf4327321af21cf56fa31f651ddc6a3c59a81017 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:09:31 +0000 Subject: [PATCH 8/8] linux/hardened/patches/5.4: 5.4.129-hardened1 -> 5.4.130-hardened1 (cherry picked from commit 43fba78fec7c1f00ca8766e27894537fdd3eeb47) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 9f7e64a3a73..e97d9151dbd 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.129-hardened1.patch", - "sha256": "0b16w4jm22mlhwfvbzbg8bw9z7hp13r1bl5g5rk42vmz07ahknga", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.129-hardened1/linux-hardened-5.4.129-hardened1.patch" + "name": "linux-hardened-5.4.130-hardened1.patch", + "sha256": "0d7q6pkl74hkx65p25jxjjky08zdprsfbcyik9cdlsfrbiidwn53", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.130-hardened1/linux-hardened-5.4.130-hardened1.patch" } }