5 Commits

Author SHA1 Message Date
doloro cccc55ef78 lint: removed some comments
check / build (push) Has been cancelled
check / build (pull_request) Has been cancelled
2026-05-29 14:35:07 +01:00
doloro 2917e84200 fix: vpkmerge and grimorie are using nvfetch now
check / build (push) Has been cancelled
check / build (pull_request) Has been cancelled
2026-05-29 14:30:40 +01:00
doloro cb70ca0e90 add: vpkmerge (used by grimorie) 2026-05-29 14:30:17 +01:00
doloro c2e51153c5 lint
check / build (push) Failing after 27s
check / build (pull_request) Failing after 25s
2026-05-29 12:02:03 +01:00
doloro 6a2f59785b add: grimorie (deadlock mod manager)
check / build (push) Failing after 1h49m38s
2026-05-29 11:47:53 +01:00
8 changed files with 67 additions and 141 deletions
-21
View File
@@ -60,27 +60,6 @@
},
"version": "v0.35.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.9.0",
"sha256": "sha256-5waB01wmSsFUkBB/PmT9yY5b1J/aapZJCnm5O21q+Q4=",
"sparseCheckout": [],
"type": "github"
},
"version": "v1.9.0"
},
"flightcore": {
"cargoLock": null,
"date": null,
-11
View File
@@ -45,17 +45,6 @@
sha256 = "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo=";
};
};
claude-sync = {
pname = "claude-sync";
version = "v1.9.0";
src = fetchFromGitHub {
owner = "tawanorg";
repo = "claude-sync";
rev = "v1.9.0";
fetchSubmodules = false;
sha256 = "sha256-5waB01wmSsFUkBB/PmT9yY5b1J/aapZJCnm5O21q+Q4=";
};
};
flightcore = {
pname = "flightcore";
version = "v3.2.0";
Generated
+3 -3
View File
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1780011192,
"narHash": "sha256-luHrZG6I7Mwdt413XoDOYBpp9z1z6X23/5SNktwjM+k=",
"lastModified": 1764897201,
"narHash": "sha256-428X4sppU6k+tF2vxTy726E5BxbtoxoTRP+1FBbXqvM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3242faf14b7611a62ce0f0071619438a08b65c12",
"rev": "9cfae7bb77c5058a4cfa8006d0caf82af8e980dc",
"type": "github"
},
"original": {
-4
View File
@@ -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"
-28
View File
@@ -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-cHWP5m191QP4XxeOtgHaLsyavXWikUwViDivBMGP34M=";
subPackages = [ "cmd/claude-sync" ];
ldflags = [
"-s"
"-w"
"-X main.version=${finalAttrs.version}"
];
meta = {
mainProgram = "claude-sync";
platforms = lib.platforms.unix;
};
})
+9 -6
View File
@@ -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;
+7 -20
View File
@@ -10,17 +10,15 @@
gnumake,
pkg-config,
makeWrapper,
electron_40,
electron_39,
vpkmerge,
sqlite,
callPackage,
makeDesktopItem,
copyDesktopItems,
}: let
version = "1.13.1";
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 {
@@ -33,16 +31,8 @@
pnpmDeps = pnpm.fetchDeps {
pname = "grimoire";
inherit version src;
fetcherVersion = 3;
hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
};
desktopItem = makeDesktopItem {
name = "grimoire";
exec = "/bin/grimoire %u";
desktopName = "Grimoire";
categories = ["Utility"];
mimeTypes = ["x-scheme-handler/grimoire"];
fetcherVersion = 2;
hash = "sha256-ARJihXqqSVpzrA7qLGUFoQRW0ydgcIAunZJeFB3WN5s=";
};
in
stdenv.mkDerivation {
@@ -58,12 +48,9 @@ in
gnumake
pkg-config
makeWrapper
electron_40
copyDesktopItems
electron_39
];
desktopItems = [desktopItem];
buildInputs = [
sqlite
];
@@ -92,7 +79,7 @@ in
HOME="$TMPDIR" node \
"${nodejs_22}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" \
rebuild \
--nodedir="${electron_40.headers}"
--nodedir="${electron_39.headers}"
)
pnpm exec electron-vite build
@@ -120,7 +107,7 @@ in
done
mkdir -p $out/bin
makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \
makeWrapper ${electron_39}/bin/electron $out/bin/grimoire \
--add-flags "$out/lib/grimoire" \
--set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
--set NODE_ENV production
@@ -27,11 +27,11 @@ stdenv.mkDerivation (
rec {
name = "x1e80100-firmware";
version = "26100_26.033.32430.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-KyHgMGk/oytVctE5AhdXer+x7mJk2uP8Vgc7v78wSRc=";
hash = "sha256-ZkZgmKz5ihrRaarAioWoc0dx9XbmobGwTTyY/VLzahk=";
};
nativeBuildInputs = [
msitools