From d779e43f22c3064418d530fb5987e4ad4f2fd634 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:03:56 +0300 Subject: [PATCH 1/7] linux: 5.10.156 -> 5.10.157 --- 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 8f5ddf07cb34e7d431d2c29889c2e9bfed06ce86 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:04:03 +0300 Subject: [PATCH 2/7] linux: 5.15.80 -> 5.15.81 --- 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 279eaf85dd2c..f0e341f540a2 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; @@ -13,6 +13,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 c355d942751324e38599478a4e11abb850feb088 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:04:09 +0300 Subject: [PATCH 3/7] linux: 6.0.10 -> 6.0.11 --- 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 aea7b200b21a7b39e3268bd550462b3cb6dc3d9a Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:04:33 +0300 Subject: [PATCH 4/7] linux_latest-libre: 18996 -> 19001 --- 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 30d0f12f7752aca51fac44f08241b297805cd7ab Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:05:01 +0300 Subject: [PATCH 5/7] linux/hardened/patches/5.15: 5.15.79-hardened1 -> 5.15.80-hardened1 --- 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 aea291b0187b2c897f3d8a873fad8e1d984b3b4d Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:05:10 +0300 Subject: [PATCH 6/7] linux/hardened/patches/6.0: 6.0.8-hardened1 -> 6.0.10-hardened1 --- 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 b9a4991020b229e700fd8d7443f10befdc4dd9ce Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 2 Dec 2022 23:37:00 +0300 Subject: [PATCH 7/7] linux: set X86_AMD_PSTATE=y instead of =m --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 606a505885d9..c03669508a89 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -75,7 +75,7 @@ let INTEL_RAPL = whenAtLeast "5.3" module; X86_INTEL_LPSS = yes; X86_INTEL_PSTATE = yes; - X86_AMD_PSTATE = whenAtLeast "5.17" module; + X86_AMD_PSTATE = whenAtLeast "5.17" yes; }; external-firmware = {