From 3fd61ac55ec27a8eefae188ffa600d568de12067 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Thu, 2 Jun 2022 06:14:46 -0500 Subject: [PATCH 1/6] linuxKernels.kernels.linux_xanmod: 5.15.40 -> 5.15.43 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 14c4d00dccdc..f985d249fb4c 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -2,9 +2,9 @@ let stableVariant = { - version = "5.15.40"; + version = "5.15.43"; suffix = "xanmod1"; - hash = "sha256-P9pRPfzBVQNhWp6ulDiBgV/ki2C0CTbIRV6KRhUD+vQ="; + hash = "sha256-MeH9RUPDiuN22eAZ18v+N3aIT18dQ3FnTkcQV0MjB4k="; }; edgeVariant = { From 61b37a0a20413f497c78aefd38d685cfea1fd490 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 4 Jun 2022 14:22:44 -0500 Subject: [PATCH 2/6] linuxKernel.kernels.linux_xanmod_latest: 5.17.8 -> 5.18.1 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index f985d249fb4c..abf2f765b186 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -8,9 +8,9 @@ let }; edgeVariant = { - version = "5.17.8"; + version = "5.18.1"; suffix = "xanmod1"; - hash = "sha256-Q8YmBeocolr6Ds2inwV299Td6/zE8RTA1SWve5ZykAs="; + hash = "sha256-dqvB4F2S7cklSJ7XTUNvWVKTsZGLevOXME5lvhmfyis="; }; xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec { From ecaaba491d483025370857690266c953e2977941 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 5 Jun 2022 10:48:39 -0500 Subject: [PATCH 3/6] linuxKernels.kernels.linux_xanmod: adjust config for 5.18 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index abf2f765b186..4a2af2450cc3 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -34,7 +34,7 @@ let X86_AMD_PSTATE = yes; # Linux RNG framework - LRNG = yes; + LRNG = whenOlder "5.18" yes; # Paragon's NTFS3 driver NTFS3_FS = module; From d688ec7d80bb790e6c0199a8fc0487140fc91319 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:06:52 -0500 Subject: [PATCH 4/6] linuxKernels.kernels.linux_xanmod: import helpers Co-authored-by: fortune --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 4a2af2450cc3..a0bf4b84e074 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -14,6 +14,7 @@ let }; xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec { + with (lib.kernel.whenHelpers version); inherit version; modDirVersion = "${version}-${suffix}"; From 83171a1dba143d34c6611d62d30cda2b983cec79 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:36:21 -0500 Subject: [PATCH 5/6] linuxKernels.kernels.linux_xanmod: apply patch from review --- .../linux/kernel/xanmod-kernels.nix | 70 ++++++++++--------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index a0bf4b84e074..205a52608408 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -14,7 +14,6 @@ let }; xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec { - with (lib.kernel.whenHelpers version); inherit version; modDirVersion = "${version}-${suffix}"; @@ -25,48 +24,51 @@ let inherit hash; }; - structuredExtraConfig = with lib.kernel; { - # removed options - CFS_BANDWIDTH = lib.mkForce (option no); - RT_GROUP_SCHED = lib.mkForce (option no); - SCHED_AUTOGROUP = lib.mkForce (option no); + structuredExtraConfig = + with lib.kernel; + with (lib.kernel.whenHelpers version); + { + # removed options + CFS_BANDWIDTH = lib.mkForce (option no); + RT_GROUP_SCHED = lib.mkForce (option no); + SCHED_AUTOGROUP = lib.mkForce (option no); - # AMD P-state driver - X86_AMD_PSTATE = yes; + # AMD P-state driver + X86_AMD_PSTATE = yes; - # Linux RNG framework - LRNG = whenOlder "5.18" yes; + # Linux RNG framework + LRNG = whenOlder "5.18" yes; - # Paragon's NTFS3 driver - NTFS3_FS = module; - NTFS3_LZX_XPRESS = yes; - NTFS3_FS_POSIX_ACL = yes; + # Paragon's NTFS3 driver + NTFS3_FS = module; + NTFS3_LZX_XPRESS = yes; + NTFS3_FS_POSIX_ACL = yes; - # Preemptive Full Tickless Kernel at 500Hz - SCHED_CORE = lib.mkForce (option no); - PREEMPT_VOLUNTARY = lib.mkForce no; - PREEMPT = lib.mkForce yes; - NO_HZ_FULL = yes; - HZ_500 = yes; + # Preemptive Full Tickless Kernel at 500Hz + SCHED_CORE = lib.mkForce (option no); + PREEMPT_VOLUNTARY = lib.mkForce no; + PREEMPT = lib.mkForce yes; + NO_HZ_FULL = yes; + HZ_500 = yes; - # Google's BBRv2 TCP congestion Control - TCP_CONG_BBR2 = yes; - DEFAULT_BBR2 = yes; + # Google's BBRv2 TCP congestion Control + TCP_CONG_BBR2 = yes; + DEFAULT_BBR2 = yes; - # FQ-PIE Packet Scheduling - NET_SCH_DEFAULT = yes; - DEFAULT_FQ_PIE = yes; + # FQ-PIE Packet Scheduling + NET_SCH_DEFAULT = yes; + DEFAULT_FQ_PIE = yes; - # Graysky's additional CPU optimizations - CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes; + # Graysky's additional CPU optimizations + CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes; - # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. - FUTEX = yes; - FUTEX_PI = yes; + # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. + FUTEX = yes; + FUTEX_PI = yes; - # WineSync driver for fast kernel-backed Wine - WINESYNC = module; - }; + # WineSync driver for fast kernel-backed Wine + WINESYNC = module; + }; extraMeta = { branch = lib.versions.majorMinor version; From 58b3f6693151d6c3d4a3f542be4f7dfa429519e4 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:44:47 -0500 Subject: [PATCH 6/6] linuxKernels.kernels.linux_xanmod: don't set `-Werror` by default Co-authored-by: fortune --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 205a52608408..761426da865d 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -28,6 +28,9 @@ let with lib.kernel; with (lib.kernel.whenHelpers version); { + # TODO: remove this once https://github.com/NixOS/nixpkgs/pull/175433 is in master + WERROR = no; + # removed options CFS_BANDWIDTH = lib.mkForce (option no); RT_GROUP_SCHED = lib.mkForce (option no);