From c357cfa29f5e7938e00d5194232b4604843c935d Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 8 Apr 2025 22:13:46 +0200 Subject: [PATCH] chore(lib/buildClan): remove dependencies {nixpkgs,nix-darwin} from the clanLib file --- lib/build-clan/default.nix | 5 +++-- lib/default.nix | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix index baa43bbd9..02e74aa99 100644 --- a/lib/build-clan/default.nix +++ b/lib/build-clan/default.nix @@ -3,8 +3,6 @@ ## Add any logic to ./module.nix { lib, - nixpkgs, - nix-darwin ? null, ... }: { @@ -35,7 +33,10 @@ buildClanWith = { clan-core, + # TODO: Below should be module options such that the user can override them? + nixpkgs, publicAttrs ? import ./public.nix, + nix-darwin ? null, }: { ## Inputs diff --git a/lib/default.nix b/lib/default.nix index fc01e3ffe..f6b038528 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -15,11 +15,14 @@ lib.fix (clanLib: { */ 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 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 { }; modules = clanLib.callLib ./inventory/frontmatter { };