1
0
forked from nikkuss/pkgs

5 Commits

Author SHA1 Message Date
doloro cccc55ef78 lint: removed some comments 2026-05-29 14:35:07 +01:00
doloro 2917e84200 fix: vpkmerge and grimorie are using nvfetch now 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 2026-05-29 12:02:03 +01:00
doloro 6a2f59785b add: grimorie (deadlock mod manager) 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" "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": { "flightcore": {
"cargoLock": null, "cargoLock": null,
"date": null, "date": null,
-11
View File
@@ -45,17 +45,6 @@
sha256 = "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo="; 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 = { flightcore = {
pname = "flightcore"; pname = "flightcore";
version = "v3.2.0"; version = "v3.2.0";
Generated
+3 -3
View File
@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1780011192, "lastModified": 1764897201,
"narHash": "sha256-luHrZG6I7Mwdt413XoDOYBpp9z1z6X23/5SNktwjM+k=", "narHash": "sha256-428X4sppU6k+tF2vxTy726E5BxbtoxoTRP+1FBbXqvM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3242faf14b7611a62ce0f0071619438a08b65c12", "rev": "9cfae7bb77c5058a4cfa8006d0caf82af8e980dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
-4
View File
@@ -2,10 +2,6 @@
src.github = "zed-industries/claude-code-acp" src.github = "zed-industries/claude-code-acp"
fetch.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] [flightcore]
src.github = "R2NorthstarTools/FlightCore" src.github = "R2NorthstarTools/FlightCore"
fetch.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;
};
})
+50 -47
View File
@@ -13,58 +13,61 @@
pkg-config, pkg-config,
webkitgtk_4_1, webkitgtk_4_1,
wrapGAppsHook4, wrapGAppsHook4,
callPackage, fetchFromGitHub,
}: let }:
sources = callPackage ../../../../_sources/generated.nix {}; rustPlatform.buildRustPackage (finalAttrs: {
in pname = "flightcore";
rustPlatform.buildRustPackage (finalAttrs: { version = "3.2.0";
pname = "flightcore"; src = fetchFromGitHub {
version = lib.removePrefix "v" sources.flightcore.version; owner = "R2NorthstarTools";
inherit (sources.flightcore) src; repo = "FlightCore";
patches = [./cargo-lock.patch]; rev = "v${finalAttrs.version}";
cargoDeps = rustPlatform.fetchCargoVendor { sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
src = finalAttrs.src; };
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; patches = [./cargo-lock.patch];
hash = "sha256-Jh0DAX4fGy2Z1+hpq+bkU/VYy2JAL2u+neUIsQ2QXBU="; cargoDeps = rustPlatform.fetchCargoVendor {
patchFlags = "-p2"; src = finalAttrs.src;
inherit (finalAttrs) patches; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
}; hash = "sha256-Jh0DAX4fGy2Z1+hpq+bkU/VYy2JAL2u+neUIsQ2QXBU=";
postPatch = '' patchFlags = "-p2";
jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json inherit (finalAttrs) patches;
''; };
npmDeps = fetchNpmDeps { postPatch = ''
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
src = "${finalAttrs.src}/src-vue"; '';
hash = "sha256-QhUPkCBK1kcAF7gByFxlg8Ca9PLF3evCl0QYEPP/Q2c="; npmDeps = fetchNpmDeps {
}; name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
src = "${finalAttrs.src}/src-vue";
hash = "sha256-QhUPkCBK1kcAF7gByFxlg8Ca9PLF3evCl0QYEPP/Q2c=";
};
nativeBuildInputs = nativeBuildInputs =
[ [
cargo-tauri.hook cargo-tauri.hook
nodejs nodejs
npmHooks.npmConfigHook npmHooks.npmConfigHook
pkg-config pkg-config
jq jq
moreutils moreutils
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [wrapGAppsHook4]; ++ lib.optionals stdenv.hostPlatform.isLinux [wrapGAppsHook4];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
glib-networking glib-networking
openssl openssl
webkitgtk_4_1 webkitgtk_4_1
]; ];
cargoRoot = "src-tauri"; cargoRoot = "src-tauri";
npmRoot = "src-vue"; npmRoot = "src-vue";
buildAndTestSubdir = finalAttrs.cargoRoot; buildAndTestSubdir = finalAttrs.cargoRoot;
meta = { meta = {
platforms = ["x86_64-linux"]; platforms = ["x86_64-linux"];
description = "FlightCore A Northstar installer, updater, and mod-manager"; description = "FlightCore A Northstar installer, updater, and mod-manager";
}; };
}) })
+12 -25
View File
@@ -10,17 +10,15 @@
gnumake, gnumake,
pkg-config, pkg-config,
makeWrapper, makeWrapper,
electron_40, electron_39,
vpkmerge, vpkmerge,
sqlite, sqlite,
callPackage, callPackage,
makeDesktopItem,
copyDesktopItems,
}: let }: let
version = "1.13.1";
sources = callPackage ../../../../_sources/generated.nix {}; sources = callPackage ../../../../_sources/generated.nix {};
src = sources.grimoire.src; src = sources.grimoire.src;
version = src.rev;
# This would go into nvfetcher but it isnt versioned.. # This would go into nvfetcher but it isnt versioned..
grimoire-social-src = fetchFromGitHub { grimoire-social-src = fetchFromGitHub {
@@ -33,16 +31,8 @@
pnpmDeps = pnpm.fetchDeps { pnpmDeps = pnpm.fetchDeps {
pname = "grimoire"; pname = "grimoire";
inherit version src; inherit version src;
fetcherVersion = 3; fetcherVersion = 2;
hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4="; hash = "sha256-ARJihXqqSVpzrA7qLGUFoQRW0ydgcIAunZJeFB3WN5s=";
};
desktopItem = makeDesktopItem {
name = "grimoire";
exec = "/bin/grimoire %u";
desktopName = "Grimoire";
categories = ["Utility"];
mimeTypes = ["x-scheme-handler/grimoire"];
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@@ -58,12 +48,9 @@ in
gnumake gnumake
pkg-config pkg-config
makeWrapper makeWrapper
electron_40 electron_39
copyDesktopItems
]; ];
desktopItems = [desktopItem];
buildInputs = [ buildInputs = [
sqlite sqlite
]; ];
@@ -92,7 +79,7 @@ in
HOME="$TMPDIR" node \ HOME="$TMPDIR" node \
"${nodejs_22}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" \ "${nodejs_22}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" \
rebuild \ rebuild \
--nodedir="${electron_40.headers}" --nodedir="${electron_39.headers}"
) )
pnpm exec electron-vite build pnpm exec electron-vite build
@@ -109,21 +96,21 @@ in
mkdir -p $out/lib/grimoire/resources mkdir -p $out/lib/grimoire/resources
cp -r resources/vpkmerge $out/lib/grimoire/resources/vpkmerge cp -r resources/vpkmerge $out/lib/grimoire/resources/vpkmerge
echo '{"name":"grimoire","version":"${version}","main":"dist/main/index.js"}' \ echo '{"name":"grimoire","version":"${version}","main":"dist/main/index.js"}' \
> $out/lib/grimoire/package.json > $out/lib/grimoire/package.json
cp -r node_modules $out/lib/grimoire/node_modules cp -r node_modules $out/lib/grimoire/node_modules
rm -rf "$out/lib/grimoire/node_modules/@grimoire" rm -rf "$out/lib/grimoire/node_modules/@grimoire"
find "$out/lib/grimoire/node_modules" -type l | while read -r link; do find "$out/lib/grimoire/node_modules" -type l | while read -r link; do
[ -e "$link" ] || rm -f "$link" [ -e "$link" ] || rm -f "$link"
done done
mkdir -p $out/bin 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" \ --add-flags "$out/lib/grimoire" \
--set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \ --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
--set NODE_ENV production --set NODE_ENV production
runHook postInstall runHook postInstall
''; '';
@@ -27,11 +27,11 @@ stdenv.mkDerivation (
rec { rec {
name = "x1e80100-firmware"; name = "x1e80100-firmware";
version = "26100_26.033.32430.0"; version = "26100_26.011.9344.0";
src = fetchurl { src = fetchurl {
# https://www.microsoft.com/en-us/download/details.aspx?id=106120 # 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"; 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 = [ nativeBuildInputs = [
msitools msitools