From 10568239ced64ba5d249f4c85f1c9f7dda81d137 Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Mon, 20 Jul 2026 23:42:21 +0400 Subject: [PATCH] nix flake update (#24) Reviewed-on: https://git.scug.io/nikkuss/pkgs/pulls/24 Co-authored-by: Doloro1978 Co-committed-by: Doloro1978 --- _sources/generated.json | 50 ++--- _sources/generated.nix | 50 ++--- .../Cargo.lock | 12 +- flake.lock | 6 +- pkgs/by-name/cl/claude-sync/package.nix | 2 +- pkgs/by-name/gr/grimoire/package.nix | 181 +++++++++--------- .../better-sqlite3-thistogetthis.patch | 47 +++++ 7 files changed, 199 insertions(+), 149 deletions(-) rename _sources/{sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw= => sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=}/Cargo.lock (99%) create mode 100644 pkgs/by-name/gr/grimoire/patches/better-sqlite3-thistogetthis.patch diff --git a/_sources/generated.json b/_sources/generated.json index 385cad0..f006584 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -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, @@ -126,11 +126,11 @@ "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, diff --git a/_sources/generated.nix b/_sources/generated.nix index 3b4bbd8..65e44c0 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -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 = { @@ -80,23 +80,23 @@ }; 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 = { diff --git a/_sources/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock b/_sources/sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=/Cargo.lock similarity index 99% rename from _sources/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock rename to _sources/sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=/Cargo.lock index 666006b..8bf2e5d 100644 --- a/_sources/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock +++ b/_sources/sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=/Cargo.lock @@ -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]] diff --git a/flake.lock b/flake.lock index 32302cb..7a2a6b8 100644 --- a/flake.lock +++ b/flake.lock @@ -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": { diff --git a/pkgs/by-name/cl/claude-sync/package.nix b/pkgs/by-name/cl/claude-sync/package.nix index 72c1e5f..b11929d 100644 --- a/pkgs/by-name/cl/claude-sync/package.nix +++ b/pkgs/by-name/cl/claude-sync/package.nix @@ -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" ]; diff --git a/pkgs/by-name/gr/grimoire/package.nix b/pkgs/by-name/gr/grimoire/package.nix index f39212e..a4facc8 100644 --- a/pkgs/by-name/gr/grimoire/package.nix +++ b/pkgs/by-name/gr/grimoire/package.nix @@ -9,14 +9,15 @@ gnumake, pkg-config, makeWrapper, - electron_40, + electron_41, vpkmerge, sqlite, callPackage, makeDesktopItem, copyDesktopItems, -}: let - sources = callPackage ../../../../_sources/generated.nix {}; +}: +let + sources = callPackage ../../../../_sources/generated.nix { }; src = sources.grimoire.src; version = src.rev; @@ -32,114 +33,116 @@ pnpmDeps = pnpm.fetchDeps { pname = "grimoire"; inherit version src; - fetcherVersion = 3; - hash = "sha256-X7KLUag9HPHVit0l/tA3BxQZ2/Cj0A5KiG4Oevx2268="; + 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"]; + categories = [ "Utility" ]; + mimeTypes = [ "x-scheme-handler/grimoire" ]; }; in - stdenv.mkDerivation { - pname = "grimoire"; - inherit version src; +stdenv.mkDerivation { + pname = "grimoire"; + inherit version src; - nativeBuildInputs = [ - nodejs_22 - pnpm - pnpm.configHook - python3 - gcc - gnumake - pkg-config - makeWrapper - electron_40 - copyDesktopItems - ]; + nativeBuildInputs = [ + nodejs_22 + pnpm + pnpm.configHook + python3 + gcc + gnumake + pkg-config + makeWrapper + electron_41 + copyDesktopItems + ]; - desktopItems = [desktopItem]; + desktopItems = [ desktopItem ]; - buildInputs = [ - sqlite - ]; + buildInputs = [ + sqlite + ]; - inherit pnpmDeps; + 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"; - }; + 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 + 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 - ''; + 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 + buildPhase = '' + runHook preBuild - mkdir -p ../grimoire-social/node_modules - ln -sfn "$(realpath node_modules/zod)" ../grimoire-social/node_modules/zod + 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 - HOME="$TMPDIR" node \ - "${nodejs_22}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" \ - rebuild \ - --nodedir="${electron_40.headers}" - ) + # 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_40.dist} \ - --config.electronVersion=${electron_40.version} + # 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 - ''; + runHook postBuild + ''; - installPhase = '' - runHook preInstall + 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 + 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_40}/bin/electron $out/bin/grimoire \ - --add-flags "$out/lib/grimoire/resources/app.asar" \ - --set NODE_ENV production + # 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 - ''; + runHook postInstall + ''; - meta = { - description = "Grimoire — Electron-based mod manager"; - platforms = ["x86_64-linux"]; - }; - } + meta = { + description = "Grimoire — Electron-based mod manager"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/gr/grimoire/patches/better-sqlite3-thistogetthis.patch b/pkgs/by-name/gr/grimoire/patches/better-sqlite3-thistogetthis.patch new file mode 100644 index 0000000..10bf753 --- /dev/null +++ b/pkgs/by-name/gr/grimoire/patches/better-sqlite3-thistogetthis.patch @@ -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 Holder() const; ++// V8_DEPRECATE_SOON("Use Holder().") ++// V8_INLINE Local 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(info.This())->open); ++ info.GetReturnValue().Set(Unwrap(PROPERTY_HOLDER(info))->open); + } + + NODE_GETTER(Database::JS_inTransaction) { +- Database* db = Unwrap(info.This()); ++ Database* db = Unwrap(PROPERTY_HOLDER(info)); + info.GetReturnValue().Set(db->open && !static_cast(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(info.This()); ++ Statement* stmt = Unwrap(PROPERTY_HOLDER(info)); + info.GetReturnValue().Set(stmt->alive && stmt->locked); + }