bump(grimoire): 1.26.0

nix flake update (#24 )
Reviewed-on: nikkuss/pkgs#24 Co-authored-by: Doloro1978 <doloroo@proton.me> Co-committed-by: Doloro1978 <doloroo@proton.me>
2026-07-30 20:38:16 +01:00 · 2026-07-20 23:42:21 +04:00 · 2026-07-13 20:54:43 +04:00 · 2026-07-13 20:54:35 +04:00 · 2026-07-13 16:23:52 +04:00 · 2026-07-01 21:59:45 +04:00
10 changed files with 486 additions and 213 deletions
@@ -1,7 +1,7 @@
 {
    "ath-tools": {
        "cargoLock": null,
-        "date": "2026-04-15",
+        "date": "2026-07-16",
        "extract": null,
        "name": "ath-tools",
        "passthru": null,
@@ -11,17 +11,17 @@
            "fetchSubmodules": false,
            "leaveDotGit": false,
            "name": null,
-            "rev": "324903e86fbd30d601f404125da74b28d812be4b",
-            "sha256": "sha256-Gykx/uHPzbHPECtiCoRmo9YWxUpYc7Ky1lNBENLsRm4=",
+            "rev": "54367caab6cb4e6cd21310c64feadbacc8c9b574",
+            "sha256": "sha256-iH9RKyhGj1mIycK//8KJqbkO1ZbQaAdWgsQNd7AfWMc=",
            "sparseCheckout": [],
            "type": "git",
            "url": "https://github.com/qca/qca-swiss-army-knife.git"
        },
-        "version": "324903e86fbd30d601f404125da74b28d812be4b"
+        "version": "54367caab6cb4e6cd21310c64feadbacc8c9b574"
    },
    "base24-schemes": {
        "cargoLock": null,
-        "date": "2026-05-03",
+        "date": "2026-07-14",
        "extract": null,
        "name": "base24-schemes",
        "passthru": null,
@@ -31,13 +31,13 @@
            "fetchSubmodules": false,
            "leaveDotGit": false,
            "name": null,
-            "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795",
-            "sha256": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=",
+            "rev": "010185535336bf94d815b900cd63bb0fc204e216",
+            "sha256": "sha256-F+YMLW07YdZ4vUPt9h/gNKDU4GlXYYfSWjhY7M2RqRs=",
            "sparseCheckout": [],
            "type": "git",
            "url": "https://github.com/tinted-theming/schemes.git"
        },
-        "version": "0c94645546f4f3ddac77a1a5fce54eb95bf50795"
+        "version": "010185535336bf94d815b900cd63bb0fc204e216"
    },
    "claude-code-acp": {
        "cargoLock": null,
@@ -53,12 +53,12 @@
            "name": null,
            "owner": "zed-industries",
            "repo": "claude-code-acp",
-            "rev": "v0.35.0",
-            "sha256": "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo=",
+            "rev": "v0.60.0",
+            "sha256": "sha256-idyZcd8KD+bhAlKqqaTS6X8DcNjAzluln8it1V0vyUk=",
            "sparseCheckout": [],
            "type": "github"
        },
-        "version": "v0.35.0"
+        "version": "v0.60.0"
    },
    "claude-sync": {
        "cargoLock": null,
@@ -74,12 +74,12 @@
            "name": null,
            "owner": "tawanorg",
            "repo": "claude-sync",
-            "rev": "v1.9.0",
-            "sha256": "sha256-5waB01wmSsFUkBB/PmT9yY5b1J/aapZJCnm5O21q+Q4=",
+            "rev": "v1.14.6",
+            "sha256": "sha256-i/V6Yf6f21KBriSpHG/9BZoUWTg5gHNisxQoUbuhBY0=",
            "sparseCheckout": [],
            "type": "github"
        },
-        "version": "v1.9.0"
+        "version": "v1.14.6"
    },
    "flightcore": {
        "cargoLock": null,
@@ -116,21 +116,21 @@
            "name": null,
            "owner": "Slush97",
            "repo": "grimoire",
-            "rev": "v1.14.2",
-            "sha256": "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=",
+            "rev": "v1.26.0",
+            "sha256": "sha256-E357W9BTeODo4ckuWs4HfGTFYAk7kh/7OmvpShArIFs=",
            "sparseCheckout": [],
            "type": "github"
        },
-        "version": "v1.14.2"
+        "version": "v1.26.0"
    },
    "neovide": {
        "cargoLock": {
            "Cargo.lock": [
-                "sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock",
+                "sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=/Cargo.lock",
                {}
            ]
        },
-        "date": "2026-05-16",
+        "date": "2026-07-18",
        "extract": null,
        "name": "neovide",
        "passthru": null,
@@ -140,13 +140,13 @@
            "fetchSubmodules": false,
            "leaveDotGit": false,
            "name": null,
-            "rev": "8c48a699e201aa5559227a96d879b2f57192b354",
-            "sha256": "sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3/pU7iOBpBOC0Dvw=",
+            "rev": "9477f53a9c5821bec8eb4488dee89842f96f5bd3",
+            "sha256": "sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=",
            "sparseCheckout": [],
            "type": "git",
            "url": "https://github.com/neovide/neovide.git"
        },
-        "version": "8c48a699e201aa5559227a96d879b2f57192b354"
+        "version": "9477f53a9c5821bec8eb4488dee89842f96f5bd3"
    },
    "qebspil": {
        "cargoLock": null,
@@ -182,12 +182,12 @@
            "name": null,
            "owner": "radareorg",
            "repo": "r2ghidra",
-            "rev": "6.1.4",
-            "sha256": "sha256-uVMsONXethTq/BL9MBQkDP3iJ6t25PEnpeD/Y17dpxM=",
+            "rev": "6.1.8",
+            "sha256": "sha256-f5iohbAUYG524KJqSvL3PQCFnLQc055Ta02G3CRSO9I=",
            "sparseCheckout": [],
            "type": "github"
        },
-        "version": "6.1.4"
+        "version": "6.1.8"
    },
    "radare2-mcp": {
        "cargoLock": null,
@@ -203,12 +203,12 @@
            "name": null,
            "owner": "radareorg",
            "repo": "radare2-mcp",
-            "rev": "1.8.0",
-            "sha256": "sha256-1tV3mG1hEIcq18cHn5kS4n9ocVZsHQ5A4TCTA3OKzn8=",
+            "rev": "1.8.4",
+            "sha256": "sha256-EbkEbTATKxBOKWVqKkHp6h/hg4VUW0TsgGxN9TRI+pc=",
            "sparseCheckout": [],
            "type": "github"
        },
-        "version": "1.8.0"
+        "version": "1.8.4"
    },
    "slbounce": {
        "cargoLock": null,
@@ -234,7 +234,7 @@
    "vpkmerge": {
        "cargoLock": {
            "Cargo.lock": [
-                "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock",
+                "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=/Cargo.lock",
                {}
            ]
        },
@@ -250,11 +250,11 @@
            "name": null,
            "owner": "Slush97",
            "repo": "vpkmerge",
-            "rev": "v0.7.0",
-            "sha256": "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f/H8=",
+            "rev": "v0.19.0",
+            "sha256": "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=",
            "sparseCheckout": [],
            "type": "github"
        },
-        "version": "v0.7.0"
+        "version": "v0.19.0"
    }
 }
@@ -8,52 +8,52 @@
 {
  ath-tools = {
    pname = "ath-tools";
-    version = "324903e86fbd30d601f404125da74b28d812be4b";
+    version = "54367caab6cb4e6cd21310c64feadbacc8c9b574";
    src = fetchgit {
      url = "https://github.com/qca/qca-swiss-army-knife.git";
-      rev = "324903e86fbd30d601f404125da74b28d812be4b";
+      rev = "54367caab6cb4e6cd21310c64feadbacc8c9b574";
      fetchSubmodules = false;
      deepClone = false;
      leaveDotGit = false;
      sparseCheckout = [ ];
-      sha256 = "sha256-Gykx/uHPzbHPECtiCoRmo9YWxUpYc7Ky1lNBENLsRm4=";
+      sha256 = "sha256-iH9RKyhGj1mIycK//8KJqbkO1ZbQaAdWgsQNd7AfWMc=";
    };
-    date = "2026-04-15";
+    date = "2026-07-16";
  };
  base24-schemes = {
    pname = "base24-schemes";
-    version = "0c94645546f4f3ddac77a1a5fce54eb95bf50795";
+    version = "010185535336bf94d815b900cd63bb0fc204e216";
    src = fetchgit {
      url = "https://github.com/tinted-theming/schemes.git";
-      rev = "0c94645546f4f3ddac77a1a5fce54eb95bf50795";
+      rev = "010185535336bf94d815b900cd63bb0fc204e216";
      fetchSubmodules = false;
      deepClone = false;
      leaveDotGit = false;
      sparseCheckout = [ ];
-      sha256 = "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=";
+      sha256 = "sha256-F+YMLW07YdZ4vUPt9h/gNKDU4GlXYYfSWjhY7M2RqRs=";
    };
-    date = "2026-05-03";
+    date = "2026-07-14";
  };
  claude-code-acp = {
    pname = "claude-code-acp";
-    version = "v0.35.0";
+    version = "v0.60.0";
    src = fetchFromGitHub {
      owner = "zed-industries";
      repo = "claude-code-acp";
-      rev = "v0.35.0";
+      rev = "v0.60.0";
      fetchSubmodules = false;
-      sha256 = "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo=";
+      sha256 = "sha256-idyZcd8KD+bhAlKqqaTS6X8DcNjAzluln8it1V0vyUk=";
    };
  };
  claude-sync = {
    pname = "claude-sync";
-    version = "v1.9.0";
+    version = "v1.14.6";
    src = fetchFromGitHub {
      owner = "tawanorg";
      repo = "claude-sync";
-      rev = "v1.9.0";
+      rev = "v1.14.6";
      fetchSubmodules = false;
-      sha256 = "sha256-5waB01wmSsFUkBB/PmT9yY5b1J/aapZJCnm5O21q+Q4=";
+      sha256 = "sha256-i/V6Yf6f21KBriSpHG/9BZoUWTg5gHNisxQoUbuhBY0=";
    };
  };
  flightcore = {
@@ -69,34 +69,34 @@
  };
  grimoire = {
    pname = "grimoire";
-    version = "v1.14.2";
+    version = "v1.26.0";
    src = fetchFromGitHub {
      owner = "Slush97";
      repo = "grimoire";
-      rev = "v1.14.2";
+      rev = "v1.26.0";
      fetchSubmodules = false;
-      sha256 = "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=";
+      sha256 = "sha256-E357W9BTeODo4ckuWs4HfGTFYAk7kh/7OmvpShArIFs=";
    };
  };
  neovide = {
    pname = "neovide";
-    version = "8c48a699e201aa5559227a96d879b2f57192b354";
+    version = "9477f53a9c5821bec8eb4488dee89842f96f5bd3";
    src = fetchgit {
      url = "https://github.com/neovide/neovide.git";
-      rev = "8c48a699e201aa5559227a96d879b2f57192b354";
+      rev = "9477f53a9c5821bec8eb4488dee89842f96f5bd3";
      fetchSubmodules = false;
      deepClone = false;
      leaveDotGit = false;
      sparseCheckout = [ ];
-      sha256 = "sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3/pU7iOBpBOC0Dvw=";
+      sha256 = "sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=";
    };
    cargoLock."Cargo.lock" = {
-      lockFile = ./. + "/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock";
+      lockFile = ./. + "/sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=/Cargo.lock";
      outputHashes = {
        
      };
    };
-    date = "2026-05-16";
+    date = "2026-07-18";
  };
  qebspil = {
    pname = "qebspil";
@@ -114,24 +114,24 @@
  };
  radare2-ghidra = {
    pname = "radare2-ghidra";
-    version = "6.1.4";
+    version = "6.1.8";
    src = fetchFromGitHub {
      owner = "radareorg";
      repo = "r2ghidra";
-      rev = "6.1.4";
+      rev = "6.1.8";
      fetchSubmodules = false;
-      sha256 = "sha256-uVMsONXethTq/BL9MBQkDP3iJ6t25PEnpeD/Y17dpxM=";
+      sha256 = "sha256-f5iohbAUYG524KJqSvL3PQCFnLQc055Ta02G3CRSO9I=";
    };
  };
  radare2-mcp = {
    pname = "radare2-mcp";
-    version = "1.8.0";
+    version = "1.8.4";
    src = fetchFromGitHub {
      owner = "radareorg";
      repo = "radare2-mcp";
-      rev = "1.8.0";
+      rev = "1.8.4";
      fetchSubmodules = false;
-      sha256 = "sha256-1tV3mG1hEIcq18cHn5kS4n9ocVZsHQ5A4TCTA3OKzn8=";
+      sha256 = "sha256-EbkEbTATKxBOKWVqKkHp6h/hg4VUW0TsgGxN9TRI+pc=";
    };
  };
  slbounce = {
@@ -147,16 +147,16 @@
  };
  vpkmerge = {
    pname = "vpkmerge";
-    version = "v0.7.0";
+    version = "v0.19.0";
    src = fetchFromGitHub {
      owner = "Slush97";
      repo = "vpkmerge";
-      rev = "v0.7.0";
+      rev = "v0.19.0";
      fetchSubmodules = false;
-      sha256 = "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f/H8=";
+      sha256 = "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=";
    };
    cargoLock."Cargo.lock" = {
-      lockFile = ./. + "/sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock";
+      lockFile = ./. + "/sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=/Cargo.lock";
      outputHashes = {
        
      };
@@ -2849,9 +2849,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"

 [[package]]
 name = "skia-bindings"
-version = "0.97.0"
+version = "0.97.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6e3bcf8f25bf047e83110838463e8d06696c12fccc3d3794adf448b4d81f34b"
+checksum = "e6a38f4d460276ea40588c958396a9de0eec808c679009a5b52afdf6ebf34132"
 dependencies = [
 "bindgen",
 "cc",
@@ -2866,9 +2866,9 @@ dependencies = [

 [[package]]
 name = "skia-safe"
-version = "0.97.0"
+version = "0.97.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "935d4d174fb749bac9265eb41cad75039d32fda2d9c1a1e81b430df0e210a409"
+checksum = "1ecfc54fcd40dc5dea15dd2a84f8422cdb0f76c6a51ebb8835ce0b7ef590a21f"
 dependencies = [
 "bitflags 2.10.0",
 "skia-bindings",
@@ -3070,7 +3070,7 @@ dependencies = [
 "getrandom 0.3.4",
 "once_cell",
 "rustix 1.1.2",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
@@ -3689,7 +3689,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
@@ -8,6 +8,23 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"

+[[package]]
+name = "adler32"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
+
+[[package]]
+name = "ahash"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+dependencies = [
+ "getrandom 0.2.17",
+ "once_cell",
+ "version_check",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.4"
@@ -536,6 +553,25 @@ dependencies = [
 "crossbeam-utils",
 ]

+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
@@ -816,6 +852,12 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"

+[[package]]
+name = "either"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
+
 [[package]]
 name = "embed-resource"
 version = "3.0.9"
@@ -869,6 +911,32 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"

+[[package]]
+name = "fbxcel"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f9e966e38cb462819635792e0a9ee1d6cc5fff9bcdbf7baefb350221a7ae3df"
+dependencies = [
+ "indextree",
+ "libflate",
+ "log",
+ "string-interner",
+]
+
+[[package]]
+name = "fbxcel-dom"
+version = "0.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84d1dcac5735ee4aa4b56758ae8446c55ee6f00b2041e31f5303c338b8e0ec6a"
+dependencies = [
+ "anyhow",
+ "fbxcel",
+ "log",
+ "mint",
+ "rgb",
+ "string-interner",
+]
+
 [[package]]
 name = "fdeflate"
 version = "0.3.7"
@@ -1373,6 +1441,15 @@ dependencies = [
 "zerocopy",
 ]

+[[package]]
+name = "hashbrown"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+dependencies = [
+ "ahash",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -1697,6 +1774,30 @@ dependencies = [
 "serde_core",
 ]

+[[package]]
+name = "indextree"
+version = "4.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cee462cd93b03891663339b59a21246cc5fc2cc95060d0bb5059e25cd50edc4"
+dependencies = [
+ "indextree-macros",
+]
+
+[[package]]
+name = "indextree-macros"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f85dac6c239acc85fd61934c572292d93adfd2de459d9c032aa22b553506e915"
+dependencies = [
+ "either",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "strum",
+ "syn 2.0.117",
+ "thiserror 2.0.18",
+]
+
 [[package]]
 name = "infer"
 version = "0.19.0"
@@ -1743,6 +1844,15 @@ dependencies = [
 "num_cpus",
 ]

+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.18"
@@ -1912,6 +2022,26 @@ dependencies = [
 "pkg-config",
 ]

+[[package]]
+name = "libflate"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18"
+dependencies = [
+ "adler32",
+ "crc32fast",
+ "libflate_lz77",
+]
+
+[[package]]
+name = "libflate_lz77"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf"
+dependencies = [
+ "rle-decode-fast",
+]
+
 [[package]]
 name = "libloading"
 version = "0.7.4"
@@ -2012,6 +2142,12 @@ dependencies = [
 "simd-adler32",
 ]

+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+
 [[package]]
 name = "mio"
 version = "1.2.0"
@@ -2025,7 +2161,7 @@ dependencies = [

 [[package]]
 name = "morphic"
-version = "0.3.0"
+version = "0.10.0"
 dependencies = [
 "bcdec_rs",
 "bitflags 2.11.1",
@@ -2037,6 +2173,7 @@ dependencies = [
 "image",
 "intel_tex_2",
 "lz4_flex",
+ "rayon",
 "ruzstd",
 "serde",
 "serde_json",
@@ -2661,6 +2798,26 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"

+[[package]]
+name = "rayon"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.18"
@@ -2788,6 +2945,21 @@ dependencies = [
 "windows-sys 0.60.2",
 ]

+[[package]]
+name = "rgb"
+version = "0.8.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b34b781b31e5d73e9fbc8689c70551fd1ade9a19e3e28cfec8580a79290cc4"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "rle-decode-fast"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
+
 [[package]]
 name = "rustc-hash"
 version = "2.1.2"
@@ -3190,6 +3362,16 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"

+[[package]]
+name = "string-interner"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e2531d8525b29b514d25e275a43581320d587b86db302b9a7e464bac579648"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.11.2",
+]
+
 [[package]]
 name = "string_cache"
 version = "0.9.0"
@@ -3220,6 +3402,27 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"

+[[package]]
+name = "strum"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "swift-rs"
 version = "1.0.7"
@@ -4136,21 +4339,28 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"

 [[package]]
 name = "vpkmerge-cli"
-version = "0.7.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "clap",
 "serde",
 "serde_json",
+ "tempfile",
 "vpkmerge-core",
 ]

 [[package]]
 name = "vpkmerge-core"
-version = "0.7.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
+ "fbxcel",
+ "fbxcel-dom",
+ "gltf",
+ "image",
 "morphic",
+ "quick-xml",
+ "serde",
 "serde_json",
 "tempfile",
 "valve_pak",
@@ -4158,7 +4368,7 @@ dependencies = [

 [[package]]
 name = "vpkmerge-gui"
-version = "0.6.0"
+version = "0.17.1"
 dependencies = [
 "base64 0.22.1",
 "half",
@@ -4169,6 +4379,7 @@ dependencies = [
 "tauri",
 "tauri-build",
 "tauri-plugin-dialog",
+ "tempfile",
 "valve_pak",
 "vpkmerge-core",
 ]
@@ -20,11 +20,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1780011192,
-        "narHash": "sha256-luHrZG6I7Mwdt413XoDOYBpp9z1z6X23/5SNktwjM+k=",
+        "lastModified": 1784463523,
+        "narHash": "sha256-DIM0Ma2i514MRl+NJY2/LGzG8i6hs4zORZw9E+0VwBc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "3242faf14b7611a62ce0f0071619438a08b65c12",
+        "rev": "3d79c8d63e761c59323e90a27b50eb52b5482bfe",
        "type": "github"
      },
      "original": {
@@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
  version = lib.removePrefix "v" sources.claude-sync.version;
  inherit (sources.claude-sync) src;

-  vendorHash = "sha256-cHWP5m191QP4XxeOtgHaLsyavXWikUwViDivBMGP34M=";
+  vendorHash = "sha256-VLqVk5bhM+WoEbP+agFpm1LjzI2qFWlWQZB8yV2vbOU=";

  subPackages = [ "cmd/claude-sync" ];

@@ -0,0 +1,148 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nodejs_22,
+  pnpm,
+  python3,
+  gcc,
+  gnumake,
+  pkg-config,
+  makeWrapper,
+  electron_41,
+  vpkmerge,
+  sqlite,
+  callPackage,
+  makeDesktopItem,
+  copyDesktopItems,
+}:
+let
+  sources = callPackage ../../../../_sources/generated.nix { };
+
+  src = sources.grimoire.src;
+  version = src.rev;
+
+  # This would go into nvfetcher but it isnt versioned..
+  grimoire-social-src = fetchFromGitHub {
+    owner = "Slush97";
+    repo = "grimoire-social";
+    rev = "main";
+    hash = "sha256-f+wUZOR7dqigxd/IZtay1BrLS5rcSnaDage3NXxqsPE=";
+  };
+
+  pnpmDeps = pnpm.fetchDeps {
+    pname = "grimoire";
+    inherit version src;
+    fetcherVersion = 4;
+    hash = "sha256-Mqvvemc3oDCiuY/UnDOc73P+dLqMEFnwQotodVhrPao=";
+    # hash = lib.fakeHash;
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "grimoire";
+    exec = "grimoire %u";
+    desktopName = "Grimoire";
+    categories = [ "Utility" ];
+    mimeTypes = [ "x-scheme-handler/grimoire" ];
+  };
+in
+stdenv.mkDerivation {
+  pname = "grimoire";
+  inherit version src;
+
+  nativeBuildInputs = [
+    nodejs_22
+    pnpm
+    pnpm.configHook
+    python3
+    gcc
+    gnumake
+    pkg-config
+    makeWrapper
+    electron_41
+    copyDesktopItems
+  ];
+
+  desktopItems = [ desktopItem ];
+
+  buildInputs = [
+    sqlite
+  ];
+
+  inherit pnpmDeps;
+
+  env = {
+    GRIMOIRE_SOCIAL_BASE_URL = "https://grimoire-social.slusheliott.workers.dev";
+    # electron-builder must not try to fetch an Electron binary over the
+    # network; we hand it the Nix one via --config.electronDist below.
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+  };
+
+  postPatch = ''
+    cp -r ${grimoire-social-src} ../grimoire-social
+    chmod -R u+w ../grimoire-social
+
+    mkdir -p resources/vpkmerge
+    cp ${vpkmerge}/bin/vpkmerge resources/vpkmerge/vpkmerge-linux-x86_64
+    chmod +x resources/vpkmerge/vpkmerge-linux-x86_64
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    mkdir -p ../grimoire-social/node_modules
+    ln -sfn "$(realpath node_modules/zod)" ../grimoire-social/node_modules/zod
+
+    # Rebuild the better-sqlite3 native addon against the Electron ABI. We do
+    # this ourselves (and disable electron-builder's own rebuild below) so no
+    # network fetch of Electron headers is needed inside the sandbox.
+    (
+      cd node_modules/better-sqlite3
+      patch -p1 < ${./patches/better-sqlite3-thistogetthis.patch}
+      HOME="$TMPDIR" node \
+        "${nodejs_22}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" \
+        rebuild \
+        --nodedir="${electron_41.headers}"
+    )
+
+    # Package the app the same way upstream CI does (release.yml):
+    # `electron-vite build && electron-builder`. We stop at the unpacked
+    # `--dir` output instead of building AppImage/deb installers, then wrap
+    # the Nix Electron around the produced app.asar. Building through
+    # electron-builder (rather than launching Electron on the raw dist/)
+    # makes `app.isPackaged` true, which is what disables the dev-only
+    # DevTools auto-open and the dev vpkmerge lookup path.
+    export HOME="$TMPDIR"
+    pnpm exec electron-vite build
+    pnpm exec electron-builder --linux dir \
+      --config.npmRebuild=false \
+      --config.electronDist=${electron_41.dist} \
+      --config.electronVersion=${electron_41.version}
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/grimoire
+    # electron-builder emits the packaged app (app.asar, app.asar.unpacked,
+    # and extraResources such as vpkmerge) under release/linux-unpacked/resources.
+    cp -r release/linux-unpacked/resources $out/lib/grimoire/resources
+
+    # Launch the Nix Electron against the packaged asar. process.resourcesPath
+    # resolves to the directory holding app.asar, so the bundled vpkmerge at
+    # resources/vpkmerge/ is found at runtime.
+    mkdir -p $out/bin
+    makeWrapper ${electron_41}/bin/electron $out/bin/grimoire \
+      --add-flags "$out/lib/grimoire/resources/app.asar" \
+      --set NODE_ENV production
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Grimoire — Electron-based mod manager";
+    platforms = [ "x86_64-linux" ];
+  };
+}
@@ -0,0 +1,47 @@
+--- a/src/util/macros.cpp	2026-07-20 13:25:03.226579751 +0100
+++ b/src/util/macros.cpp	2026-07-20 13:25:43.980692531 +0100
+@@ -11,6 +11,19 @@
+ #define GET_PROTOTYPE(obj) ((obj)->GetPrototype())
+ #endif
+ 
+// PropertyCallbackInfo::This() and Holder() were removed; use HolderV2().
+// Tracking bug for V8 API removals: http://crbug.com/333672197
+// V8 head has since restored Holder() and deprecated HolderV2():
+//   https://chromium.googlesource.com/v8/v8/+/main/include/v8-function-callback.h
+//   V8_INLINE Local<Object> Holder() const;
+//   V8_DEPRECATE_SOON("Use Holder().")
+//   V8_INLINE Local<Object> HolderV2() const;
+#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >= 13
+#define PROPERTY_HOLDER(info) (info).HolderV2()
+#else
+#define PROPERTY_HOLDER(info) (info).This()
+#endif
+
+ #define EasyIsolate v8::Isolate* isolate = v8::Isolate::GetCurrent()
+ #define OnlyIsolate info.GetIsolate()
+ #define OnlyContext isolate->GetCurrentContext()
+--- a/src/objects/database.cpp	2026-07-20 13:25:03.229579774 +0100
+++ b/src/objects/database.cpp	2026-07-20 13:25:52.605028002 +0100
+@@ -408,10 +408,10 @@
+ }
+ 
+ NODE_GETTER(Database::JS_open) {
+-	info.GetReturnValue().Set(Unwrap<Database>(info.This())->open);
+	info.GetReturnValue().Set(Unwrap<Database>(PROPERTY_HOLDER(info))->open);
+ }
+ 
+ NODE_GETTER(Database::JS_inTransaction) {
+-	Database* db = Unwrap<Database>(info.This());
+	Database* db = Unwrap<Database>(PROPERTY_HOLDER(info));
+ 	info.GetReturnValue().Set(db->open && !static_cast<bool>(sqlite3_get_autocommit(db->db_handle)));
+ }
+--- a/src/objects/statement.cpp	2026-07-20 13:25:03.231579789 +0100
+++ b/src/objects/statement.cpp	2026-07-20 13:25:52.606984847 +0100
+@@ -378,6 +378,6 @@
+ }
+ 
+ NODE_GETTER(Statement::JS_busy) {
+-	Statement* stmt = Unwrap<Statement>(info.This());
+	Statement* stmt = Unwrap<Statement>(PROPERTY_HOLDER(info));
+ 	info.GetReturnValue().Set(stmt->alive && stmt->locked);
+ }
@@ -1,133 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchurl,
-  nodejs_22,
-  pnpm,
-  python3,
-  gcc,
-  gnumake,
-  pkg-config,
-  makeWrapper,
-  electron_40,
-  vpkmerge,
-  sqlite,
-  callPackage,
-  makeDesktopItem,
-}: let
-  sources = callPackage ../../../../_sources/generated.nix {};
-
-  src = sources.grimoire.src;
-  version = src.rev;
-
-  # This would go into nvfetcher but it isnt versioned..
-  grimoire-social-src = fetchFromGitHub {
-    owner = "Slush97";
-    repo = "grimoire-social";
-    rev = "main";
-    hash = "sha256-f+wUZOR7dqigxd/IZtay1BrLS5rcSnaDage3NXxqsPE=";
-  };
-
-  pnpmDeps = pnpm.fetchDeps {
-    pname = "grimoire";
-    inherit version src;
-    fetcherVersion = 3;
-    hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
-  };
-
-  desktopItem = makeDesktopItem {
-    name = "grimoire";
-    exec = "$out/bin/grimoire %u";
-    desktopName = "Grimoire";
-    categories = ["Utility"];
-    MimeType = "x-scheme-handler/grimoire";
-  };
-in
-  stdenv.mkDerivation {
-    pname = "grimoire";
-    inherit version src;
-
-    nativeBuildInputs = [
-      nodejs_22
-      pnpm
-      pnpm.configHook
-      python3
-      gcc
-      gnumake
-      pkg-config
-      makeWrapper
-      electron_40
-    ];
-
-    buildInputs = [
-      sqlite
-    ];
-
-    inherit pnpmDeps;
-
-    env.GRIMOIRE_SOCIAL_BASE_URL = "https://grimoire-social.slusheliott.workers.dev";
-
-    postPatch = ''
-      cp -r ${grimoire-social-src} ../grimoire-social
-      chmod -R u+w ../grimoire-social
-
-      mkdir -p resources/vpkmerge
-      cp ${vpkmerge}/bin/vpkmerge resources/vpkmerge/vpkmerge-linux-x86_64
-      chmod +x resources/vpkmerge/vpkmerge-linux-x86_64
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-
-      mkdir -p ../grimoire-social/node_modules
-      ln -sfn "$(realpath node_modules/zod)" ../grimoire-social/node_modules/zod
-
-      (
-        cd node_modules/better-sqlite3
-        HOME="$TMPDIR" node \
-          "${nodejs_22}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" \
-          rebuild \
-          --nodedir="${electron_40.headers}"
-      )
-
-      pnpm exec electron-vite build
-
-      runHook postBuild
-    '';
-
-    installPhase = ''
-            runHook preInstall
-
-            mkdir -p $out/lib/grimoire
-            cp -r dist $out/lib/grimoire/dist
-
-            mkdir -p $out/lib/grimoire/resources
-            cp -r resources/vpkmerge $out/lib/grimoire/resources/vpkmerge
-            echo '{"name":"grimoire","version":"${version}","main":"dist/main/index.js"}' \
-              > $out/lib/grimoire/package.json
-
-            cp -r node_modules $out/lib/grimoire/node_modules
-
-            rm -rf "$out/lib/grimoire/node_modules/@grimoire"
-
-            find "$out/lib/grimoire/node_modules" -type l | while read -r link; do
-              [ -e "$link" ] || rm -f "$link"
-            done
-
-            mkdir -p $out/bin
-            makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \
-              --add-flags "$out/lib/grimoire" \
-              --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
-              --set NODE_ENV production
-
-      cp ${desktopItem}/share/applications/grimoire.desktop $out/share/applications/grimoire.desktop
-
-            runHook postInstall
-    '';
-
-    meta = {
-      description = "Grimoire — Electron-based mod manager";
-      platforms = ["x86_64-linux"];
-    };
-  }
@@ -27,11 +27,11 @@ stdenv.mkDerivation (

  rec {
    name = "x1e80100-firmware";
-    version = "26100_26.033.32430.0";
+    version = "26100_26.053.36539.0";
    src = fetchurl {
      # https://www.microsoft.com/en-us/download/details.aspx?id=106120
      url = "https://download.microsoft.com/download/b7ca2c3f-d320-4795-be0f-529a0117abb4/SurfaceLaptop7_ARM_Win11_${version}.msi";
-      hash = "sha256-KyHgMGk/oytVctE5AhdXer+x7mJk2uP8Vgc7v78wSRc=";
+      hash = "sha256-ZrbhrOfl8BvFks1MmueKowu7DgSrV0kc0D7CqqbhIps=";
    };
    nativeBuildInputs = [
      msitools
Author	SHA1	Message	Date
doloro	3d5b59e4c5	bump(grimoire): 1.26.0	2026-07-30 20:38:16 +01:00
doloro	10568239ce	nix flake update (#24 ) Reviewed-on: nikkuss/pkgs#24 Co-authored-by: Doloro1978 <doloroo@proton.me> Co-committed-by: Doloro1978 <doloroo@proton.me>	2026-07-20 23:42:21 +04:00
doloro	756a4a0507	Grimoire package fix (#23 ) ![image.png](/attachments/48e0de47-db8e-4c17-b657-e5d0972a75a6) Reviewed-on: nikkuss/pkgs#23 Co-authored-by: Doloro1978 <doloroo@proton.me> Co-committed-by: Doloro1978 <doloroo@proton.me>	2026-07-13 20:54:43 +04:00
doloro	7c5eef01d2	bump(vpkmerge): 0.9.0 (#21 ) ![image.png](/attachments/c7961590-8d7e-4dbe-9348-0ecf06407287) Reviewed-on: nikkuss/pkgs#21 Co-authored-by: Doloro1978 <doloroo@proton.me> Co-committed-by: Doloro1978 <doloroo@proton.me>	2026-07-13 20:54:35 +04:00
doloro	d1c6469384	bump(grimoire): 1.23.0 (#20 ) ![image.png](/attachments/ad8e7979-c93b-4def-8346-832f3832d3ae) Reviewed-on: nikkuss/pkgs#20 Co-authored-by: Doloro1978 <doloroo@proton.me> Co-committed-by: Doloro1978 <doloroo@proton.me>	2026-07-13 16:23:52 +04:00
nikkuss	6331a7c8ec	bump firmware	2026-07-01 21:59:45 +04:00
doloro	5ae28029ef	feat(grimoire): desktop file (#19 ) Reviewed-on: nikkuss/pkgs#19 Co-authored-by: Doloro1978 <doloroo@proton.me> Co-committed-by: Doloro1978 <doloroo@proton.me>	2026-06-05 12:46:04 +04:00