cachy kernel naming

packages/linux-cachyos/default.nix

@@ -23,6 +23,7 @@ let
 
   ltoKernelAttrs = {
     taste = "linux-cachyos";
+    pname = "cachyos-lto";
     configPath = ./config-nix/cachyos-lto.x86_64-linux.nix;
 
     # Pass the unified arguments (including the resolved 'self') to llvm-pkgs
@@ -63,6 +64,7 @@ let
 
   serverLtoKernelAttrs = {
     taste = "linux-cachyos-server";
+    pname = "cachyos-server-lto";
     configPath = ./config-nix/cachyos-server-lto.x86_64-linux.nix;
     basicCachy = false;
     cpuSched = "eevdf";
@@ -143,6 +145,7 @@ let
 
   gccKernel = mkCachyKernel {
     taste = "linux-cachyos";
+    pname = "cachyos-gcc";
     configPath = ./config-nix/cachyos-gcc.x86_64-linux.nix;
     # since all flavors use the same versions.json, we just need the updateScript in one of them
     withUpdateScript = "stable";
@@ -160,6 +163,7 @@ in
 
   cachyos-lts = mkCachyKernel {
     taste = "linux-cachyos-lts";
+    pname = "cachyos-lts";
     configPath = ./config-nix/cachyos-lts.x86_64-linux.nix;
 
     versions = ltsVersions;
@@ -173,6 +177,7 @@ in
 
   cachyos-rc = mkCachyKernel {
     taste = "linux-cachyos-rc";
+    pname = "cachyos-rc";
     configPath = ./config-nix/cachyos-rc.x86_64-linux.nix;
 
     versions = rcVersions;
@@ -188,6 +193,7 @@ in
   cachyos-lto-znver4 = mkCachyKernel (
     ltoKernelAttrs
     // {
+    pname = "cachyos-lto-znver4";
       configPath = ./config-nix/cachyos-znver4.x86_64-linux.nix;
     }
   );
@@ -196,6 +202,7 @@ in
 
   cachyos-server = mkCachyKernel {
     taste = "linux-cachyos-server";
+    pname = "cachyos-server";
     configPath = ./config-nix/cachyos-server.x86_64-linux.nix;
     basicCachy = false;
     cpuSched = "eevdf";
@@ -215,11 +222,13 @@ in
     serverLtoKernelAttrs
     // {
       configPath = ./config-nix/cachyos-znver4.x86_64-linux.nix;
+      pname = "cachyos-server-lto-znver4";
     }
   );
 
   cachyos-hardened = mkCachyKernel {
     taste = "linux-cachyos-hardened";
+    pname = "cachyos-hardened";
     configPath = ./config-nix/cachyos-hardened.x86_64-linux.nix;
     cpuSched = "hardened";
 

packages/linux-cachyos/kernel.nix

@@ -11,6 +11,7 @@
   kernelPatches ? [ ],
   features ? null,
   randstructSeed ? "",
+  pname ? "unknown",
   # For tests
   kernelPackages,
   flakes,
@@ -25,6 +26,7 @@ let
 in
 (linuxManualConfig {
   inherit
+    pname
     stdenv
     version
     features

packages/linux-cachyos/packages-for.nix

@@ -32,6 +32,7 @@
   description ? "Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements",
   # For flakes
   inputs ? { },
+  pname ? "unknown",
   # Explicitly accept nixpkgs, falling back to inputs or the system path
   nixpkgs ? inputs.nixpkgs or pkgs.path,
 }:
@@ -104,8 +105,32 @@ let
   };
   linuxConfigTransfomed = import configPath;
 
+  # normalizeKernelName = pname: drv:
+  #   drv.overrideAttrs (old: let
+  #     ver = old.version or (lib.getVersion old.name or "unknown");
+  #   in {
+  #     __intentionallyOverridingVersion = true;
+  #     pname = (if useLTO != "none" then "${pname}-lto" else pname);
+  #     version = ver;
+  #     name = "${pname}-${ver}";
+  #   });
+
+  # versionSuffix = "+C${shorter versions.config.rev}+P${shorter versions.patches.rev}";
+
+  # kernel =
+  #   normalizeKernelName (cachyConfig.taste or "linux")
+  #     (callPackage ./kernel.nix {
+  #       inherit cachyConfig stdenv kconfigToNix;
+  #       kernelPatches = [ ];
+  #       configfile = preparedConfigfile;
+  #       config = linuxConfigTransfomed;
+  #       flakes = inputs.flakes or null;
+  #       final = inputs.final or null;
+  #       kernelPackages = packagesWithRightPlatforms;
+  #     });
+
   kernel = callPackage ./kernel.nix {
-    inherit cachyConfig stdenv kconfigToNix;
+    inherit cachyConfig pname stdenv kconfigToNix;
     kernelPatches = [ ];
     configfile = preparedConfigfile;
     config = linuxConfigTransfomed;