1
0
forked from nikkuss/pkgs

4 Commits

Author SHA1 Message Date
doloro 3525cbfbe6 mreow 2026-06-07 18:57:14 +01:00
doloro 80985b89d4 meow 2026-06-07 18:36:02 +01:00
doloro e23169c699 add(flake.nix): bun2nix 2026-06-07 18:21:56 +01:00
doloro 5ae28029ef feat(grimoire): desktop file (#19)
Reviewed-on: nikkuss/pkgs#19
Co-authored-by: Doloro1978 <doloroo@proton.me>
Co-committed-by: Doloro1978 <doloroo@proton.me>
2026-06-05 12:46:04 +04:00
8 changed files with 2457 additions and 101 deletions
+21
View File
@@ -148,6 +148,27 @@
},
"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": {
"cargoLock": null,
"date": "2025-10-25",
+11
View File
@@ -98,6 +98,17 @@
};
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 = {
pname = "qebspil";
version = "8e4d9e676a3b3afe136cda9b953a2139ff1a32d0";
Generated
+82 -1
View File
@@ -1,8 +1,52 @@
{
"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": {
"inputs": {
"systems": "systems"
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
@@ -36,6 +80,7 @@
},
"root": {
"inputs": {
"bun2nix": "bun2nix",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
@@ -54,6 +99,42 @@
"repo": "default",
"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",
+21 -22
View File
@@ -4,48 +4,49 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
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
} @ inputs: (
nixpkgs.lib.recursiveUpdate
(
flake-utils.lib.eachSystem
[
"x86_64-linux"
"aarch64-linux"
]
(
system:
let
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
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
[
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
[ ];
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)
);
@@ -69,8 +70,7 @@
# packageSets = lib.filterAttrsRecursive (k: v: v != null && k != "override") (
# lib.mapAttrs (name: pkg: recursePackageSets pkg) scope
# );
in
{
in {
overlays = final: prev: flatPackages;
packages = flatPackages;
checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages;
@@ -82,8 +82,7 @@
)
{
overlays = {
default =
final: prev: ((import "${nixpkgs}/pkgs/top-level/by-name-overlay.nix" ./pkgs/by-name) final prev);
default = final: prev: ((import "${nixpkgs}/pkgs/top-level/by-name-overlay.nix" ./pkgs/by-name) final prev);
};
}
);
+4
View File
@@ -49,3 +49,7 @@ fetch.github = "Slush97/grimoire"
src.github = "Slush97/vpkmerge"
fetch.github = "Slush97/vpkmerge"
cargo_lock = ["Cargo.lock"]
[oh-my-pi]
src.github = "can1357/oh-my-pi"
fetch.github = "can1357/oh-my-pi"
+6 -4
View File
@@ -15,6 +15,7 @@
sqlite,
callPackage,
makeDesktopItem,
copyDesktopItems,
}: let
sources = callPackage ../../../../_sources/generated.nix {};
@@ -38,10 +39,10 @@
desktopItem = makeDesktopItem {
name = "grimoire";
exec = "$out/bin/grimoire %u";
exec = "/bin/grimoire %u";
desktopName = "Grimoire";
categories = ["Utility"];
MimeType = "x-scheme-handler/grimoire";
mimeTypes = ["x-scheme-handler/grimoire"];
};
in
stdenv.mkDerivation {
@@ -58,8 +59,11 @@ in
pkg-config
makeWrapper
electron_40
copyDesktopItems
];
desktopItems = [desktopItem];
buildInputs = [
sqlite
];
@@ -121,8 +125,6 @@ in
--set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
--set NODE_ENV production
cp ${desktopItem}/share/applications/grimoire.desktop $out/share/applications/grimoire.desktop
runHook postInstall
'';
File diff suppressed because it is too large Load Diff
+38
View File
@@ -0,0 +1,38 @@
{
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";
};
}