Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
3525cbfbe6
|
|||
|
80985b89d4
|
|||
|
e23169c699
|
|||
| 5ae28029ef | |||
| 142a4e46cb |
@@ -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",
|
||||
|
||||
@@ -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
@@ -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",
|
||||
|
||||
@@ -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,21 +70,19 @@
|
||||
# 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;
|
||||
devShells.default = pkgs.mkShellNoCC {
|
||||
packages = [ pkgs.nvfetcher ];
|
||||
packages = [pkgs.nvfetcher];
|
||||
};
|
||||
}
|
||||
)
|
||||
)
|
||||
{
|
||||
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);
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
vpkmerge,
|
||||
sqlite,
|
||||
callPackage,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
}: let
|
||||
sources = callPackage ../../../../_sources/generated.nix {};
|
||||
|
||||
@@ -34,6 +36,14 @@
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "grimoire";
|
||||
exec = "/bin/grimoire %u";
|
||||
desktopName = "Grimoire";
|
||||
categories = ["Utility"];
|
||||
mimeTypes = ["x-scheme-handler/grimoire"];
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "grimoire";
|
||||
@@ -49,8 +59,11 @@ in
|
||||
pkg-config
|
||||
makeWrapper
|
||||
electron_40
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
desktopItems = [desktopItem];
|
||||
|
||||
buildInputs = [
|
||||
sqlite
|
||||
];
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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";
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user