1
0
forked from nikkuss/pkgs

1 Commits

Author SHA1 Message Date
doloro 16927f0e7e bump(vpkmerge): 0.9.0 2026-07-13 13:59:06 +01:00
8 changed files with 195 additions and 255 deletions
+25 -25
View File
@@ -1,7 +1,7 @@
{
"ath-tools": {
"cargoLock": null,
"date": "2026-07-16",
"date": "2026-04-15",
"extract": null,
"name": "ath-tools",
"passthru": null,
@@ -11,17 +11,17 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "54367caab6cb4e6cd21310c64feadbacc8c9b574",
"sha256": "sha256-iH9RKyhGj1mIycK//8KJqbkO1ZbQaAdWgsQNd7AfWMc=",
"rev": "324903e86fbd30d601f404125da74b28d812be4b",
"sha256": "sha256-Gykx/uHPzbHPECtiCoRmo9YWxUpYc7Ky1lNBENLsRm4=",
"sparseCheckout": [],
"type": "git",
"url": "https://github.com/qca/qca-swiss-army-knife.git"
},
"version": "54367caab6cb4e6cd21310c64feadbacc8c9b574"
"version": "324903e86fbd30d601f404125da74b28d812be4b"
},
"base24-schemes": {
"cargoLock": null,
"date": "2026-07-14",
"date": "2026-05-03",
"extract": null,
"name": "base24-schemes",
"passthru": null,
@@ -31,13 +31,13 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "010185535336bf94d815b900cd63bb0fc204e216",
"sha256": "sha256-F+YMLW07YdZ4vUPt9h/gNKDU4GlXYYfSWjhY7M2RqRs=",
"rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795",
"sha256": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=",
"sparseCheckout": [],
"type": "git",
"url": "https://github.com/tinted-theming/schemes.git"
},
"version": "010185535336bf94d815b900cd63bb0fc204e216"
"version": "0c94645546f4f3ddac77a1a5fce54eb95bf50795"
},
"claude-code-acp": {
"cargoLock": null,
@@ -53,12 +53,12 @@
"name": null,
"owner": "zed-industries",
"repo": "claude-code-acp",
"rev": "v0.60.0",
"sha256": "sha256-idyZcd8KD+bhAlKqqaTS6X8DcNjAzluln8it1V0vyUk=",
"rev": "v0.35.0",
"sha256": "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo=",
"sparseCheckout": [],
"type": "github"
},
"version": "v0.60.0"
"version": "v0.35.0"
},
"claude-sync": {
"cargoLock": null,
@@ -74,12 +74,12 @@
"name": null,
"owner": "tawanorg",
"repo": "claude-sync",
"rev": "v1.14.6",
"sha256": "sha256-i/V6Yf6f21KBriSpHG/9BZoUWTg5gHNisxQoUbuhBY0=",
"rev": "v1.9.0",
"sha256": "sha256-5waB01wmSsFUkBB/PmT9yY5b1J/aapZJCnm5O21q+Q4=",
"sparseCheckout": [],
"type": "github"
},
"version": "v1.14.6"
"version": "v1.9.0"
},
"flightcore": {
"cargoLock": null,
@@ -126,11 +126,11 @@
"neovide": {
"cargoLock": {
"Cargo.lock": [
"sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=/Cargo.lock",
"sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock",
{}
]
},
"date": "2026-07-18",
"date": "2026-05-16",
"extract": null,
"name": "neovide",
"passthru": null,
@@ -140,13 +140,13 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "9477f53a9c5821bec8eb4488dee89842f96f5bd3",
"sha256": "sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=",
"rev": "8c48a699e201aa5559227a96d879b2f57192b354",
"sha256": "sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3/pU7iOBpBOC0Dvw=",
"sparseCheckout": [],
"type": "git",
"url": "https://github.com/neovide/neovide.git"
},
"version": "9477f53a9c5821bec8eb4488dee89842f96f5bd3"
"version": "8c48a699e201aa5559227a96d879b2f57192b354"
},
"qebspil": {
"cargoLock": null,
@@ -182,12 +182,12 @@
"name": null,
"owner": "radareorg",
"repo": "r2ghidra",
"rev": "6.1.8",
"sha256": "sha256-f5iohbAUYG524KJqSvL3PQCFnLQc055Ta02G3CRSO9I=",
"rev": "6.1.4",
"sha256": "sha256-uVMsONXethTq/BL9MBQkDP3iJ6t25PEnpeD/Y17dpxM=",
"sparseCheckout": [],
"type": "github"
},
"version": "6.1.8"
"version": "6.1.4"
},
"radare2-mcp": {
"cargoLock": null,
@@ -203,12 +203,12 @@
"name": null,
"owner": "radareorg",
"repo": "radare2-mcp",
"rev": "1.8.4",
"sha256": "sha256-EbkEbTATKxBOKWVqKkHp6h/hg4VUW0TsgGxN9TRI+pc=",
"rev": "1.8.0",
"sha256": "sha256-1tV3mG1hEIcq18cHn5kS4n9ocVZsHQ5A4TCTA3OKzn8=",
"sparseCheckout": [],
"type": "github"
},
"version": "1.8.4"
"version": "1.8.0"
},
"slbounce": {
"cargoLock": null,
+25 -25
View File
@@ -8,52 +8,52 @@
{
ath-tools = {
pname = "ath-tools";
version = "54367caab6cb4e6cd21310c64feadbacc8c9b574";
version = "324903e86fbd30d601f404125da74b28d812be4b";
src = fetchgit {
url = "https://github.com/qca/qca-swiss-army-knife.git";
rev = "54367caab6cb4e6cd21310c64feadbacc8c9b574";
rev = "324903e86fbd30d601f404125da74b28d812be4b";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ ];
sha256 = "sha256-iH9RKyhGj1mIycK//8KJqbkO1ZbQaAdWgsQNd7AfWMc=";
sha256 = "sha256-Gykx/uHPzbHPECtiCoRmo9YWxUpYc7Ky1lNBENLsRm4=";
};
date = "2026-07-16";
date = "2026-04-15";
};
base24-schemes = {
pname = "base24-schemes";
version = "010185535336bf94d815b900cd63bb0fc204e216";
version = "0c94645546f4f3ddac77a1a5fce54eb95bf50795";
src = fetchgit {
url = "https://github.com/tinted-theming/schemes.git";
rev = "010185535336bf94d815b900cd63bb0fc204e216";
rev = "0c94645546f4f3ddac77a1a5fce54eb95bf50795";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ ];
sha256 = "sha256-F+YMLW07YdZ4vUPt9h/gNKDU4GlXYYfSWjhY7M2RqRs=";
sha256 = "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=";
};
date = "2026-07-14";
date = "2026-05-03";
};
claude-code-acp = {
pname = "claude-code-acp";
version = "v0.60.0";
version = "v0.35.0";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "claude-code-acp";
rev = "v0.60.0";
rev = "v0.35.0";
fetchSubmodules = false;
sha256 = "sha256-idyZcd8KD+bhAlKqqaTS6X8DcNjAzluln8it1V0vyUk=";
sha256 = "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo=";
};
};
claude-sync = {
pname = "claude-sync";
version = "v1.14.6";
version = "v1.9.0";
src = fetchFromGitHub {
owner = "tawanorg";
repo = "claude-sync";
rev = "v1.14.6";
rev = "v1.9.0";
fetchSubmodules = false;
sha256 = "sha256-i/V6Yf6f21KBriSpHG/9BZoUWTg5gHNisxQoUbuhBY0=";
sha256 = "sha256-5waB01wmSsFUkBB/PmT9yY5b1J/aapZJCnm5O21q+Q4=";
};
};
flightcore = {
@@ -80,23 +80,23 @@
};
neovide = {
pname = "neovide";
version = "9477f53a9c5821bec8eb4488dee89842f96f5bd3";
version = "8c48a699e201aa5559227a96d879b2f57192b354";
src = fetchgit {
url = "https://github.com/neovide/neovide.git";
rev = "9477f53a9c5821bec8eb4488dee89842f96f5bd3";
rev = "8c48a699e201aa5559227a96d879b2f57192b354";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ ];
sha256 = "sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=";
sha256 = "sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3/pU7iOBpBOC0Dvw=";
};
cargoLock."Cargo.lock" = {
lockFile = ./. + "/sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=/Cargo.lock";
lockFile = ./. + "/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock";
outputHashes = {
};
};
date = "2026-07-18";
date = "2026-05-16";
};
qebspil = {
pname = "qebspil";
@@ -114,24 +114,24 @@
};
radare2-ghidra = {
pname = "radare2-ghidra";
version = "6.1.8";
version = "6.1.4";
src = fetchFromGitHub {
owner = "radareorg";
repo = "r2ghidra";
rev = "6.1.8";
rev = "6.1.4";
fetchSubmodules = false;
sha256 = "sha256-f5iohbAUYG524KJqSvL3PQCFnLQc055Ta02G3CRSO9I=";
sha256 = "sha256-uVMsONXethTq/BL9MBQkDP3iJ6t25PEnpeD/Y17dpxM=";
};
};
radare2-mcp = {
pname = "radare2-mcp";
version = "1.8.4";
version = "1.8.0";
src = fetchFromGitHub {
owner = "radareorg";
repo = "radare2-mcp";
rev = "1.8.4";
rev = "1.8.0";
fetchSubmodules = false;
sha256 = "sha256-EbkEbTATKxBOKWVqKkHp6h/hg4VUW0TsgGxN9TRI+pc=";
sha256 = "sha256-1tV3mG1hEIcq18cHn5kS4n9ocVZsHQ5A4TCTA3OKzn8=";
};
};
slbounce = {
@@ -2849,9 +2849,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
[[package]]
name = "skia-bindings"
version = "0.97.2"
version = "0.97.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6a38f4d460276ea40588c958396a9de0eec808c679009a5b52afdf6ebf34132"
checksum = "d6e3bcf8f25bf047e83110838463e8d06696c12fccc3d3794adf448b4d81f34b"
dependencies = [
"bindgen",
"cc",
@@ -2866,9 +2866,9 @@ dependencies = [
[[package]]
name = "skia-safe"
version = "0.97.2"
version = "0.97.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ecfc54fcd40dc5dea15dd2a84f8422cdb0f76c6a51ebb8835ce0b7ef590a21f"
checksum = "935d4d174fb749bac9265eb41cad75039d32fda2d9c1a1e81b430df0e210a409"
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.61.2",
"windows-sys 0.52.0",
]
[[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.61.2",
"windows-sys 0.52.0",
]
[[package]]
Generated
+3 -3
View File
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1784463523,
"narHash": "sha256-DIM0Ma2i514MRl+NJY2/LGzG8i6hs4zORZw9E+0VwBc=",
"lastModified": 1780011192,
"narHash": "sha256-luHrZG6I7Mwdt413XoDOYBpp9z1z6X23/5SNktwjM+k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3d79c8d63e761c59323e90a27b50eb52b5482bfe",
"rev": "3242faf14b7611a62ce0f0071619438a08b65c12",
"type": "github"
},
"original": {
+1 -1
View File
@@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
version = lib.removePrefix "v" sources.claude-sync.version;
inherit (sources.claude-sync) src;
vendorHash = "sha256-VLqVk5bhM+WoEbP+agFpm1LjzI2qFWlWQZB8yV2vbOU=";
vendorHash = "sha256-cHWP5m191QP4XxeOtgHaLsyavXWikUwViDivBMGP34M=";
subPackages = [ "cmd/claude-sync" ];
-148
View File
@@ -1,148 +0,0 @@
{
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" ];
};
}
@@ -1,47 +0,0 @@
--- 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);
}
+135
View File
@@ -0,0 +1,135 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchurl,
nodejs_22,
pnpm,
python3,
gcc,
gnumake,
pkg-config,
makeWrapper,
electron_40,
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 = 3;
hash = "sha256-X7KLUag9HPHVit0l/tA3BxQZ2/Cj0A5KiG4Oevx2268=";
};
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_40
copyDesktopItems
];
desktopItems = [desktopItem];
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
runHook postInstall
'';
meta = {
description = "Grimoire Electron-based mod manager";
platforms = ["x86_64-linux"];
};
}