1
0
forked from nikkuss/pkgs

13 Commits

Author SHA1 Message Date
doloro c8274e668e lint: removed some comments 2026-05-30 12:48:07 +01:00
doloro 4a59b86a47 fix: vpkmerge and grimorie are using nvfetch now 2026-05-30 12:48:07 +01:00
nikkuss 8969f1cb5c bump nixpkgs 2026-05-30 12:48:07 +01:00
nikkuss 67ca4c6edb bump firwmware version 2026-05-30 12:48:07 +01:00
nikkuss 888d1338cd refactor(flightcore): consume source from nvfetcher generated.nix (#14)
Reviewed-on: nikkuss/pkgs#14
Co-authored-by: Nikkuss <Scuggo@pm.me>
Co-committed-by: Nikkuss <Scuggo@pm.me>
2026-05-30 12:48:07 +01:00
nikkuss 9927693901 bump firwmware version (#13)
Reviewed-on: nikkuss/pkgs#13
Co-authored-by: Nikkuss <Scuggo@pm.me>
Co-committed-by: Nikkuss <Scuggo@pm.me>
2026-05-30 12:48:06 +01:00
doloro c7c53eafae fix: uses rev from nvfetcher 2026-05-30 12:45:54 +01:00
doloro 8d618dff18 fix: bumped electron on grimoire 2026-05-30 12:40:33 +01:00
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
9 changed files with 87 additions and 2518 deletions
-42
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,
@@ -148,27 +127,6 @@
}, },
"version": "8c48a699e201aa5559227a96d879b2f57192b354" "version": "8c48a699e201aa5559227a96d879b2f57192b354"
}, },
"oh-my-pi": {
"cargoLock": null,
"date": null,
"extract": null,
"name": "oh-my-pi",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "can1357",
"repo": "oh-my-pi",
"rev": "v15.10.1",
"sha256": "sha256-SPVour0OyZmJ+G+p7SFAjB0vdTWuvUAQH82InOvSVZc=",
"sparseCheckout": [],
"type": "github"
},
"version": "v15.10.1"
},
"qebspil": { "qebspil": {
"cargoLock": null, "cargoLock": null,
"date": "2025-10-25", "date": "2025-10-25",
-22
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";
@@ -98,17 +87,6 @@
}; };
date = "2026-05-16"; date = "2026-05-16";
}; };
oh-my-pi = {
pname = "oh-my-pi";
version = "v15.10.1";
src = fetchFromGitHub {
owner = "can1357";
repo = "oh-my-pi";
rev = "v15.10.1";
fetchSubmodules = false;
sha256 = "sha256-SPVour0OyZmJ+G+p7SFAjB0vdTWuvUAQH82InOvSVZc=";
};
};
qebspil = { qebspil = {
pname = "qebspil"; pname = "qebspil";
version = "8e4d9e676a3b3afe136cda9b953a2139ff1a32d0"; version = "8e4d9e676a3b3afe136cda9b953a2139ff1a32d0";
Generated
+1 -82
View File
@@ -1,52 +1,8 @@
{ {
"nodes": { "nodes": {
"bun2nix": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1778446047,
"narHash": "sha256-oQvcadh2BCkrog+SGrG6YffKJrveYpjj3TdQJWaKhaM=",
"owner": "nix-community",
"repo": "bun2nix",
"rev": "f2bc12af1a6369648aac41041ceeaa0b866599c6",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "bun2nix",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"bun2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1777988971,
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@@ -80,7 +36,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"bun2nix": "bun2nix",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
@@ -99,42 +54,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"bun2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1775636079,
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",
+80 -79
View File
@@ -4,86 +4,87 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
# Added for oh-my-pi
bun2nix.url = "github:nix-community/bun2nix";
bun2nix.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { outputs =
self,
nixpkgs,
bun2nix,
flake-utils,
} @ inputs: (
nixpkgs.lib.recursiveUpdate
(
flake-utils.lib.eachSystem
[
"x86_64-linux"
"aarch64-linux"
]
(
system: let
pkgs = import nixpkgs {
inherit system;
overlays = [bun2nix.overlays.default];
config = {
allowUnfree = true;
};
};
inherit (pkgs) lib;
scope = lib.makeScope pkgs.newScope (final: self.overlays.default (pkgs // final) pkgs);
recursePackage = name: pkg: let
isDrv = lib.isDerivation pkg;
isAttrs = lib.isAttrs pkg;
isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
in
if !isSameSystem
then []
else if isDrv
then [
(lib.nameValuePair name pkg)
]
else if isAttrs
then lib.mapAttrsToList (nameNew: subPkg: recursePackage "${name}-${nameNew}" subPkg) pkg
else [];
flatPackages = builtins.listToAttrs (
lib.lists.flatten (lib.mapAttrsToList (name: pkg: recursePackage name pkg) scope)
);
workingPackages = lib.filterAttrs (_: pkg: !pkg.meta.broken) flatPackages;
# Disable for now
# recursePackageSets =
# pkg:
# let
# isDrv = lib.isDerivation pkg;
# isAttrs = lib.isAttrs pkg;
# isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
# in
# if isDrv && isSameSystem then
# pkg
# else if isAttrs then
# lib.mapAttrs (_: subPkg: recursePackageSets subPkg) pkg
# else
# null;
#
# # Recursively filter out nulls and remove overrides (probably a btter way to do this but it works for now)
# packageSets = lib.filterAttrsRecursive (k: v: v != null && k != "override") (
# lib.mapAttrs (name: pkg: recursePackageSets pkg) scope
# );
in {
overlays = final: prev: flatPackages;
packages = flatPackages;
checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages;
devShells.default = pkgs.mkShellNoCC {
packages = [pkgs.nvfetcher];
};
}
)
)
{ {
overlays = { self,
default = final: prev: ((import "${nixpkgs}/pkgs/top-level/by-name-overlay.nix" ./pkgs/by-name) final prev); nixpkgs,
}; flake-utils,
} }@inputs:
); (nixpkgs.lib.recursiveUpdate
(flake-utils.lib.eachSystem
[
"x86_64-linux"
"aarch64-linux"
]
(
system:
let
pkgs = import nixpkgs {
inherit system;
config = {
allowUnfree = true;
};
};
inherit (pkgs) lib;
scope = lib.makeScope pkgs.newScope (final: self.overlays.default (pkgs // final) pkgs);
recursePackage =
name: pkg:
let
isDrv = lib.isDerivation pkg;
isAttrs = lib.isAttrs pkg;
isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
in
if !isSameSystem then
[ ]
else if isDrv then
[
(lib.nameValuePair name pkg)
]
else if isAttrs then
lib.mapAttrsToList (nameNew: subPkg: recursePackage "${name}-${nameNew}" subPkg) pkg
else
[ ];
flatPackages = builtins.listToAttrs (
lib.lists.flatten (lib.mapAttrsToList (name: pkg: recursePackage name pkg) scope)
);
workingPackages = lib.filterAttrs (_: pkg: !pkg.meta.broken) flatPackages;
# Disable for now
# recursePackageSets =
# pkg:
# let
# isDrv = lib.isDerivation pkg;
# isAttrs = lib.isAttrs pkg;
# isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
# in
# if isDrv && isSameSystem then
# pkg
# else if isAttrs then
# lib.mapAttrs (_: subPkg: recursePackageSets subPkg) pkg
# else
# null;
#
# # Recursively filter out nulls and remove overrides (probably a btter way to do this but it works for now)
# packageSets = lib.filterAttrsRecursive (k: v: v != null && k != "override") (
# lib.mapAttrs (name: pkg: recursePackageSets pkg) scope
# );
in
{
overlays = final: prev: flatPackages;
packages = flatPackages;
checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages;
devShells.default = pkgs.mkShellNoCC {
packages = [ pkgs.nvfetcher ];
};
}
)
)
{
overlays = {
default =
final: prev: ((import "${nixpkgs}/pkgs/top-level/by-name-overlay.nix" ./pkgs/by-name) final prev);
};
}
);
} }
-8
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"
@@ -49,7 +45,3 @@ fetch.github = "Slush97/grimoire"
src.github = "Slush97/vpkmerge" src.github = "Slush97/vpkmerge"
fetch.github = "Slush97/vpkmerge" fetch.github = "Slush97/vpkmerge"
cargo_lock = ["Cargo.lock"] cargo_lock = ["Cargo.lock"]
[oh-my-pi]
src.github = "can1357/oh-my-pi"
fetch.github = "can1357/oh-my-pi"
-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;
};
})
+6 -19
View File
@@ -14,8 +14,6 @@
vpkmerge, vpkmerge,
sqlite, sqlite,
callPackage, callPackage,
makeDesktopItem,
copyDesktopItems,
}: let }: let
sources = callPackage ../../../../_sources/generated.nix {}; sources = callPackage ../../../../_sources/generated.nix {};
@@ -34,15 +32,7 @@
pname = "grimoire"; pname = "grimoire";
inherit version src; inherit version src;
fetcherVersion = 3; fetcherVersion = 3;
hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4="; hash = "sha256-CrVc0gO0CtesGHbGxnrFeDR3NahyaxGSI3lMHtbGfcM=";
};
desktopItem = makeDesktopItem {
name = "grimoire";
exec = "/bin/grimoire %u";
desktopName = "Grimoire";
categories = ["Utility"];
mimeTypes = ["x-scheme-handler/grimoire"];
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@@ -59,11 +49,8 @@ in
pkg-config pkg-config
makeWrapper makeWrapper
electron_40 electron_40
copyDesktopItems
]; ];
desktopItems = [desktopItem];
buildInputs = [ buildInputs = [
sqlite sqlite
]; ];
@@ -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_40}/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
''; '';
File diff suppressed because it is too large Load Diff
-38
View File
@@ -1,38 +0,0 @@
{
lib,
callPackage,
stdenv,
bun2nix,
}: let
sources = callPackage ../../../../_sources/generated.nix {};
in
stdenv.mkDerivation {
pname = "oh-my-pi";
version = "unstable-${sources.oh-my-pi.version}";
inherit (sources.oh-my-pi) src;
nativeBuildInputs = [
bun2nix.hook
];
bunDeps = bun2nix.fetchBunDeps {
bunNix = ./bun.nix;
};
preBuild = ''
'';
installPhase = ''
runHook preInstall
runHook postInstall
'';
meta = with lib; {
description = "UEFI boot driver to start co-processors on Qualcomm platforms late during the boot process";
homepage = "https://github.com/can1357/oh-my-pi";
license = licenses.mit;
platforms = ["aarch64-linux" "x86_64-linux"];
mainProgram = "omp";
};
}