yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore(lib/buildClan): remove dependencies {nixpkgs,nix-darwin} from the clanLib file

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-04-08 22:13:46 +02:00
parent 7c955f2820
commit 059cc1e2ea
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/build-clan/default.nix
View File

@@ -3,8 +3,6 @@
## Add any logic to ./module.nix ## Add any logic to ./module.nix
{ {
lib, lib,
nixpkgs,
nix-darwin ? null,
... ...
}: }:
{ {
@@ -35,7 +33,10 @@
buildClanWith = buildClanWith =
{ {
clan-core, clan-core,
# TODO: Below should be module options such that the user can override them?
nixpkgs,
publicAttrs ? import ./public.nix, publicAttrs ? import ./public.nix,
nix-darwin ? null,
}: }:
{ {
## Inputs ## Inputs

7
lib/default.nix
View File

@@ -15,11 +15,14 @@ lib.fix (clanLib: {
*/ */
callLib = file: args: import file ({ inherit lib clanLib; } // args); callLib = file: args: import file ({ inherit lib clanLib; } // args);
buildClan = clanLib.buildClanModule.buildClanWith { clan-core = self; }; buildClan = clanLib.buildClanModule.buildClanWith {
clan-core = self;
inherit nixpkgs nix-darwin;
};
# ------------------------------------ # ------------------------------------
# ClanLib functions # ClanLib functions
evalClan = clanLib.callLib ./inventory/eval-clan-modules { }; evalClan = clanLib.callLib ./inventory/eval-clan-modules { };
buildClanModule = clanLib.callLib ./build-clan { inherit nixpkgs nix-darwin; }; buildClanModule = clanLib.callLib ./build-clan { };
inventory = clanLib.callLib ./inventory { }; inventory = clanLib.callLib ./inventory { };
modules = clanLib.callLib ./inventory/frontmatter { }; modules = clanLib.callLib ./inventory/frontmatter { };