Restore x86_64-v2 variants in kernel-cachyos/default.nix

PR #50 removed the four `x86_64-v2` variant entries to reclaim compute
on the build server. The entries can be restored without changing what
garnix builds, because the current `garnix.yaml` `builds.include` list
only enumerates the four baseline variants (`linux-cachyos-{latest,
latest-lto,lts,lts-lto}`) — v2 stays excluded from garnix either way.

The infrastructure to build v2 (mkCachyKernel accepting `processorOpt
= "x86_64-v2"`, cachySettings.nix retaining the full v2 config block,
CachyOS upstream kconfig support) is intact; PR #50 only removed the
attrset entries. This restores them so downstream Nix users on
v2-only hardware can keep using `pkgs.cachyosKernels.linux-cachyos-*-
x86_64-v2` (built locally) instead of vendoring mkCachyKernel.

Restores:
- linux-cachyos-latest-x86_64-v2
- linux-cachyos-latest-lto-x86_64-v2
- linux-cachyos-lts-x86_64-v2
- linux-cachyos-lts-lto-x86_64-v2

No changes to garnix.yaml, mkCachyKernel.nix, helpers.nix, or
cachySettings.nix.
This commit is contained in:
Daaboulex 2026-05-20 10:19:46 +02:00
parent b2bbce6f05
commit b8cd102c6b

View File

@ -17,12 +17,18 @@ let
in
builtins.listToAttrs (
builtins.map (v: lib.nameValuePair v.pname v) [
# Latest kernel, provide all LTO and v3/v4/zen4 arch variants
# Latest kernel, provide all LTO and v2/v3/v4/zen4 arch variants
(mkCachyKernel {
pname = "linux-cachyos-latest";
inherit (linuxSources.latest) version src;
configVariant = "linux-cachyos";
})
(mkCachyKernel {
pname = "linux-cachyos-latest-x86_64-v2";
inherit (linuxSources.latest) version src;
configVariant = "linux-cachyos";
processorOpt = "x86_64-v2";
})
(mkCachyKernel {
pname = "linux-cachyos-latest-x86_64-v3";
inherit (linuxSources.latest) version src;
@ -47,6 +53,13 @@ builtins.listToAttrs (
configVariant = "linux-cachyos";
lto = "thin";
})
(mkCachyKernel {
pname = "linux-cachyos-latest-lto-x86_64-v2";
inherit (linuxSources.latest) version src;
configVariant = "linux-cachyos";
lto = "thin";
processorOpt = "x86_64-v2";
})
(mkCachyKernel {
pname = "linux-cachyos-latest-lto-x86_64-v3";
inherit (linuxSources.latest) version src;
@ -75,6 +88,12 @@ builtins.listToAttrs (
inherit (linuxSources.lts) version src;
configVariant = "linux-cachyos-lts";
})
(mkCachyKernel {
pname = "linux-cachyos-lts-x86_64-v2";
inherit (linuxSources.lts) version src;
configVariant = "linux-cachyos-lts";
processorOpt = "x86_64-v2";
})
(mkCachyKernel {
pname = "linux-cachyos-lts-x86_64-v3";
inherit (linuxSources.lts) version src;
@ -99,6 +118,13 @@ builtins.listToAttrs (
configVariant = "linux-cachyos-lts";
lto = "thin";
})
(mkCachyKernel {
pname = "linux-cachyos-lts-lto-x86_64-v2";
inherit (linuxSources.lts) version src;
configVariant = "linux-cachyos-lts";
lto = "thin";
processorOpt = "x86_64-v2";
})
(mkCachyKernel {
pname = "linux-cachyos-lts-lto-x86_64-v3";
inherit (linuxSources.lts) version src;