From 8d4c7e351de7fa2a7e611b536d3a6c35d426a11c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Nov 2022 10:09:12 +0100 Subject: [PATCH 01/20] linux: 4.14.299 -> 4.14.300 (cherry picked from commit 2d7d63b45279e0b3e3b980ec6922bc1fc4b53abc) --- 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 7c2fc0ee9fdf..676302eb1e05 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.299"; + version = "4.14.300"; # 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 = "0p5ic2mrb9vl3qkzvqxhia3kygjv8xa6s1kqkwgd6b4rmq1kc8r6"; + sha256 = "047vmh09icm45g7mnmdvyj9cam7747bcpah1s7n9dm5i2j2f906y"; }; } // (args.argsOverride or {})) From 6bfc34d74ae90b08145b8dd38db63ec38f4a5c48 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Nov 2022 10:09:25 +0100 Subject: [PATCH 02/20] linux: 4.19.265 -> 4.19.267 (cherry picked from commit e3db9b3f052021afff624bcf95b5ac8682ef1a24) --- 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 aae0bf463c8e..734fa93fa207 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.265"; + version = "4.19.267"; # 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 = "1l5cdpgng1gci1p1gdr2jzqw486h3w56gpyc7fbq74hlc6nnwh1p"; + sha256 = "035yxx13jz5f5ig2r6ybzgivm8vjafgnvjws0jfzha4w6klf7r9l"; }; } // (args.argsOverride or {})) From 239e9c08de47dd50b4ff006500641f0c32b71408 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Nov 2022 10:09:36 +0100 Subject: [PATCH 03/20] linux: 5.10.155 -> 5.10.156 (cherry picked from commit 42edd9f2e96fc3575fa6a863ae29c1593612e54a) --- 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 4e55c5c7dbe3..379259f16bc3 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.155"; + version = "5.10.156"; # 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 = "1wyla96qsdf50n7qjj4hdf36bj56whv7gc9mgw9bvrsqdi92gc7i"; + sha256 = "08srjps110zi4ivzh0z2jf78ddyfj2wivdliffb2f03jr9j9k7k7"; }; } // (args.argsOverride or {})) From ecb105ea51e9e431cd3be4edab1211f690517a6f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Nov 2022 10:09:50 +0100 Subject: [PATCH 04/20] linux: 5.15.79 -> 5.15.80 (cherry picked from commit 9f5b441bf4d8cf81362d792f838e51b842d989eb) --- 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 6e7dbe2acca8..b2531d3932d1 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.79"; + version = "5.15.80"; # 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; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0m61k7k6lj24z9a266q08wzghggjik2wizcabdwd1vn0vcqr18yb"; + sha256 = "0kgxznd3sfbmnygjvp9dzhzg5chxlaxk6kldxmh1y0njcrj1lciv"; }; } // (args.argsOverride or { })) From 0dff111ce47d68284b079091e6761a403607cb34 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Nov 2022 10:10:01 +0100 Subject: [PATCH 05/20] linux: 5.4.224 -> 5.4.225 (cherry picked from commit 08eebaf5d9879863183fe79de19a021de4f2026c) --- 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 ed46ce896dba..d4f06b7b2f83 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.224"; + version = "5.4.225"; # 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 = "0dixs4w7nmkjgxv9dxgjdy8v6r4parkpqyvdfyr0wqk0amdz4zcb"; + sha256 = "1ak0qlxzfylgvkldh2whq4mzynh1rymhnnc1yif9a5s3f7v9dxar"; }; } // (args.argsOverride or {})) From 7be2c914861563ea4d88ffb5a7432a1cf3de50df Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Nov 2022 10:10:14 +0100 Subject: [PATCH 06/20] linux: 6.0.9 -> 6.0.10 (cherry picked from commit 68611465377d3ee937007216bed4ea350cf557c0) --- pkgs/os-specific/linux/kernel/linux-6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index 709c0599dc07..55c70ccaf60f 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0.9"; + version = "6.0.10"; # 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 = "1irip1yk62carcisxlacwcxsiqib4qswx6h5mfhv8f97x04a4531"; + sha256 = "1l0xak4w7c16cg8lhracy8r18zzdl0x5s654w6ivyw6dhk6pzr9r"; }; } // (args.argsOverride or { })) From 72dbf38202efb27edf019ccc141ccfa4b17e65ca Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Nov 2022 10:10:39 +0100 Subject: [PATCH 07/20] linux_latest-libre: 18978 -> 18996 (cherry picked from commit 7b2c616756d1fa2215f8c3c434b10d16dd7fd205) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 0a397d639360..60873fd8adde 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18978"; - sha256 = "12mvj5c2k774fpmixcv7i4ciw7xqjaxqd20ryn8xw8vgrnb4h6fi"; + rev = "18996"; + sha256 = "0dflbcpdd75xwy5amk9665q9w6dvrybs0sdm61c6pydx4kd0b3ws"; } , ... }: From 45ce93ad006996d9bd385ff76669ad691894c08c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Nov 2022 10:11:05 +0100 Subject: [PATCH 08/20] linux/hardened/patches/4.14: 4.14.299-hardened1 -> 4.14.300-hardened1 (cherry picked from commit dee4d9f013cb791c878636cfc4fdd970e4887948) --- 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 458caf06433c..a6ca3810887c 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.299-hardened1.patch", - "sha256": "1qgsi8kfbfqqkb2n0irqfrbq865dz4f5hmhxq7fbmnpacjgwdy6a", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.299-hardened1/linux-hardened-4.14.299-hardened1.patch" + "name": "linux-hardened-4.14.300-hardened1.patch", + "sha256": "1y43qxcn00w1gayjj1rr3vfws8m4f2p9nz080nqilw0g14kq73sa", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.300-hardened1/linux-hardened-4.14.300-hardened1.patch" }, - "sha256": "0p5ic2mrb9vl3qkzvqxhia3kygjv8xa6s1kqkwgd6b4rmq1kc8r6", - "version": "4.14.299" + "sha256": "047vmh09icm45g7mnmdvyj9cam7747bcpah1s7n9dm5i2j2f906y", + "version": "4.14.300" }, "4.19": { "patch": { From b4e054e877eebed9168d6f1afdc131aca8f46f65 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Nov 2022 10:11:17 +0100 Subject: [PATCH 09/20] linux/hardened/patches/4.19: 4.19.265-hardened1 -> 4.19.267-hardened1 (cherry picked from commit a3ef6bef2af1d9522fccd08304875afe603b0f70) --- 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 a6ca3810887c..a336187a9a8e 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.265-hardened1.patch", - "sha256": "0psqvwqvq981hvix58z5bhc4xvgm2ic5y4q7bwsnh1cfvbfg6x2k", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.265-hardened1/linux-hardened-4.19.265-hardened1.patch" + "name": "linux-hardened-4.19.267-hardened1.patch", + "sha256": "0phlfwigzh2j5j8xjqamywqn8libpzvhingx0vjxggf0wqxvgix0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.267-hardened1/linux-hardened-4.19.267-hardened1.patch" }, - "sha256": "1l5cdpgng1gci1p1gdr2jzqw486h3w56gpyc7fbq74hlc6nnwh1p", - "version": "4.19.265" + "sha256": "035yxx13jz5f5ig2r6ybzgivm8vjafgnvjws0jfzha4w6klf7r9l", + "version": "4.19.267" }, "5.10": { "patch": { From cd84dbb32ad0a04ecc375a0b7a8bb70c02b86bb2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Nov 2022 10:11:30 +0100 Subject: [PATCH 10/20] linux/hardened/patches/5.10: 5.10.154-hardened1 -> 5.10.156-hardened1 (cherry picked from commit 5c01fb26770d403cea128f8650561142b6bd94ad) --- 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 a336187a9a8e..34109d9856e7 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.154-hardened1.patch", - "sha256": "0srwi4033h8ypxbwwp1hb3y989jvlwzckvsfjkxzgpnj91i68hn9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.154-hardened1/linux-hardened-5.10.154-hardened1.patch" + "name": "linux-hardened-5.10.156-hardened1.patch", + "sha256": "1caf5136i8k4afr1jfbnnqgbhq877in3azicbpazcgv1js9f0n30", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.156-hardened1/linux-hardened-5.10.156-hardened1.patch" }, - "sha256": "12763vlnrgmgj03khj9ls2g7zlhclj9g1l3008b36j9jli6kvbn6", - "version": "5.10.154" + "sha256": "08srjps110zi4ivzh0z2jf78ddyfj2wivdliffb2f03jr9j9k7k7", + "version": "5.10.156" }, "5.15": { "patch": { From 6f17718072ada5a3663682286640fa3f34cccc6c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Nov 2022 10:11:43 +0100 Subject: [PATCH 11/20] linux/hardened/patches/5.15: 5.15.78-hardened1 -> 5.15.79-hardened1 (cherry picked from commit 04ba9d8ded27a5a9477e117acffe2ecd9ef8a0e3) --- 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 34109d9856e7..dca64c0bdf30 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.78-hardened1.patch", - "sha256": "1aavp00rswqbbpbyx0c7k2ga6lcd221gcgr4893q7w5z26mv7wkd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.78-hardened1/linux-hardened-5.15.78-hardened1.patch" + "name": "linux-hardened-5.15.79-hardened1.patch", + "sha256": "102zaxvyjq1gwnp69w3941ni92sv7k1fsf35f1f9vj0hj6jig7j3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.79-hardened1/linux-hardened-5.15.79-hardened1.patch" }, - "sha256": "16d4d4g5n2g6jpp8bvad1bm1l0b0nb4ckwsmq6w2g3538xrrzf8d", - "version": "5.15.78" + "sha256": "0m61k7k6lj24z9a266q08wzghggjik2wizcabdwd1vn0vcqr18yb", + "version": "5.15.79" }, "5.4": { "patch": { From f9adb9c703f244e8b6194cf2facf8c87bfa4de38 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Nov 2022 10:11:55 +0100 Subject: [PATCH 12/20] linux/hardened/patches/5.4: 5.4.224-hardened1 -> 5.4.225-hardened1 (cherry picked from commit 91e2b58a76a641a9b491788959f8cdad49213b24) --- 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 dca64c0bdf30..7eb61d56c658 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.224-hardened1.patch", - "sha256": "1cx0h6sn8wdggg9nwqlrij7cfpa9q6nah73nrv92b4c9n8sjqiwq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.224-hardened1/linux-hardened-5.4.224-hardened1.patch" + "name": "linux-hardened-5.4.225-hardened1.patch", + "sha256": "09h8bjq73fyx6kqk0kcy3z2a0cs32gg4visv859siwb8rw1ziva2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.225-hardened1/linux-hardened-5.4.225-hardened1.patch" }, - "sha256": "0dixs4w7nmkjgxv9dxgjdy8v6r4parkpqyvdfyr0wqk0amdz4zcb", - "version": "5.4.224" + "sha256": "1ak0qlxzfylgvkldh2whq4mzynh1rymhnnc1yif9a5s3f7v9dxar", + "version": "5.4.225" }, "6.0": { "patch": { From 3c8286fb659005d6a3609cccf982962063026e78 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Nov 2022 15:14:17 +0100 Subject: [PATCH 13/20] linux: 4.9.333 -> 4.9.334 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d4f0224aa49c..151468d51ad7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.333"; + version = "4.9.334"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ash877gkrrc063h6ncl9d4gzyhndanpxsdgf1a93abbfv281gs1"; + sha256 = "0sjh492mfic6llgwb957nj7gd7c0dvqnk97ngq8d50sjsyjznyk9"; }; } // (args.argsOverride or {})) From 9d0ad218e9dba4621c9f3f594f3a56c1e8d275be Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:03:56 +0300 Subject: [PATCH 14/20] linux: 5.10.156 -> 5.10.157 (cherry picked from commit d779e43f22c3064418d530fb5987e4ad4f2fd634) --- 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 379259f16bc3..8be0db43fb0d 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.156"; + version = "5.10.157"; # 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 = "08srjps110zi4ivzh0z2jf78ddyfj2wivdliffb2f03jr9j9k7k7"; + sha256 = "0zrjdmaj3sx0w7397glaiq6w9wwdj7lpff77a09kzmbyfz0dfk7w"; }; } // (args.argsOverride or {})) From f2d4a9bb69dd05b7f407e9e60f31871888e3bf39 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:04:03 +0300 Subject: [PATCH 15/20] linux: 5.15.80 -> 5.15.81 (cherry picked from commit 8f5ddf07cb34e7d431d2c29889c2e9bfed06ce86) --- 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 b2531d3932d1..112b7f6f97f4 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.80"; + version = "5.15.81"; # 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; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0kgxznd3sfbmnygjvp9dzhzg5chxlaxk6kldxmh1y0njcrj1lciv"; + sha256 = "1awny3lgfkh5n2gdksajbyzips8kawz6rkr0p5inwkbmppg5r24g"; }; } // (args.argsOverride or { })) From 304e450521be2989cb17f9da0e6ccceaa758a539 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:04:09 +0300 Subject: [PATCH 16/20] linux: 6.0.10 -> 6.0.11 (cherry picked from commit c355d942751324e38599478a4e11abb850feb088) --- pkgs/os-specific/linux/kernel/linux-6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index 55c70ccaf60f..0815279fb4fa 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0.10"; + version = "6.0.11"; # 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 = "1l0xak4w7c16cg8lhracy8r18zzdl0x5s654w6ivyw6dhk6pzr9r"; + sha256 = "0qn7m74wfixqk832j2yvgf2lq4vi55agm5gk9ziy2wa9wqqn3bib"; }; } // (args.argsOverride or { })) From df6a743ae28a698393ba8f77f7b4a11eaa398c8e Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:04:33 +0300 Subject: [PATCH 17/20] linux_latest-libre: 18996 -> 19001 (cherry picked from commit aea7b200b21a7b39e3268bd550462b3cb6dc3d9a) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 60873fd8adde..5bcf2f357328 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18996"; - sha256 = "0dflbcpdd75xwy5amk9665q9w6dvrybs0sdm61c6pydx4kd0b3ws"; + rev = "19001"; + sha256 = "0y2j37dgpagm0qvi66xw138mr7vpdg4ifnh24pl8aacp83xxglq9"; } , ... }: From 182e712391e43816eaedf5d9b44ae521e2154c08 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:05:01 +0300 Subject: [PATCH 18/20] linux/hardened/patches/5.15: 5.15.79-hardened1 -> 5.15.80-hardened1 (cherry picked from commit 30d0f12f7752aca51fac44f08241b297805cd7ab) --- 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 7eb61d56c658..66041573d9c4 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.79-hardened1.patch", - "sha256": "102zaxvyjq1gwnp69w3941ni92sv7k1fsf35f1f9vj0hj6jig7j3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.79-hardened1/linux-hardened-5.15.79-hardened1.patch" + "name": "linux-hardened-5.15.80-hardened1.patch", + "sha256": "1d471cqh81pzd3xv30pcy1whsgvpw0qzig27w57f2m794jnjkz3y", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.80-hardened1/linux-hardened-5.15.80-hardened1.patch" }, - "sha256": "0m61k7k6lj24z9a266q08wzghggjik2wizcabdwd1vn0vcqr18yb", - "version": "5.15.79" + "sha256": "0kgxznd3sfbmnygjvp9dzhzg5chxlaxk6kldxmh1y0njcrj1lciv", + "version": "5.15.80" }, "5.4": { "patch": { From 62e946b78849e9efdf9be0f6da29d60d630efe75 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:05:10 +0300 Subject: [PATCH 19/20] linux/hardened/patches/6.0: 6.0.8-hardened1 -> 6.0.10-hardened1 (cherry picked from commit aea291b0187b2c897f3d8a873fad8e1d984b3b4d) --- 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 66041573d9c4..9fbdb35f0323 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "6.0": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.0.8-hardened1.patch", - "sha256": "08xvsqb3d0j98n2i4468ja9miydgy3kcrz66fbi1kymn79yam62n", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.8-hardened1/linux-hardened-6.0.8-hardened1.patch" + "name": "linux-hardened-6.0.10-hardened1.patch", + "sha256": "1zbhqwhbzjc2jsmbrqk6y4w62b9drhzh2kb1p5bwgi3nd17f43jj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.10-hardened1/linux-hardened-6.0.10-hardened1.patch" }, - "sha256": "0mx2bxgnxm3vz688268939xw90jqci7xn992kfpny74mjqwzir0d", - "version": "6.0.8" + "sha256": "1l0xak4w7c16cg8lhracy8r18zzdl0x5s654w6ivyw6dhk6pzr9r", + "version": "6.0.10" } } From 0581b0b006d00f2c8b5e375a0580d680af9a68bb Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:37:00 +0300 Subject: [PATCH 20/20] linux: set X86_AMD_PSTATE=y instead of =m (cherry picked from commit b9a4991020b229e700fd8d7443f10befdc4dd9ce) --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ea6a420f787a..8406ad52ecfc 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -78,6 +78,7 @@ let INTEL_RAPL = whenAtLeast "5.3" module; X86_INTEL_LPSS = yes; X86_INTEL_PSTATE = yes; + X86_AMD_PSTATE = whenAtLeast "5.17" yes; }; external-firmware = {