bruh

packages/linux-cachyos/kernel.nix

@@ -54,6 +54,16 @@ in
   };
 }).overrideAttrs
   (prevAttrs: {
+    # Apply patches with --forward (skip already-merged/reversed hunks) and
+    # --fuzz=3 (tolerate minor context mismatches due to kernel version skew).
+    patchPhase = ''
+      runHook prePatch
+      for p in $patches; do
+        echo "applying patch $p"
+        patch -p1 --forward --fuzz=3 < "$p" || true
+      done
+      runHook postPatch
+    '';
     postPatch = prevAttrs.postPatch + configfile.extraVerPatch;
     # bypasses https://github.com/NixOS/nixpkgs/issues/216529
     passthru =

packages/linux-cachyos/version.json

@@ -6,22 +6,22 @@
   "sources": {
     "linux": {
       "fetcher": "none",
-      "version": "6.19.5",
-      "hash": "sha256-la4FyMcJ41PA6FBsBy78VZjYW4t7Vkoeusfug0UEL/o="
+      "version": "6.19.6",
+      "hash": "sha256-TZ8/9zIU9owBlO8C25ykt7pxMlOsEEVEHU6fNSvCLhQ="
     },
     "config": {
       "fetcher": "github",
       "owner": "CachyOS",
       "repo": "linux-cachyos",
-      "rev": "4a363451cc86ff5304514c8bf25eac42eb46b8c8",
-      "hash": "sha256-jIQpfzcPBXe1URbf82p/9JxJguZuZZBlMJnW1x7B5jE="
+      "rev": "dd72b90988e22422548f65e1ec8e2b52c8c7e35f",
+      "hash": "sha256-hRDSqn5jL0cq4aYTcAS61Jsw2DEqxHkAb01Cyu7jIDc="
     },
     "patches": {
       "fetcher": "github",
       "owner": "CachyOS",
       "repo": "kernel-patches",
-      "rev": "088c9b4ef9fa9ea661c261c4ec77cabb49dd6c02",
-      "hash": "sha256-nKPjfdjWwuXqKd6miyjSu5KMxu6yJ6qx+K1P7QPVakk="
+      "rev": "d60f37176775b87d3300b333b39ae974adbda381",
+      "hash": "sha256-qsniqHnVIZdhGO6tYyugtWpOtdYofnUcpJAj6YAAvM4="
     },
     "zfs": {
       "fetcher": "git",
@@ -42,16 +42,9 @@
     "rc": {
       "sources": {
         "linux": {
-          "version": "7.0-rc2",
-          "hash": "sha256-BlKlJdEYvwDN6iWJfuOvd1gcm6lN6McJ/vmMwOmzHdc="
-        },
-        "config": {
-          "rev": "a66bf7797191c614066a517921246ced3b263434",
-          "hash": "sha256-GUEG4ZYawtSaN194CO6uPKdTR4e48+3E3dRIaX0K/8s="
-        },
-        "patches": {
-          "rev": "6184689fad8d8933f646025245295d4d50e20eb9",
-          "hash": "sha256-RBRIhHoqU+L+KDr23mNGR55if28KZ+heNp/BpCZISJ4="
+          "version": "7.0-rc3",
+          "tag": "cachyos-7.0-rc3-1",
+          "hash": "sha256-2kaZ9CQ1dshq7giQDCu4tt0+wIIXhsKRX0cev8QGdFk="
         }
       }
     },