Update to Linux 6.12.12

drakon64 · Feb 7, 2025 · fd2e5c6 · fd2e5c6
1 parent 9ee0ce6
commit fd2e5c6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/cachyos.yml b/.github/workflows/cachyos.yml
@@ -23,7 +23,8 @@ jobs:
           - nixos-unstable
 
     name: Build - ${{ matrix.channel }}
-    runs-on: [linux, x64, ktisis, ktisis-c3d-highcpu-4, ktisis-50GB]
+#    runs-on: [linux, x64, ktisis, ktisis-c3d-highcpu-4, ktisis-50GB]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 

diff --git a/cachyos/package.nix b/cachyos/package.nix
@@ -16,9 +16,7 @@ buildLinux {
   structuredExtraConfig = with lib.kernel; {
     # 0001-cachyos-base-all.patch
     AMD_3D_VCACHE = yes;
-    ARCH_SUPPORTS_AUTOFDO_CLANG = yes;
     AUTOFDO_CLANG = unset;
-    ARCH_SUPPORTS_PROPELLER_CLANG = yes;
     PROPELLER_CLANG = unset;
     AMD_PRIVATE_COLOR = yes;
     V4L2_LOOPBACK = module;

diff --git a/cachyos/sources.nix b/cachyos/sources.nix
@@ -4,14 +4,13 @@
   fetchpatch,
 }:
 let
-  linuxVersion = "6.12.10";
+  linuxVersion = "6.12.12";
   linuxMinorVersion = lib.versions.majorMinor linuxVersion;
-  linuxHash = "sha256-3YIRaCn/cMkp9h2GXZgsZHHh6F59LfendPqnwawpQ4E=";
+  linuxHash = "sha256-UJb5asZFIhnp8YbTM9tok5g3KIFU2mlLKzg6pIap5Es=";
 
-  cachyosCommit = "f5bbf91fc68f0afb0e5a9d9ccfa15dc9d8015f75";
+  cachyosCommit = "3216bcc085f66090b5a9c891e16b8516c6760856";
 
-  cachyosHash = "sha256-5mliK00yNMT0D3lO6v84EEsJDVlxWXgtXbj5XSBkPd0=";
-  dkmsClangHash = "sha256-2QhyC7DGOw9SmPsxvFweHeeeXKh/Gr0heLgs36lmwmM=";
+  cachyosHash = "sha256-ziozxudbN53sFg0JaNfft7ukha1k6bnieq1Zl9qDLII=";
   boreHash = "sha256-f9zyXVYJvuOVOzohUPIrzqXCVMyFoOE9UubBxrZfXP8=";
 in
 {