From 6cd9dfb705685fda29cb6cd895001412ec565f91 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 29 Sep 2022 01:33:07 +0000 Subject: [PATCH 1/5] linux_xanmod: 5.15.60 -> 5.15.70 --- 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 9ccfe53f1b07..7e05a9e7f003 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,8 +3,8 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "5.15.60"; - hash = "sha256-XSOYgrJ/uvPpEG+P3Zy1geFeF/HMZ4LejsKWtTxMUTs="; + version = "5.15.70"; + hash = "sha256-gMtGoj/HzMqd6Y3PSc6QTsu/PI7vfb+1pg4mt878cxs="; variant = "lts"; }; From 2f0b33c47a5d86289fdb73fe23ece7111d7a3920 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 29 Sep 2022 01:39:20 +0000 Subject: [PATCH 2/5] linux_xanmod_latest: 5.19.1 -> 5.19.12 --- 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 7e05a9e7f003..cf50119e1a21 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; edgeVariant = { - version = "5.19.1"; - hash = "sha256-Fw+XW2YDAGKEzZ4AO88Y8GcypfOb6AjKp3XOlkT8ZTQ="; + version = "5.19.12"; + hash = "sha256-oN9+xcHjAHt5vGg3jx9bk/VMTyPMAzw5nIqUGtybKow="; variant = "edge"; }; From c2fab026d8100d4d3b4b02dff1e1ee0f7c027952 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 5 Oct 2022 06:16:23 +0000 Subject: [PATCH 3/5] linux_xanmod_latest: 5.19.12 -> 6.0.0, rename edge to next --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 10 +++++----- pkgs/top-level/linux-kernels.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index cf50119e1a21..b1f0c810c402 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -8,10 +8,10 @@ let variant = "lts"; }; - edgeVariant = { - version = "5.19.12"; - hash = "sha256-oN9+xcHjAHt5vGg3jx9bk/VMTyPMAzw5nIqUGtybKow="; - variant = "edge"; + nextVariant = { + version = "6.0.0"; + hash = "sha256-E7T8eHwMKYShv4KWdCbHQmpn+54edJoKdimZY3GFbPU="; + variant = "next"; }; ttVariant = { @@ -71,6 +71,6 @@ let in { lts = xanmodKernelFor ltsVariant; - edge = xanmodKernelFor edgeVariant; + next = xanmodKernelFor nextVariant; tt = xanmodKernelFor ttVariant; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 6cf5da069e0a..5e24ccdbc7ad 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -236,7 +236,7 @@ in { }; linux_xanmod = xanmodKernels.lts; - linux_xanmod_latest = xanmodKernels.edge; + linux_xanmod_latest = xanmodKernels.next; linux_xanmod_tt = xanmodKernels.tt; linux_libre = deblobKernel packageAliases.linux_default.kernel; From ceda251f7d12a234665d9f945a880e5fd8e564c2 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 5 Oct 2022 06:44:12 +0000 Subject: [PATCH 4/5] linux_xanmod_stable: init at 5.19.13 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 2 ++ 3 files changed, 11 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index b1f0c810c402..96845296aba1 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -8,6 +8,12 @@ let variant = "lts"; }; + currentVariant = { + version = "5.19.13"; + hash = "sha256-BzQH4c24CtE3R5HNe2sOc3McVkRmf/RKOOjuf1W4YfE="; + variant = "current"; + }; + nextVariant = { version = "6.0.0"; hash = "sha256-E7T8eHwMKYShv4KWdCbHQmpn+54edJoKdimZY3GFbPU="; @@ -71,6 +77,7 @@ let in { lts = xanmodKernelFor ltsVariant; + current = xanmodKernelFor currentVariant; next = xanmodKernelFor nextVariant; tt = xanmodKernelFor ttVariant; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd331840e524..9fc970571739 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24754,6 +24754,8 @@ with pkgs; # XanMod kernel linuxPackages_xanmod = linuxKernel.packages.linux_xanmod; linux_xanmod = linuxKernel.kernels.linux_xanmod; + linuxPackages_xanmod_stable = linuxKernel.packages.linux_xanmod_stable; + linux_xanmod_stable = linuxKernel.kernels.linux_xanmod_stable; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; linuxPackages_xanmod_tt = linuxKernel.packages.linux_xanmod_tt; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5e24ccdbc7ad..4663aa42f91b 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -236,6 +236,7 @@ in { }; linux_xanmod = xanmodKernels.lts; + linux_xanmod_stable = xanmodKernels.current; linux_xanmod_latest = xanmodKernels.next; linux_xanmod_tt = xanmodKernels.tt; @@ -583,6 +584,7 @@ in { linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); + linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable); linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); linux_xanmod_tt = recurseIntoAttrs (packagesFor kernels.linux_xanmod_tt); From ec813f2e372137cafa0bacdae52892f34bc7f22b Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 5 Oct 2022 12:59:32 +0000 Subject: [PATCH 5/5] linux_xanmod_latest: remove CC_OPTIMIZE_FOR_PERFORMANCE_O3 see: https://lore.kernel.org/linux-kbuild/CA+55aFz2sNBbZyg-_i8_Ldr2e8o9dfvdSfHHuRzVtP2VMAUWPg@mail.gmail.com/ --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 96845296aba1..8ec761a701a3 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -50,9 +50,6 @@ let NET_SCH_DEFAULT = yes; DEFAULT_FQ_PIE = 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;