diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 9ccfe53f1b07..8ec761a701a3 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,15 +3,21 @@ 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"; }; - edgeVariant = { - version = "5.19.1"; - hash = "sha256-Fw+XW2YDAGKEzZ4AO88Y8GcypfOb6AjKp3XOlkT8ZTQ="; - variant = "edge"; + currentVariant = { + version = "5.19.13"; + hash = "sha256-BzQH4c24CtE3R5HNe2sOc3McVkRmf/RKOOjuf1W4YfE="; + variant = "current"; + }; + + nextVariant = { + version = "6.0.0"; + hash = "sha256-E7T8eHwMKYShv4KWdCbHQmpn+54edJoKdimZY3GFbPU="; + variant = "next"; }; ttVariant = { @@ -44,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; @@ -71,6 +74,7 @@ let in { lts = xanmodKernelFor ltsVariant; - edge = xanmodKernelFor edgeVariant; + 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 b96f28b1f74b..1b5b2a5cfbb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24825,6 +24825,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 ee16997b4933..2b690422ecd5 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -232,7 +232,8 @@ in { }; linux_xanmod = xanmodKernels.lts; - linux_xanmod_latest = xanmodKernels.edge; + linux_xanmod_stable = xanmodKernels.current; + linux_xanmod_latest = xanmodKernels.next; linux_xanmod_tt = xanmodKernels.tt; linux_libre = deblobKernel packageAliases.linux_default.kernel; @@ -578,6 +579,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);