From 4d7cf46c341ca828bb0258524878739a7bf2376d Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Wed, 6 Aug 2025 13:58:07 -0600
Subject: [PATCH] doctrine/lib: refactor 'close' helper

---
 doctrine/lib/default.nix   | 16 +++++++++++++---
 doctrine/lib/importAll.nix |  3 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/doctrine/lib/default.nix b/doctrine/lib/default.nix
index 1b03fe1..331141d 100644
--- a/doctrine/lib/default.nix
+++ b/doctrine/lib/default.nix
@@ -3,8 +3,18 @@
   doctrine,
   pkgs,
 }: let
-  close = f: args: f (args // {inherit lib pkgs doctrine;});
+  close = vars: f: args:
+    (
+      if builtins.isPath f
+      then import f
+      else f
+    )
+    (args // {inherit lib pkgs doctrine;});
+
+  closeLib = close {inherit lib;};
+  closeFull = close {inherit lib pkgs doctrine;};
 in {
-  importAll = pkgs.callPackage ./importAll.nix {};
-  mkModule = close (import ./mk-module.nix);
+  inherit close;
+  importAll = closeLib ./importAll.nix;
+  mkModule = closeFull ./mk-module.nix;
 }
diff --git a/doctrine/lib/importAll.nix b/doctrine/lib/importAll.nix
index 03c5330..423dd9c 100644
--- a/doctrine/lib/importAll.nix
+++ b/doctrine/lib/importAll.nix
@@ -1,4 +1,5 @@
-{lib}: {
+{
+  lib,
   root,
   exclude ? ["default"],
 }: