nikkuss/pkgs
2
0
Fork 2
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

pkgs/ne/neovide: bump nvfetcher lock + make versioning nightly + rev instead of just rev for easy distinction; pkgs/gr/grimoire: fix hashes for successful build (#27)
cache / build (push) Failing after 21m45s
Details

Browse Source 
I wanted to bump it to make sure the neovide verison is as updated as possible + to make nix-store diffs :p

Reviewed-on: #27
Co-authored-by: h4rl <h4rldev@proton.me>
This commit was merged in pull request #27.
This commit is contained in:
h4rl
2026-08-17 17:10:06 +04:00
committed by nikkuss
parent 3fee7b017c
commit 16337d9143
5 changed files with 146 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_sources/generated.json
+28 -28
View File
@@ -1,7 +1,7 @@
{
"ath-tools": {
"cargoLock": null,
"date": "2026-07-16",
"date": "2026-08-05",
"extract": null,
"name": "ath-tools",
"passthru": null,
@@ -11,17 +11,17 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "54367caab6cb4e6cd21310c64feadbacc8c9b574",
"sha256": "sha256-iH9RKyhGj1mIycK//8KJqbkO1ZbQaAdWgsQNd7AfWMc=",
"rev": "6df4dae3e2f5e4c2903f3cafd40996fc1b3639ce",
"sha256": "sha256-FFoV58YVK7KGBw/JPFWcvGkJOONrfKCvACprYCzIKeg=",
"sparseCheckout": [],
"type": "git",
"url": "https://github.com/qca/qca-swiss-army-knife.git"
},
"version": "54367caab6cb4e6cd21310c64feadbacc8c9b574"
"version": "6df4dae3e2f5e4c2903f3cafd40996fc1b3639ce"
},
"base24-schemes": {
"cargoLock": null,
"date": "2026-07-14",
"date": "2026-08-09",
"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": "fdca32a0d14ec80ad83a78a9ccb85592ca6cb9e1",
"sha256": "sha256-LMHxSQJIv6QJJkO9W7sAkJujlwusFf9/Ct0SYJ6GyHQ=",
"sparseCheckout": [],
"type": "git",
"url": "https://github.com/tinted-theming/schemes.git"
},
"version": "010185535336bf94d815b900cd63bb0fc204e216"
"version": "fdca32a0d14ec80ad83a78a9ccb85592ca6cb9e1"
},
"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.69.0",
"sha256": "sha256-x0k+5EhGx3y6Xd2rswTWMfYb0ZAYf5D+DaACr14uNMM=",
"sparseCheckout": [],
"type": "github"
},
"version": "v0.60.0"
"version": "v0.69.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.17.1",
"sha256": "sha256-hsIski28Dr3k3+/0/+k6XySAeoQ6e5nTeLAGRtZ2kAQ=",
"sparseCheckout": [],
"type": "github"
},
"version": "v1.14.6"
"version": "v1.17.1"
},
"flightcore": {
"cargoLock": null,
@@ -116,21 +116,21 @@
"name": null,
"owner": "Slush97",
"repo": "grimoire",
"rev": "v1.26.0",
"sha256": "sha256-E357W9BTeODo4ckuWs4HfGTFYAk7kh/7OmvpShArIFs=",
"rev": "v1.27.1",
"sha256": "sha256-vf0PU1NfDLv7MxQeJzggSEGlmUose3rdonJhxccuriQ=",
"sparseCheckout": [],
"type": "github"
},
"version": "v1.26.0"
"version": "v1.27.1"
},
"neovide": {
"cargoLock": {
"Cargo.lock": [
"sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=/Cargo.lock",
"sha256-t_ayXFn2hXrSgAGZKn6FpZLbrMXekXL_+xhOXdsZvKU=/Cargo.lock",
{}
]
},
"date": "2026-07-18",
"date": "2026-08-12",
"extract": null,
"name": "neovide",
"passthru": null,
@@ -140,13 +140,13 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "9477f53a9c5821bec8eb4488dee89842f96f5bd3",
"sha256": "sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=",
"rev": "ba8c41f423c9a8f0cb14ff19baa6f538c95e52bf",
"sha256": "sha256-t/ayXFn2hXrSgAGZKn6FpZLbrMXekXL/+xhOXdsZvKU=",
"sparseCheckout": [],
"type": "git",
"url": "https://github.com/neovide/neovide.git"
},
"version": "9477f53a9c5821bec8eb4488dee89842f96f5bd3"
"version": "ba8c41f423c9a8f0cb14ff19baa6f538c95e52bf"
},
"qebspil": {
"cargoLock": null,
@@ -182,12 +182,12 @@
"name": null,
"owner": "radareorg",
"repo": "r2ghidra",
"rev": "6.1.8",
"sha256": "sha256-f5iohbAUYG524KJqSvL3PQCFnLQc055Ta02G3CRSO9I=",
"rev": "6.2.0",
"sha256": "sha256-+iHJpArFu1txVQ5chpg9/aBXDGoDAPlCRqRbgTSnCiQ=",
"sparseCheckout": [],
"type": "github"
},
"version": "6.1.8"
"version": "6.2.0"
},
"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.6",
"sha256": "sha256-btJfvsIC/xRfdQYJL0FYqUHsvP7zn/2EnUzLesWZPK4=",
"sparseCheckout": [],
"type": "github"
},
"version": "1.8.4"
"version": "1.8.6"
},
"slbounce": {
"cargoLock": null,
_sources/generated.nix
+28 -28
View File
@@ -8,52 +8,52 @@
{
ath-tools = {
pname = "ath-tools";
version = "54367caab6cb4e6cd21310c64feadbacc8c9b574";
version = "6df4dae3e2f5e4c2903f3cafd40996fc1b3639ce";
src = fetchgit {
url = "https://github.com/qca/qca-swiss-army-knife.git";
rev = "54367caab6cb4e6cd21310c64feadbacc8c9b574";
rev = "6df4dae3e2f5e4c2903f3cafd40996fc1b3639ce";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ ];
sha256 = "sha256-iH9RKyhGj1mIycK//8KJqbkO1ZbQaAdWgsQNd7AfWMc=";
sha256 = "sha256-FFoV58YVK7KGBw/JPFWcvGkJOONrfKCvACprYCzIKeg=";
};
date = "2026-07-16";
date = "2026-08-05";
};
base24-schemes = {
pname = "base24-schemes";
version = "010185535336bf94d815b900cd63bb0fc204e216";
version = "fdca32a0d14ec80ad83a78a9ccb85592ca6cb9e1";
src = fetchgit {
url = "https://github.com/tinted-theming/schemes.git";
rev = "010185535336bf94d815b900cd63bb0fc204e216";
rev = "fdca32a0d14ec80ad83a78a9ccb85592ca6cb9e1";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ ];
sha256 = "sha256-F+YMLW07YdZ4vUPt9h/gNKDU4GlXYYfSWjhY7M2RqRs=";
sha256 = "sha256-LMHxSQJIv6QJJkO9W7sAkJujlwusFf9/Ct0SYJ6GyHQ=";
};
date = "2026-07-14";
date = "2026-08-09";
};
claude-code-acp = {
pname = "claude-code-acp";
version = "v0.60.0";
version = "v0.69.0";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "claude-code-acp";
rev = "v0.60.0";
rev = "v0.69.0";
fetchSubmodules = false;
sha256 = "sha256-idyZcd8KD+bhAlKqqaTS6X8DcNjAzluln8it1V0vyUk=";
sha256 = "sha256-x0k+5EhGx3y6Xd2rswTWMfYb0ZAYf5D+DaACr14uNMM=";
};
};
claude-sync = {
pname = "claude-sync";
version = "v1.14.6";
version = "v1.17.1";
src = fetchFromGitHub {
owner = "tawanorg";
repo = "claude-sync";
rev = "v1.14.6";
rev = "v1.17.1";
fetchSubmodules = false;
sha256 = "sha256-i/V6Yf6f21KBriSpHG/9BZoUWTg5gHNisxQoUbuhBY0=";
sha256 = "sha256-hsIski28Dr3k3+/0/+k6XySAeoQ6e5nTeLAGRtZ2kAQ=";
};
};
flightcore = {
@@ -69,34 +69,34 @@
};
grimoire = {
pname = "grimoire";
version = "v1.26.0";
version = "v1.27.1";
src = fetchFromGitHub {
owner = "Slush97";
repo = "grimoire";
rev = "v1.26.0";
rev = "v1.27.1";
fetchSubmodules = false;
sha256 = "sha256-E357W9BTeODo4ckuWs4HfGTFYAk7kh/7OmvpShArIFs=";
sha256 = "sha256-vf0PU1NfDLv7MxQeJzggSEGlmUose3rdonJhxccuriQ=";
};
};
neovide = {
pname = "neovide";
version = "9477f53a9c5821bec8eb4488dee89842f96f5bd3";
version = "ba8c41f423c9a8f0cb14ff19baa6f538c95e52bf";
src = fetchgit {
url = "https://github.com/neovide/neovide.git";
rev = "9477f53a9c5821bec8eb4488dee89842f96f5bd3";
rev = "ba8c41f423c9a8f0cb14ff19baa6f538c95e52bf";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ ];
sha256 = "sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=";
sha256 = "sha256-t/ayXFn2hXrSgAGZKn6FpZLbrMXekXL/+xhOXdsZvKU=";
};
cargoLock."Cargo.lock" = {
lockFile = ./. + "/sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=/Cargo.lock";
lockFile = ./. + "/sha256-t_ayXFn2hXrSgAGZKn6FpZLbrMXekXL_+xhOXdsZvKU=/Cargo.lock";
outputHashes = {
};
};
date = "2026-07-18";
date = "2026-08-12";
};
qebspil = {
pname = "qebspil";
@@ -114,24 +114,24 @@
};
radare2-ghidra = {
pname = "radare2-ghidra";
version = "6.1.8";
version = "6.2.0";
src = fetchFromGitHub {
owner = "radareorg";
repo = "r2ghidra";
rev = "6.1.8";
rev = "6.2.0";
fetchSubmodules = false;
sha256 = "sha256-f5iohbAUYG524KJqSvL3PQCFnLQc055Ta02G3CRSO9I=";
sha256 = "sha256-+iHJpArFu1txVQ5chpg9/aBXDGoDAPlCRqRbgTSnCiQ=";
};
};
radare2-mcp = {
pname = "radare2-mcp";
version = "1.8.4";
version = "1.8.6";
src = fetchFromGitHub {
owner = "radareorg";
repo = "radare2-mcp";
rev = "1.8.4";
rev = "1.8.6";
fetchSubmodules = false;
sha256 = "sha256-EbkEbTATKxBOKWVqKkHp6h/hg4VUW0TsgGxN9TRI+pc=";
sha256 = "sha256-btJfvsIC/xRfdQYJL0FYqUHsvP7zn/2EnUzLesWZPK4=";
};
};
slbounce = {
_sources/sha256-3Bi1GKVRu90eQa5e8bhgOW1T92INWbQNCARJKeBM6Y8=/Cargo.lock → _sources/sha256-t_ayXFn2hXrSgAGZKn6FpZLbrMXekXL_+xhOXdsZvKU=/Cargo.lock
Generated
View File
pkgs/by-name/gr/grimoire/package.nix
+89 -90
View File
@@ -15,9 +15,8 @@
callPackage,
makeDesktopItem,
copyDesktopItems,
}:
let
sources = callPackage ../../../../_sources/generated.nix { };
}: let
sources = callPackage ../../../../_sources/generated.nix {};
src = sources.grimoire.src;
version = src.rev;
@@ -27,14 +26,14 @@ let
owner = "Slush97";
repo = "grimoire-social";
rev = "main";
hash = "sha256-f+wUZOR7dqigxd/IZtay1BrLS5rcSnaDage3NXxqsPE=";
hash = "sha256-AR2rTNDuge19t+VAqL/I6dmB8f5niIqINmNnRL70k94=";
};
pnpmDeps = pnpm.fetchDeps {
pname = "grimoire";
inherit version src;
fetcherVersion = 4;
hash = "sha256-Mqvvemc3oDCiuY/UnDOc73P+dLqMEFnwQotodVhrPao=";
hash = "sha256-7Lh4Y3sr50tIO7vsVwfJNC2zKyiqMz6EO81egS/DC2k=";
# hash = lib.fakeHash;
};
@@ -42,107 +41,107 @@ let
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_41
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
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}"
)
# 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}
# 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_41}/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"];
};
}
pkgs/by-name/ne/neovide/package.nix
+1 -1
View File
@@ -33,7 +33,7 @@
in
rustPlatform.buildRustPackage.override {stdenv = clangStdenv;} (finalAttrs: {
pname = "neovide";
version = src.rev;
version = "nightly-${src.rev}";
src = src;
cargoLock = sources.neovide.cargoLock."Cargo.lock";