From 4fa13b0a0ca4ec3c8aa113c32e4da8ca79f2bde5 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 6 Jun 2023 18:35:37 +0300 Subject: [PATCH 01/24] linux: 5.10.181 -> 5.10.182 (cherry picked from commit 7dbcfa1a02656cb2092d91119a521755b26db454) --- 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 9b9c1b64251e..8b500a0fad15 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.181"; + version = "5.10.182"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1rx43dkxspris9529vl11blzhvsxnpaqr6yb3fy089az7yvwxrmc"; + sha256 = "1xp9bxk2vyw29bq3z854ly4cj94z8i52yl5hq4a3l3j6564wb3ny"; }; } // (args.argsOverride or {})) From 8f4d0f705675081a16a9ec5c3e0e5ec258a803f1 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 6 Jun 2023 18:35:43 +0300 Subject: [PATCH 02/24] linux: 5.15.114 -> 5.15.115 (cherry picked from commit d77a40536993382b483addb82af3b3e57957b90a) --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index c2d1fddac15a..656bc3c06526 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.114"; + version = "5.15.115"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1lkpa9wv1qj90qdzzi71qf5dyy7mi95fixx3ymdp6xwz45fym0g9"; + sha256 = "050j9z0wg5glgxwbmzfq4l8lv8y7g3nc2rz8342yjdcjfxh6h1qv"; }; } // (args.argsOverride or { })) From 8ba099d670350c5e4e46a8fb8a8eb842004d1a9f Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 6 Jun 2023 18:35:48 +0300 Subject: [PATCH 03/24] linux: 5.4.244 -> 5.4.245 (cherry picked from commit c8a665ff5fced6cf16582627eacd15ac439bf229) --- 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 f8c453b3178c..901dd5e48937 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.244"; + version = "5.4.245"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "06x20aq7bv86ghv2sdsz3q2rmqh8h389x5zksr53fyzdjl72ixch"; + sha256 = "195ixy9l18mhwvzj7v63fkyifb9mysq950afxh6ixlpvg0c8h1wn"; }; } // (args.argsOverride or {})) From 852546dcfcef8942e24839d14135a819d9fe4727 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 6 Jun 2023 18:35:54 +0300 Subject: [PATCH 04/24] linux: 6.1.31 -> 6.1.32 (cherry picked from commit 705a02444269f0cf61f81b195d61e493701c039b) --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 0a89843a1128..c3412bfe9d54 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.31"; + version = "6.1.32"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1hbkw290kmf1dj8a255ik1gk5fk458c88m348dwrc3lrl6xifsg8"; + sha256 = "0v0saai735jzaj3dbpgp6sbdi95n3lmv78pbg1xy9fd2kfhbg23w"; }; } // (args.argsOverride or { })) From 8285ade03226b5433236e4e900caad2c79feb1cc Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 6 Jun 2023 18:36:00 +0300 Subject: [PATCH 05/24] linux: 6.3.5 -> 6.3.6 (cherry picked from commit f7a3f7cad123308378fac03379d0975238741c3b) --- pkgs/os-specific/linux/kernel/linux-6.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.3.nix b/pkgs/os-specific/linux/kernel/linux-6.3.nix index edb5f5a00633..b00350f5d550 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.3.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.3.5"; + version = "6.3.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0pl2zypsmrnna69850jadccffxwg9xdfkldg0sv8m44b7n64gkgm"; + sha256 = "1vr418rf0zd16fq4vaxda1w2ccng2n9l0ysakmgz9xqbz86iysks"; }; } // (args.argsOverride or { })) From 1ac6078b33b4ad5a6f4826e99ff39deb5fc3bcff Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 6 Jun 2023 18:36:08 +0300 Subject: [PATCH 06/24] linux-rt_5_10: 5.10.179-rt87 -> 5.10.180-rt88 (cherry picked from commit 38fad49214b958616ec926c44bfd4f43f63a6af9) --- 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 91bb56e41091..16cef44b2b43 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.179-rt87"; # updated by ./update-rt.sh + version = "5.10.180-rt88"; # 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 = "0abylcqbzpxxh45kmvd9i2cig64aajz87j5c8vm3w1ab2mf49g8v"; + sha256 = "0a8cicvcyl5w4vi7gxhgd59ny44gj9cbv4z5pnwn9jgny55rm0ys"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "045pjxlrv05vpiavgnaq971ziirxa1hzkzs1fv11npp4q45lqzp3"; + sha256 = "1509lg9gdjbjmg8rpx17n34xid2v1qz1lmil05b78sz86bscb2s2"; }; }; in [ rt-patch ] ++ kernelPatches; From 27d7b0e626b6a0ec7e8ffaad8d82df41557d1601 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 6 Jun 2023 18:37:02 +0300 Subject: [PATCH 07/24] linux/hardened/patches/4.14: 4.14.315-hardened1 -> 4.14.316-hardened1 (cherry picked from commit 3fae2d9ba16bb401584972e7b077e56d1b490528) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c906338061dd..a2d7d1b84045 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.315-hardened1.patch", - "sha256": "0mix8ycd46j53k2q1k3cpmz7kvd2p35gy2xkyrqxyqljrdfsz7wg", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.315-hardened1/linux-hardened-4.14.315-hardened1.patch" + "name": "linux-hardened-4.14.316-hardened1.patch", + "sha256": "1j0yx7i742mgbdn0lqq4mvcywk9jlm5k3zp40fdarsa0kscijxn0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.316-hardened1/linux-hardened-4.14.316-hardened1.patch" }, - "sha256": "17f9cbinysazllrxkv1qlhgi3x61isi7jqrv0qlfpjh69k1waim3", - "version": "4.14.315" + "sha256": "0xlg93va7dbz2w428kiw7vr2sds3542fqq57rwyf51ykq7qii0xc", + "version": "4.14.316" }, "4.19": { "patch": { From 5c9418a0429e52a0e8d6ed8741d96f01a47b2f8c Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 6 Jun 2023 18:37:10 +0300 Subject: [PATCH 08/24] linux/hardened/patches/4.19: 4.19.283-hardened1 -> 4.19.284-hardened1 (cherry picked from commit 5f541c2965f8c4cf9dba44b7757d422bff31be40) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a2d7d1b84045..d1631b495933 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.283-hardened1.patch", - "sha256": "0yhb49w7bfsx3i3nc8wawjbzq4dzyh29wqhpkrmk42fzhwsp4lc5", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.283-hardened1/linux-hardened-4.19.283-hardened1.patch" + "name": "linux-hardened-4.19.284-hardened1.patch", + "sha256": "0xqdhbsckkyg007x4247da0zza1sqq1y5a6li4z11y3xjf71dlxn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.284-hardened1/linux-hardened-4.19.284-hardened1.patch" }, - "sha256": "1x2irhiv20aq2mrgqyz18d147shbmghwfxq4qi0sv5vc1k91cwq4", - "version": "4.19.283" + "sha256": "0gnhgxcpx9s96wa3dqgxmdjb7x12i94yh0gmv7k9nbz5qwhfxfbz", + "version": "4.19.284" }, "5.10": { "patch": { From 125459b4521a2fe2523a1e2bb4855db68b6507e1 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 6 Jun 2023 18:37:18 +0300 Subject: [PATCH 09/24] linux/hardened/patches/5.10: 5.10.180-hardened1 -> 5.10.181-hardened1 (cherry picked from commit 7ca0b723e24a4d0796c46f9e78e579f4072d61b0) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d1631b495933..a0013c844e1c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.180-hardened1.patch", - "sha256": "0ks0bcprycylnsq7xdrp7phsi2jjmw7il1k7jwbjqs6irhn5p4dd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.180-hardened1/linux-hardened-5.10.180-hardened1.patch" + "name": "linux-hardened-5.10.181-hardened1.patch", + "sha256": "0dp50zakzxxalc4zdsw8jjhzi1vnb4x3wkdcnxxjpcikn9mg6jj7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.181-hardened1/linux-hardened-5.10.181-hardened1.patch" }, - "sha256": "0a8cicvcyl5w4vi7gxhgd59ny44gj9cbv4z5pnwn9jgny55rm0ys", - "version": "5.10.180" + "sha256": "1rx43dkxspris9529vl11blzhvsxnpaqr6yb3fy089az7yvwxrmc", + "version": "5.10.181" }, "5.15": { "patch": { From 76ef815421eca5466bb5b1aaec66fde392a6a5fa Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 6 Jun 2023 18:37:26 +0300 Subject: [PATCH 10/24] linux/hardened/patches/5.15: 5.15.112-hardened1 -> 5.15.114-hardened1 (cherry picked from commit 003589eb0e7912c9cf0aed05426bf3adf7352c43) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a0013c844e1c..515a720c1bb8 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.112-hardened1.patch", - "sha256": "0126p9s0flz544y8j8gjcx96mrivcr88lrzvmgyhly8dz06bwksb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.112-hardened1/linux-hardened-5.15.112-hardened1.patch" + "name": "linux-hardened-5.15.114-hardened1.patch", + "sha256": "1nhx1k6dxnqrgv6m6c69858018cda65l4135742wlyd4vgi7ikq7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.114-hardened1/linux-hardened-5.15.114-hardened1.patch" }, - "sha256": "0lfnd8mpb3nzvd0gk0jbls3zx7y5kskc4kgccjgkc34flgdyps5h", - "version": "5.15.112" + "sha256": "1lkpa9wv1qj90qdzzi71qf5dyy7mi95fixx3ymdp6xwz45fym0g9", + "version": "5.15.114" }, "5.4": { "patch": { From a59ba1050a071400fdca6149cf653d7f6f7f061f Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 6 Jun 2023 18:37:36 +0300 Subject: [PATCH 11/24] linux/hardened/patches/5.4: 5.4.243-hardened1 -> 5.4.244-hardened1 (cherry picked from commit 89338c4b671b4095d4eaf716a2ab8df01f82ce6b) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 515a720c1bb8..0b5f3d42016f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.243-hardened1.patch", - "sha256": "04xnfqxxfs1cbq5ynly1vgwjdhnjf3b34yirk3cqffrwwlcba3db", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.243-hardened1/linux-hardened-5.4.243-hardened1.patch" + "name": "linux-hardened-5.4.244-hardened1.patch", + "sha256": "1ap8ipkxbsqflf2lwppz41v5jrl6qbblf6ig2id6x3mjd6v0lph3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.244-hardened1/linux-hardened-5.4.244-hardened1.patch" }, - "sha256": "017b1xhmjpmiq48pzzx36wn6jwwgaq2kgia51h7pxr7fxr7ndky3", - "version": "5.4.243" + "sha256": "06x20aq7bv86ghv2sdsz3q2rmqh8h389x5zksr53fyzdjl72ixch", + "version": "5.4.244" }, "6.1": { "patch": { From 7cf120c4f50d96ba10a43a53f8e01e20dee6b45c Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 6 Jun 2023 18:37:44 +0300 Subject: [PATCH 12/24] linux/hardened/patches/6.1: 6.1.29-hardened1 -> 6.1.31-hardened1 (cherry picked from commit 672e1610aab78859b5ed94674e4577cbd8c7d58a) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0b5f3d42016f..079f83549d91 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.29-hardened1.patch", - "sha256": "09g7hk30hdjgbni02k4zrzh8i2lhcmb6fbif6n101wmcrnrf8c80", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.29-hardened1/linux-hardened-6.1.29-hardened1.patch" + "name": "linux-hardened-6.1.31-hardened1.patch", + "sha256": "04baw5z9nk4fjinnj1plg47b8wi8fqwj0v8si91zz19mzgpkfkkz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.31-hardened1/linux-hardened-6.1.31-hardened1.patch" }, - "sha256": "1yzwp0496j63c6lhvsni1ynr8b2cpn552pli3nd3fdk0pp4nqwqy", - "version": "6.1.29" + "sha256": "1hbkw290kmf1dj8a255ik1gk5fk458c88m348dwrc3lrl6xifsg8", + "version": "6.1.31" } } From a58a463569317f93ea077dcd59d3e26b2e9aa040 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Jun 2023 16:43:27 +0300 Subject: [PATCH 13/24] linux: 4.14.316 -> 4.14.317 (cherry picked from commit 489678eb8cbb15803cdd763edf7381eff948eda6) --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index b0985d0e28d8..28ba4f89ac1e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.316"; + version = "4.14.317"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0xlg93va7dbz2w428kiw7vr2sds3542fqq57rwyf51ykq7qii0xc"; + sha256 = "0c1wy0m0jnjpc6scrw1y97wsg2d18vb1bi31i1qzlxvgmrd8zwlc"; }; } // (args.argsOverride or {})) From 2165e4cf2dfa89629d1250b744d2dbfa29781a3c Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Jun 2023 16:43:31 +0300 Subject: [PATCH 14/24] linux: 4.19.284 -> 4.19.285 (cherry picked from commit 2054a678a36024ee6cb897b8739495a5865940e0) --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 8c73e5747029..1567db74c961 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.284"; + version = "4.19.285"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0gnhgxcpx9s96wa3dqgxmdjb7x12i94yh0gmv7k9nbz5qwhfxfbz"; + sha256 = "05nwivdk4w939vrrbn5p2yai1rz7kxqa4bl5f3n6d867b59pg8da"; }; } // (args.argsOverride or {})) From 60462d57b886c6b1e848b244369dcabd5a4325a8 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Jun 2023 16:43:36 +0300 Subject: [PATCH 15/24] linux: 5.10.182 -> 5.10.183 (cherry picked from commit 917d18270c9037911baa3cac24710576b6f62774) --- 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 8b500a0fad15..bb06a600f6f9 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.182"; + version = "5.10.183"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1xp9bxk2vyw29bq3z854ly4cj94z8i52yl5hq4a3l3j6564wb3ny"; + sha256 = "06b1nlwaqs7g3323zxp1bxfilqpbj700x591vqa9dx6a6p39g520"; }; } // (args.argsOverride or {})) From 10c1cb7345dac1e6b1569ca56a261a7324bebfc8 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Jun 2023 16:43:41 +0300 Subject: [PATCH 16/24] linux: 5.15.115 -> 5.15.116 (cherry picked from commit 951e7e83aee6b1ad6a9fa7a5ec32ed4466a05a38) --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 656bc3c06526..f27fb7ec6a41 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.115"; + version = "5.15.116"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "050j9z0wg5glgxwbmzfq4l8lv8y7g3nc2rz8342yjdcjfxh6h1qv"; + sha256 = "16hpdqlkz2g2pjcml7j55yfym6nbp0zg8f2r969wq9jkpg8wj5zn"; }; } // (args.argsOverride or { })) From d8f926f1525dfcf5b85e642c796083634e7aaa80 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Jun 2023 16:43:45 +0300 Subject: [PATCH 17/24] linux: 5.4.245 -> 5.4.246 (cherry picked from commit 2b4690b98fbac808e92bda9f177e2477f84358ac) --- 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 901dd5e48937..2816f68c74a2 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.245"; + version = "5.4.246"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "195ixy9l18mhwvzj7v63fkyifb9mysq950afxh6ixlpvg0c8h1wn"; + sha256 = "1snrgvpqpmc0d4aphq8flsmlcjjx9kgknymjlrmazl4ghl57jf09"; }; } // (args.argsOverride or {})) From d1b82ee5748779d61f2c62ccd49bb9210d837ac0 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Jun 2023 16:45:33 +0300 Subject: [PATCH 18/24] linux: 6.1.32 -> 6.1.33 (cherry picked from commit e941c4484db08fa3750f50e17aa047abae6b0455) --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index c3412bfe9d54..95efb8e3529a 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.32"; + version = "6.1.33"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0v0saai735jzaj3dbpgp6sbdi95n3lmv78pbg1xy9fd2kfhbg23w"; + sha256 = "1kfj7mi3n2lfaw4spz5cbvcl1md038figabyg80fha3kxal6nzdq"; }; } // (args.argsOverride or { })) From b8daf4024aedc0a61010331792ed90f0bf47bab3 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Jun 2023 16:45:38 +0300 Subject: [PATCH 19/24] linux: 6.3.6 -> 6.3.7 (cherry picked from commit 3143cda4d457a212b7021e693a68c30165f02d98) --- pkgs/os-specific/linux/kernel/linux-6.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.3.nix b/pkgs/os-specific/linux/kernel/linux-6.3.nix index b00350f5d550..5cbb872b6a41 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.3.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.3.6"; + version = "6.3.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1vr418rf0zd16fq4vaxda1w2ccng2n9l0ysakmgz9xqbz86iysks"; + sha256 = "1acpbddgxna1g8xzsil5r1fbsiw8z3wdr69y8xxjllkck51rfdpy"; }; } // (args.argsOverride or { })) From 3e093dcaf86dfd266d67db5cde423c57e04f1b9f Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Jun 2023 16:46:05 +0300 Subject: [PATCH 20/24] linux-rt_5_10: 5.10.180-rt88 -> 5.10.78-rt55 (cherry picked from commit cc63badb85e7bca49100946fc8ae59443ea53cd2) --- 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 16cef44b2b43..c8d42ddda746 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.180-rt88"; # updated by ./update-rt.sh + version = "5.10.78-rt55"; # 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 = "0a8cicvcyl5w4vi7gxhgd59ny44gj9cbv4z5pnwn9jgny55rm0ys"; + sha256 = "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1509lg9gdjbjmg8rpx17n34xid2v1qz1lmil05b78sz86bscb2s2"; + sha256 = "1wcw682r238qi5jgn5zk9m6j2506p9ypfax13bzhjfyjzz3h98kp"; }; }; in [ rt-patch ] ++ kernelPatches; From 802d2fb5a01486c1a698aa65b6704b659dfaebe4 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Jun 2023 16:46:38 +0300 Subject: [PATCH 21/24] linux/hardened/patches/5.10: 5.10.181-hardened1 -> 5.10.182-hardened1 (cherry picked from commit 2ebb96aa75be2d6e65ce06fd46ebc4ad1a299cc0) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 079f83549d91..4b1a587a71b4 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.181-hardened1.patch", - "sha256": "0dp50zakzxxalc4zdsw8jjhzi1vnb4x3wkdcnxxjpcikn9mg6jj7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.181-hardened1/linux-hardened-5.10.181-hardened1.patch" + "name": "linux-hardened-5.10.182-hardened1.patch", + "sha256": "1230wh6wjvmv3mv2sylwcqvqbz83b4vwwpbn7zikd7mmz2619k5w", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.182-hardened1/linux-hardened-5.10.182-hardened1.patch" }, - "sha256": "1rx43dkxspris9529vl11blzhvsxnpaqr6yb3fy089az7yvwxrmc", - "version": "5.10.181" + "sha256": "1xp9bxk2vyw29bq3z854ly4cj94z8i52yl5hq4a3l3j6564wb3ny", + "version": "5.10.182" }, "5.15": { "patch": { From 8d0a25c3fd1777795d6dd75143030c5efb75ee38 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Jun 2023 16:48:25 +0300 Subject: [PATCH 22/24] linux/hardened/patches/5.15: 5.15.114-hardened1 -> 5.15.115-hardened1 (cherry picked from commit 8c28d094c3f9d9ced8fa243ea44415704e3e53b6) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 4b1a587a71b4..ba0893763453 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.114-hardened1.patch", - "sha256": "1nhx1k6dxnqrgv6m6c69858018cda65l4135742wlyd4vgi7ikq7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.114-hardened1/linux-hardened-5.15.114-hardened1.patch" + "name": "linux-hardened-5.15.115-hardened1.patch", + "sha256": "1gkmhhfv86vnja37xfrnl65n6hzq429lc5zlxjvjmrpagl2x1pfc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.115-hardened1/linux-hardened-5.15.115-hardened1.patch" }, - "sha256": "1lkpa9wv1qj90qdzzi71qf5dyy7mi95fixx3ymdp6xwz45fym0g9", - "version": "5.15.114" + "sha256": "050j9z0wg5glgxwbmzfq4l8lv8y7g3nc2rz8342yjdcjfxh6h1qv", + "version": "5.15.115" }, "5.4": { "patch": { From 6c5cc7e7d02a9b503a6528a0021c0b3d9a9191e5 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Jun 2023 16:48:31 +0300 Subject: [PATCH 23/24] linux/hardened/patches/5.4: 5.4.244-hardened1 -> 5.4.245-hardened1 (cherry picked from commit 0edae4c6a22cc5c099774ffb758d511cd3938922) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ba0893763453..d0b3af73777f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.244-hardened1.patch", - "sha256": "1ap8ipkxbsqflf2lwppz41v5jrl6qbblf6ig2id6x3mjd6v0lph3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.244-hardened1/linux-hardened-5.4.244-hardened1.patch" + "name": "linux-hardened-5.4.245-hardened1.patch", + "sha256": "0n5ifykd1gq8yiw3snw6lhpz2hhydj3nk9k2f80b9svmza2h4vi6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.245-hardened1/linux-hardened-5.4.245-hardened1.patch" }, - "sha256": "06x20aq7bv86ghv2sdsz3q2rmqh8h389x5zksr53fyzdjl72ixch", - "version": "5.4.244" + "sha256": "195ixy9l18mhwvzj7v63fkyifb9mysq950afxh6ixlpvg0c8h1wn", + "version": "5.4.245" }, "6.1": { "patch": { From 1f2393eaf52796a8cdc8e86e42c6508b78f4167b Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Jun 2023 16:50:34 +0300 Subject: [PATCH 24/24] linux/hardened/patches/6.1: 6.1.31-hardened1 -> 6.1.32-hardened1 (cherry picked from commit f98467021814f4e67732bcb1803a0d5962e2535b) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d0b3af73777f..ceec23139f94 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.31-hardened1.patch", - "sha256": "04baw5z9nk4fjinnj1plg47b8wi8fqwj0v8si91zz19mzgpkfkkz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.31-hardened1/linux-hardened-6.1.31-hardened1.patch" + "name": "linux-hardened-6.1.32-hardened1.patch", + "sha256": "00sg3zmvvnyvc4j82lcj4r7yw5hwvc253w0g2fr1hqqvh4fhinhw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.32-hardened1/linux-hardened-6.1.32-hardened1.patch" }, - "sha256": "1hbkw290kmf1dj8a255ik1gk5fk458c88m348dwrc3lrl6xifsg8", - "version": "6.1.31" + "sha256": "0v0saai735jzaj3dbpgp6sbdi95n3lmv78pbg1xy9fd2kfhbg23w", + "version": "6.1.32" } }