1
0
forked from nikkuss/pkgs

3 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
10 changed files with 2455 additions and 312 deletions
+28 -7
View File
@@ -116,12 +116,12 @@
"name": null, "name": null,
"owner": "Slush97", "owner": "Slush97",
"repo": "grimoire", "repo": "grimoire",
"rev": "v1.23.0", "rev": "v1.14.2",
"sha256": "sha256-GY1J/guggCc4fyEQKUoEHmRC8hMcSg6gBKU0maEYSPE=", "sha256": "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=",
"sparseCheckout": [], "sparseCheckout": [],
"type": "github" "type": "github"
}, },
"version": "v1.23.0" "version": "v1.14.2"
}, },
"neovide": { "neovide": {
"cargoLock": { "cargoLock": {
@@ -148,6 +148,27 @@
}, },
"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",
@@ -234,7 +255,7 @@
"vpkmerge": { "vpkmerge": {
"cargoLock": { "cargoLock": {
"Cargo.lock": [ "Cargo.lock": [
"sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=/Cargo.lock", "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock",
{} {}
] ]
}, },
@@ -250,11 +271,11 @@
"name": null, "name": null,
"owner": "Slush97", "owner": "Slush97",
"repo": "vpkmerge", "repo": "vpkmerge",
"rev": "v0.19.0", "rev": "v0.7.0",
"sha256": "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=", "sha256": "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f/H8=",
"sparseCheckout": [], "sparseCheckout": [],
"type": "github" "type": "github"
}, },
"version": "v0.19.0" "version": "v0.7.0"
} }
} }
+18 -7
View File
@@ -69,13 +69,13 @@
}; };
grimoire = { grimoire = {
pname = "grimoire"; pname = "grimoire";
version = "v1.23.0"; version = "v1.14.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Slush97"; owner = "Slush97";
repo = "grimoire"; repo = "grimoire";
rev = "v1.23.0"; rev = "v1.14.2";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-GY1J/guggCc4fyEQKUoEHmRC8hMcSg6gBKU0maEYSPE="; sha256 = "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=";
}; };
}; };
neovide = { neovide = {
@@ -98,6 +98,17 @@
}; };
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";
@@ -147,16 +158,16 @@
}; };
vpkmerge = { vpkmerge = {
pname = "vpkmerge"; pname = "vpkmerge";
version = "v0.19.0"; version = "v0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Slush97"; owner = "Slush97";
repo = "vpkmerge"; repo = "vpkmerge";
rev = "v0.19.0"; rev = "v0.7.0";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw="; sha256 = "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f/H8=";
}; };
cargoLock."Cargo.lock" = { cargoLock."Cargo.lock" = {
lockFile = ./. + "/sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=/Cargo.lock"; lockFile = ./. + "/sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock";
outputHashes = { outputHashes = {
}; };
@@ -8,23 +8,6 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
[[package]]
name = "adler32"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
[[package]]
name = "ahash"
version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
dependencies = [
"getrandom 0.2.17",
"once_cell",
"version_check",
]
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "1.1.4" version = "1.1.4"
@@ -553,25 +536,6 @@ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
[[package]]
name = "crossbeam-deque"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
dependencies = [
"crossbeam-epoch",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-epoch"
version = "0.9.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
dependencies = [
"crossbeam-utils",
]
[[package]] [[package]]
name = "crossbeam-utils" name = "crossbeam-utils"
version = "0.8.21" version = "0.8.21"
@@ -852,12 +816,6 @@ version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
[[package]]
name = "either"
version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
[[package]] [[package]]
name = "embed-resource" name = "embed-resource"
version = "3.0.9" version = "3.0.9"
@@ -911,32 +869,6 @@ version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
[[package]]
name = "fbxcel"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f9e966e38cb462819635792e0a9ee1d6cc5fff9bcdbf7baefb350221a7ae3df"
dependencies = [
"indextree",
"libflate",
"log",
"string-interner",
]
[[package]]
name = "fbxcel-dom"
version = "0.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84d1dcac5735ee4aa4b56758ae8446c55ee6f00b2041e31f5303c338b8e0ec6a"
dependencies = [
"anyhow",
"fbxcel",
"log",
"mint",
"rgb",
"string-interner",
]
[[package]] [[package]]
name = "fdeflate" name = "fdeflate"
version = "0.3.7" version = "0.3.7"
@@ -1441,15 +1373,6 @@ dependencies = [
"zerocopy", "zerocopy",
] ]
[[package]]
name = "hashbrown"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
dependencies = [
"ahash",
]
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.12.3" version = "0.12.3"
@@ -1774,30 +1697,6 @@ dependencies = [
"serde_core", "serde_core",
] ]
[[package]]
name = "indextree"
version = "4.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cee462cd93b03891663339b59a21246cc5fc2cc95060d0bb5059e25cd50edc4"
dependencies = [
"indextree-macros",
]
[[package]]
name = "indextree-macros"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f85dac6c239acc85fd61934c572292d93adfd2de459d9c032aa22b553506e915"
dependencies = [
"either",
"itertools",
"proc-macro2",
"quote",
"strum",
"syn 2.0.117",
"thiserror 2.0.18",
]
[[package]] [[package]]
name = "infer" name = "infer"
version = "0.19.0" version = "0.19.0"
@@ -1844,15 +1743,6 @@ dependencies = [
"num_cpus", "num_cpus",
] ]
[[package]]
name = "itertools"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
dependencies = [
"either",
]
[[package]] [[package]]
name = "itoa" name = "itoa"
version = "1.0.18" version = "1.0.18"
@@ -2022,26 +1912,6 @@ dependencies = [
"pkg-config", "pkg-config",
] ]
[[package]]
name = "libflate"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18"
dependencies = [
"adler32",
"crc32fast",
"libflate_lz77",
]
[[package]]
name = "libflate_lz77"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf"
dependencies = [
"rle-decode-fast",
]
[[package]] [[package]]
name = "libloading" name = "libloading"
version = "0.7.4" version = "0.7.4"
@@ -2142,12 +2012,6 @@ dependencies = [
"simd-adler32", "simd-adler32",
] ]
[[package]]
name = "mint"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
[[package]] [[package]]
name = "mio" name = "mio"
version = "1.2.0" version = "1.2.0"
@@ -2161,7 +2025,7 @@ dependencies = [
[[package]] [[package]]
name = "morphic" name = "morphic"
version = "0.10.0" version = "0.3.0"
dependencies = [ dependencies = [
"bcdec_rs", "bcdec_rs",
"bitflags 2.11.1", "bitflags 2.11.1",
@@ -2173,7 +2037,6 @@ dependencies = [
"image", "image",
"intel_tex_2", "intel_tex_2",
"lz4_flex", "lz4_flex",
"rayon",
"ruzstd", "ruzstd",
"serde", "serde",
"serde_json", "serde_json",
@@ -2798,26 +2661,6 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
[[package]]
name = "rayon"
version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
dependencies = [
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
dependencies = [
"crossbeam-deque",
"crossbeam-utils",
]
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.5.18" version = "0.5.18"
@@ -2945,21 +2788,6 @@ dependencies = [
"windows-sys 0.60.2", "windows-sys 0.60.2",
] ]
[[package]]
name = "rgb"
version = "0.8.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47b34b781b31e5d73e9fbc8689c70551fd1ade9a19e3e28cfec8580a79290cc4"
dependencies = [
"bytemuck",
]
[[package]]
name = "rle-decode-fast"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
[[package]] [[package]]
name = "rustc-hash" name = "rustc-hash"
version = "2.1.2" version = "2.1.2"
@@ -3362,16 +3190,6 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
[[package]]
name = "string-interner"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91e2531d8525b29b514d25e275a43581320d587b86db302b9a7e464bac579648"
dependencies = [
"cfg-if",
"hashbrown 0.11.2",
]
[[package]] [[package]]
name = "string_cache" name = "string_cache"
version = "0.9.0" version = "0.9.0"
@@ -3402,27 +3220,6 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "strum"
version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
dependencies = [
"strum_macros",
]
[[package]]
name = "strum_macros"
version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"syn 2.0.117",
]
[[package]] [[package]]
name = "swift-rs" name = "swift-rs"
version = "1.0.7" version = "1.0.7"
@@ -4339,28 +4136,21 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]] [[package]]
name = "vpkmerge-cli" name = "vpkmerge-cli"
version = "0.19.0" version = "0.7.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
"serde", "serde",
"serde_json", "serde_json",
"tempfile",
"vpkmerge-core", "vpkmerge-core",
] ]
[[package]] [[package]]
name = "vpkmerge-core" name = "vpkmerge-core"
version = "0.19.0" version = "0.7.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"fbxcel",
"fbxcel-dom",
"gltf",
"image",
"morphic", "morphic",
"quick-xml",
"serde",
"serde_json", "serde_json",
"tempfile", "tempfile",
"valve_pak", "valve_pak",
@@ -4368,7 +4158,7 @@ dependencies = [
[[package]] [[package]]
name = "vpkmerge-gui" name = "vpkmerge-gui"
version = "0.17.1" version = "0.6.0"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"half", "half",
@@ -4379,7 +4169,6 @@ dependencies = [
"tauri", "tauri",
"tauri-build", "tauri-build",
"tauri-plugin-dialog", "tauri-plugin-dialog",
"tempfile",
"valve_pak", "valve_pak",
"vpkmerge-core", "vpkmerge-core",
] ]
Generated
+82 -1
View File
@@ -1,8 +1,52 @@
{ {
"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" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@@ -36,6 +80,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"bun2nix": "bun2nix",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
@@ -54,6 +99,42 @@
"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",
+21 -22
View File
@@ -4,48 +4,49 @@
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, self,
nixpkgs, nixpkgs,
bun2nix,
flake-utils, flake-utils,
}@inputs: } @ inputs: (
(nixpkgs.lib.recursiveUpdate nixpkgs.lib.recursiveUpdate
(flake-utils.lib.eachSystem (
flake-utils.lib.eachSystem
[ [
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"
] ]
( (
system: system: let
let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [bun2nix.overlays.default];
config = { config = {
allowUnfree = true; allowUnfree = true;
}; };
}; };
inherit (pkgs) lib; inherit (pkgs) lib;
scope = lib.makeScope pkgs.newScope (final: self.overlays.default (pkgs // final) pkgs); scope = lib.makeScope pkgs.newScope (final: self.overlays.default (pkgs // final) pkgs);
recursePackage = recursePackage = name: pkg: let
name: pkg:
let
isDrv = lib.isDerivation pkg; isDrv = lib.isDerivation pkg;
isAttrs = lib.isAttrs pkg; isAttrs = lib.isAttrs pkg;
isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg; isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
in in
if !isSameSystem then if !isSameSystem
[ ] then []
else if isDrv then else if isDrv
[ then [
(lib.nameValuePair name pkg) (lib.nameValuePair name pkg)
] ]
else if isAttrs then else if isAttrs
lib.mapAttrsToList (nameNew: subPkg: recursePackage "${name}-${nameNew}" subPkg) pkg then lib.mapAttrsToList (nameNew: subPkg: recursePackage "${name}-${nameNew}" subPkg) pkg
else else [];
[ ];
flatPackages = builtins.listToAttrs ( flatPackages = builtins.listToAttrs (
lib.lists.flatten (lib.mapAttrsToList (name: pkg: recursePackage name pkg) scope) lib.lists.flatten (lib.mapAttrsToList (name: pkg: recursePackage name pkg) scope)
); );
@@ -69,8 +70,7 @@
# packageSets = lib.filterAttrsRecursive (k: v: v != null && k != "override") ( # packageSets = lib.filterAttrsRecursive (k: v: v != null && k != "override") (
# lib.mapAttrs (name: pkg: recursePackageSets pkg) scope # lib.mapAttrs (name: pkg: recursePackageSets pkg) scope
# ); # );
in in {
{
overlays = final: prev: flatPackages; overlays = final: prev: flatPackages;
packages = flatPackages; packages = flatPackages;
checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages; checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages;
@@ -82,8 +82,7 @@
) )
{ {
overlays = { overlays = {
default = default = final: prev: ((import "${nixpkgs}/pkgs/top-level/by-name-overlay.nix" ./pkgs/by-name) final prev);
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" 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"
+2 -2
View File
@@ -34,12 +34,12 @@
pname = "grimoire"; pname = "grimoire";
inherit version src; inherit version src;
fetcherVersion = 3; fetcherVersion = 3;
hash = "sha256-X7KLUag9HPHVit0l/tA3BxQZ2/Cj0A5KiG4Oevx2268="; hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
}; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "grimoire"; name = "grimoire";
exec = "grimoire %u"; exec = "/bin/grimoire %u";
desktopName = "Grimoire"; desktopName = "Grimoire";
categories = ["Utility"]; categories = ["Utility"];
mimeTypes = ["x-scheme-handler/grimoire"]; mimeTypes = ["x-scheme-handler/grimoire"];
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";
};
}
@@ -27,11 +27,11 @@ stdenv.mkDerivation (
rec { rec {
name = "x1e80100-firmware"; name = "x1e80100-firmware";
version = "26100_26.053.36539.0"; version = "26100_26.033.32430.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-ZrbhrOfl8BvFks1MmueKowu7DgSrV0kc0D7CqqbhIps="; hash = "sha256-KyHgMGk/oytVctE5AhdXer+x7mJk2uP8Vgc7v78wSRc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
msitools msitools