Compare commits
2
Commits
main
..
a82835c0d7
| Author | SHA1 | Date | |
|---|---|---|---|
 h4rl
|
a82835c0d7
|
||
|
h4rl
|
408683f99b
|
+22
-90
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"ath-tools": {
|
||||
"cargoLock": null,
|
||||
"date": "2026-08-05",
|
||||
"date": "2026-04-15",
|
||||
"extract": null,
|
||||
"name": "ath-tools",
|
||||
"passthru": null,
|
||||
@@ -11,17 +11,17 @@
|
||||
"fetchSubmodules": false,
|
||||
"leaveDotGit": false,
|
||||
"name": null,
|
||||
"rev": "6df4dae3e2f5e4c2903f3cafd40996fc1b3639ce",
|
||||
"sha256": "sha256-FFoV58YVK7KGBw/JPFWcvGkJOONrfKCvACprYCzIKeg=",
|
||||
"rev": "324903e86fbd30d601f404125da74b28d812be4b",
|
||||
"sha256": "sha256-Gykx/uHPzbHPECtiCoRmo9YWxUpYc7Ky1lNBENLsRm4=",
|
||||
"sparseCheckout": [],
|
||||
"type": "git",
|
||||
"url": "https://github.com/qca/qca-swiss-army-knife.git"
|
||||
},
|
||||
"version": "6df4dae3e2f5e4c2903f3cafd40996fc1b3639ce"
|
||||
"version": "324903e86fbd30d601f404125da74b28d812be4b"
|
||||
},
|
||||
"base24-schemes": {
|
||||
"cargoLock": null,
|
||||
"date": "2026-08-09",
|
||||
"date": "2026-05-03",
|
||||
"extract": null,
|
||||
"name": "base24-schemes",
|
||||
"passthru": null,
|
||||
@@ -31,13 +31,13 @@
|
||||
"fetchSubmodules": false,
|
||||
"leaveDotGit": false,
|
||||
"name": null,
|
||||
"rev": "fdca32a0d14ec80ad83a78a9ccb85592ca6cb9e1",
|
||||
"sha256": "sha256-LMHxSQJIv6QJJkO9W7sAkJujlwusFf9/Ct0SYJ6GyHQ=",
|
||||
"rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795",
|
||||
"sha256": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=",
|
||||
"sparseCheckout": [],
|
||||
"type": "git",
|
||||
"url": "https://github.com/tinted-theming/schemes.git"
|
||||
},
|
||||
"version": "fdca32a0d14ec80ad83a78a9ccb85592ca6cb9e1"
|
||||
"version": "0c94645546f4f3ddac77a1a5fce54eb95bf50795"
|
||||
},
|
||||
"claude-code-acp": {
|
||||
"cargoLock": null,
|
||||
@@ -53,33 +53,12 @@
|
||||
"name": null,
|
||||
"owner": "zed-industries",
|
||||
"repo": "claude-code-acp",
|
||||
"rev": "v0.69.0",
|
||||
"sha256": "sha256-x0k+5EhGx3y6Xd2rswTWMfYb0ZAYf5D+DaACr14uNMM=",
|
||||
"rev": "v0.35.0",
|
||||
"sha256": "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "v0.69.0"
|
||||
},
|
||||
"claude-sync": {
|
||||
"cargoLock": null,
|
||||
"date": null,
|
||||
"extract": null,
|
||||
"name": "claude-sync",
|
||||
"passthru": null,
|
||||
"pinned": false,
|
||||
"src": {
|
||||
"deepClone": false,
|
||||
"fetchSubmodules": false,
|
||||
"leaveDotGit": false,
|
||||
"name": null,
|
||||
"owner": "tawanorg",
|
||||
"repo": "claude-sync",
|
||||
"rev": "v1.17.1",
|
||||
"sha256": "sha256-hsIski28Dr3k3+/0/+k6XySAeoQ6e5nTeLAGRtZ2kAQ=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "v1.17.1"
|
||||
"version": "v0.35.0"
|
||||
},
|
||||
"flightcore": {
|
||||
"cargoLock": null,
|
||||
@@ -102,35 +81,14 @@
|
||||
},
|
||||
"version": "v3.2.0"
|
||||
},
|
||||
"grimoire": {
|
||||
"cargoLock": null,
|
||||
"date": null,
|
||||
"extract": null,
|
||||
"name": "grimoire",
|
||||
"passthru": null,
|
||||
"pinned": false,
|
||||
"src": {
|
||||
"deepClone": false,
|
||||
"fetchSubmodules": false,
|
||||
"leaveDotGit": false,
|
||||
"name": null,
|
||||
"owner": "Slush97",
|
||||
"repo": "grimoire",
|
||||
"rev": "v1.27.1",
|
||||
"sha256": "sha256-vf0PU1NfDLv7MxQeJzggSEGlmUose3rdonJhxccuriQ=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "v1.27.1"
|
||||
},
|
||||
"neovide": {
|
||||
"cargoLock": {
|
||||
"Cargo.lock": [
|
||||
"sha256-t_ayXFn2hXrSgAGZKn6FpZLbrMXekXL_+xhOXdsZvKU=/Cargo.lock",
|
||||
"sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock",
|
||||
{}
|
||||
]
|
||||
},
|
||||
"date": "2026-08-12",
|
||||
"date": "2026-05-16",
|
||||
"extract": null,
|
||||
"name": "neovide",
|
||||
"passthru": null,
|
||||
@@ -140,13 +98,13 @@
|
||||
"fetchSubmodules": false,
|
||||
"leaveDotGit": false,
|
||||
"name": null,
|
||||
"rev": "ba8c41f423c9a8f0cb14ff19baa6f538c95e52bf",
|
||||
"sha256": "sha256-t/ayXFn2hXrSgAGZKn6FpZLbrMXekXL/+xhOXdsZvKU=",
|
||||
"rev": "8c48a699e201aa5559227a96d879b2f57192b354",
|
||||
"sha256": "sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3/pU7iOBpBOC0Dvw=",
|
||||
"sparseCheckout": [],
|
||||
"type": "git",
|
||||
"url": "https://github.com/neovide/neovide.git"
|
||||
},
|
||||
"version": "ba8c41f423c9a8f0cb14ff19baa6f538c95e52bf"
|
||||
"version": "8c48a699e201aa5559227a96d879b2f57192b354"
|
||||
},
|
||||
"qebspil": {
|
||||
"cargoLock": null,
|
||||
@@ -182,12 +140,12 @@
|
||||
"name": null,
|
||||
"owner": "radareorg",
|
||||
"repo": "r2ghidra",
|
||||
"rev": "6.2.0",
|
||||
"sha256": "sha256-+iHJpArFu1txVQ5chpg9/aBXDGoDAPlCRqRbgTSnCiQ=",
|
||||
"rev": "6.1.4",
|
||||
"sha256": "sha256-uVMsONXethTq/BL9MBQkDP3iJ6t25PEnpeD/Y17dpxM=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "6.2.0"
|
||||
"version": "6.1.4"
|
||||
},
|
||||
"radare2-mcp": {
|
||||
"cargoLock": null,
|
||||
@@ -203,12 +161,12 @@
|
||||
"name": null,
|
||||
"owner": "radareorg",
|
||||
"repo": "radare2-mcp",
|
||||
"rev": "1.8.6",
|
||||
"sha256": "sha256-btJfvsIC/xRfdQYJL0FYqUHsvP7zn/2EnUzLesWZPK4=",
|
||||
"rev": "1.8.0",
|
||||
"sha256": "sha256-1tV3mG1hEIcq18cHn5kS4n9ocVZsHQ5A4TCTA3OKzn8=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "1.8.6"
|
||||
"version": "1.8.0"
|
||||
},
|
||||
"slbounce": {
|
||||
"cargoLock": null,
|
||||
@@ -230,31 +188,5 @@
|
||||
"type": "github"
|
||||
},
|
||||
"version": "v5"
|
||||
},
|
||||
"vpkmerge": {
|
||||
"cargoLock": {
|
||||
"Cargo.lock": [
|
||||
"sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=/Cargo.lock",
|
||||
{}
|
||||
]
|
||||
},
|
||||
"date": null,
|
||||
"extract": null,
|
||||
"name": "vpkmerge",
|
||||
"passthru": null,
|
||||
"pinned": false,
|
||||
"src": {
|
||||
"deepClone": false,
|
||||
"fetchSubmodules": false,
|
||||
"leaveDotGit": false,
|
||||
"name": null,
|
||||
"owner": "Slush97",
|
||||
"repo": "vpkmerge",
|
||||
"rev": "v0.19.0",
|
||||
"sha256": "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "v0.19.0"
|
||||
}
|
||||
}
|
||||
+22
-61
@@ -8,52 +8,41 @@
|
||||
{
|
||||
ath-tools = {
|
||||
pname = "ath-tools";
|
||||
version = "6df4dae3e2f5e4c2903f3cafd40996fc1b3639ce";
|
||||
version = "324903e86fbd30d601f404125da74b28d812be4b";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/qca/qca-swiss-army-knife.git";
|
||||
rev = "6df4dae3e2f5e4c2903f3cafd40996fc1b3639ce";
|
||||
rev = "324903e86fbd30d601f404125da74b28d812be4b";
|
||||
fetchSubmodules = false;
|
||||
deepClone = false;
|
||||
leaveDotGit = false;
|
||||
sparseCheckout = [ ];
|
||||
sha256 = "sha256-FFoV58YVK7KGBw/JPFWcvGkJOONrfKCvACprYCzIKeg=";
|
||||
sha256 = "sha256-Gykx/uHPzbHPECtiCoRmo9YWxUpYc7Ky1lNBENLsRm4=";
|
||||
};
|
||||
date = "2026-08-05";
|
||||
date = "2026-04-15";
|
||||
};
|
||||
base24-schemes = {
|
||||
pname = "base24-schemes";
|
||||
version = "fdca32a0d14ec80ad83a78a9ccb85592ca6cb9e1";
|
||||
version = "0c94645546f4f3ddac77a1a5fce54eb95bf50795";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/tinted-theming/schemes.git";
|
||||
rev = "fdca32a0d14ec80ad83a78a9ccb85592ca6cb9e1";
|
||||
rev = "0c94645546f4f3ddac77a1a5fce54eb95bf50795";
|
||||
fetchSubmodules = false;
|
||||
deepClone = false;
|
||||
leaveDotGit = false;
|
||||
sparseCheckout = [ ];
|
||||
sha256 = "sha256-LMHxSQJIv6QJJkO9W7sAkJujlwusFf9/Ct0SYJ6GyHQ=";
|
||||
sha256 = "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=";
|
||||
};
|
||||
date = "2026-08-09";
|
||||
date = "2026-05-03";
|
||||
};
|
||||
claude-code-acp = {
|
||||
pname = "claude-code-acp";
|
||||
version = "v0.69.0";
|
||||
version = "v0.35.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zed-industries";
|
||||
repo = "claude-code-acp";
|
||||
rev = "v0.69.0";
|
||||
rev = "v0.35.0";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-x0k+5EhGx3y6Xd2rswTWMfYb0ZAYf5D+DaACr14uNMM=";
|
||||
};
|
||||
};
|
||||
claude-sync = {
|
||||
pname = "claude-sync";
|
||||
version = "v1.17.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tawanorg";
|
||||
repo = "claude-sync";
|
||||
rev = "v1.17.1";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-hsIski28Dr3k3+/0/+k6XySAeoQ6e5nTeLAGRtZ2kAQ=";
|
||||
sha256 = "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo=";
|
||||
};
|
||||
};
|
||||
flightcore = {
|
||||
@@ -67,36 +56,25 @@
|
||||
sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
|
||||
};
|
||||
};
|
||||
grimoire = {
|
||||
pname = "grimoire";
|
||||
version = "v1.27.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Slush97";
|
||||
repo = "grimoire";
|
||||
rev = "v1.27.1";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-vf0PU1NfDLv7MxQeJzggSEGlmUose3rdonJhxccuriQ=";
|
||||
};
|
||||
};
|
||||
neovide = {
|
||||
pname = "neovide";
|
||||
version = "ba8c41f423c9a8f0cb14ff19baa6f538c95e52bf";
|
||||
version = "8c48a699e201aa5559227a96d879b2f57192b354";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/neovide/neovide.git";
|
||||
rev = "ba8c41f423c9a8f0cb14ff19baa6f538c95e52bf";
|
||||
rev = "8c48a699e201aa5559227a96d879b2f57192b354";
|
||||
fetchSubmodules = false;
|
||||
deepClone = false;
|
||||
leaveDotGit = false;
|
||||
sparseCheckout = [ ];
|
||||
sha256 = "sha256-t/ayXFn2hXrSgAGZKn6FpZLbrMXekXL/+xhOXdsZvKU=";
|
||||
sha256 = "sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3/pU7iOBpBOC0Dvw=";
|
||||
};
|
||||
cargoLock."Cargo.lock" = {
|
||||
lockFile = ./. + "/sha256-t_ayXFn2hXrSgAGZKn6FpZLbrMXekXL_+xhOXdsZvKU=/Cargo.lock";
|
||||
lockFile = ./. + "/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock";
|
||||
outputHashes = {
|
||||
|
||||
};
|
||||
};
|
||||
date = "2026-08-12";
|
||||
date = "2026-05-16";
|
||||
};
|
||||
qebspil = {
|
||||
pname = "qebspil";
|
||||
@@ -114,24 +92,24 @@
|
||||
};
|
||||
radare2-ghidra = {
|
||||
pname = "radare2-ghidra";
|
||||
version = "6.2.0";
|
||||
version = "6.1.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "radareorg";
|
||||
repo = "r2ghidra";
|
||||
rev = "6.2.0";
|
||||
rev = "6.1.4";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-+iHJpArFu1txVQ5chpg9/aBXDGoDAPlCRqRbgTSnCiQ=";
|
||||
sha256 = "sha256-uVMsONXethTq/BL9MBQkDP3iJ6t25PEnpeD/Y17dpxM=";
|
||||
};
|
||||
};
|
||||
radare2-mcp = {
|
||||
pname = "radare2-mcp";
|
||||
version = "1.8.6";
|
||||
version = "1.8.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "radareorg";
|
||||
repo = "radare2-mcp";
|
||||
rev = "1.8.6";
|
||||
rev = "1.8.0";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-btJfvsIC/xRfdQYJL0FYqUHsvP7zn/2EnUzLesWZPK4=";
|
||||
sha256 = "sha256-1tV3mG1hEIcq18cHn5kS4n9ocVZsHQ5A4TCTA3OKzn8=";
|
||||
};
|
||||
};
|
||||
slbounce = {
|
||||
@@ -145,21 +123,4 @@
|
||||
sha256 = "sha256-w+0SKR0A/hcFU6iFEOgyG+vWwgAWF8h9D0/X7GSFm7w=";
|
||||
};
|
||||
};
|
||||
vpkmerge = {
|
||||
pname = "vpkmerge";
|
||||
version = "v0.19.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Slush97";
|
||||
repo = "vpkmerge";
|
||||
rev = "v0.19.0";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=";
|
||||
};
|
||||
cargoLock."Cargo.lock" = {
|
||||
lockFile = ./. + "/sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=/Cargo.lock";
|
||||
outputHashes = {
|
||||
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+6
-6
@@ -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
@@ -20,11 +20,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1784463523,
|
||||
"narHash": "sha256-DIM0Ma2i514MRl+NJY2/LGzG8i6hs4zORZw9E+0VwBc=",
|
||||
"lastModified": 1764897201,
|
||||
"narHash": "sha256-428X4sppU6k+tF2vxTy726E5BxbtoxoTRP+1FBbXqvM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3d79c8d63e761c59323e90a27b50eb52b5482bfe",
|
||||
"rev": "9cfae7bb77c5058a4cfa8006d0caf82af8e980dc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -2,10 +2,6 @@
|
||||
src.github = "zed-industries/claude-code-acp"
|
||||
fetch.github = "zed-industries/claude-code-acp"
|
||||
|
||||
[claude-sync]
|
||||
src.github = "tawanorg/claude-sync"
|
||||
fetch.github = "tawanorg/claude-sync"
|
||||
|
||||
[flightcore]
|
||||
src.github = "R2NorthstarTools/FlightCore"
|
||||
fetch.github = "R2NorthstarTools/FlightCore"
|
||||
@@ -40,12 +36,3 @@ src.git = "https://github.com/neovide/neovide.git"
|
||||
src.git_branch = "nightly"
|
||||
fetch.git = "https://github.com/neovide/neovide.git"
|
||||
cargo_lock = ["Cargo.lock"]
|
||||
|
||||
[grimoire]
|
||||
src.github = "Slush97/grimoire"
|
||||
fetch.github = "Slush97/grimoire"
|
||||
|
||||
[vpkmerge]
|
||||
src.github = "Slush97/vpkmerge"
|
||||
fetch.github = "Slush97/vpkmerge"
|
||||
cargo_lock = ["Cargo.lock"]
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
callPackage,
|
||||
}:
|
||||
let
|
||||
sources = callPackage ../../../../_sources/generated.nix { };
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "claude-sync";
|
||||
version = lib.removePrefix "v" sources.claude-sync.version;
|
||||
inherit (sources.claude-sync) src;
|
||||
|
||||
vendorHash = "sha256-VLqVk5bhM+WoEbP+agFpm1LjzI2qFWlWQZB8yV2vbOU=";
|
||||
|
||||
subPackages = [ "cmd/claude-sync" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
mainProgram = "claude-sync";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -13,14 +13,17 @@
|
||||
pkg-config,
|
||||
webkitgtk_4_1,
|
||||
wrapGAppsHook4,
|
||||
callPackage,
|
||||
}: let
|
||||
sources = callPackage ../../../../_sources/generated.nix {};
|
||||
in
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "flightcore";
|
||||
version = lib.removePrefix "v" sources.flightcore.version;
|
||||
inherit (sources.flightcore) src;
|
||||
version = "3.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "R2NorthstarTools";
|
||||
repo = "FlightCore";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
|
||||
};
|
||||
patches = [./cargo-lock.patch];
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
src = finalAttrs.src;
|
||||
|
||||
@@ -1,147 +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-AR2rTNDuge19t+VAqL/I6dmB8f5niIqINmNnRL70k94=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
pname = "grimoire";
|
||||
inherit version src;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-7Lh4Y3sr50tIO7vsVwfJNC2zKyiqMz6EO81egS/DC2k=";
|
||||
# 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);
|
||||
}
|
||||
@@ -33,7 +33,7 @@
|
||||
in
|
||||
rustPlatform.buildRustPackage.override {stdenv = clangStdenv;} (finalAttrs: {
|
||||
pname = "neovide";
|
||||
version = "nightly-${src.rev}";
|
||||
version = src.rev;
|
||||
src = src;
|
||||
|
||||
cargoLock = sources.neovide.cargoLock."Cargo.lock";
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
callPackage,
|
||||
pkg-config,
|
||||
dbus,
|
||||
glib,
|
||||
cairo,
|
||||
gtk3,
|
||||
libsoup_3,
|
||||
webkitgtk_4_1,
|
||||
}: let
|
||||
sources = callPackage ../../../../_sources/generated.nix {};
|
||||
inherit (sources.vpkmerge) src cargoLock;
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "vpkmerge";
|
||||
version = src.rev;
|
||||
src = src;
|
||||
cargoLock = sources.vpkmerge.cargoLock."Cargo.lock";
|
||||
|
||||
nativeBuildInputs = [pkg-config dbus.dev];
|
||||
|
||||
buildInputs = [dbus glib cairo gtk3 libsoup_3 webkitgtk_4_1];
|
||||
})
|
||||
@@ -27,11 +27,11 @@ stdenv.mkDerivation (
|
||||
|
||||
rec {
|
||||
name = "x1e80100-firmware";
|
||||
version = "26100_26.053.36539.0";
|
||||
version = "26100_26.011.9344.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-ZrbhrOfl8BvFks1MmueKowu7DgSrV0kc0D7CqqbhIps=";
|
||||
hash = "sha256-ZkZgmKz5ihrRaarAioWoc0dx9XbmobGwTTyY/VLzahk=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
msitools
|
||||
|
||||
Reference in New Issue
Block a user