From ea2f3f292bb3025e785f5d39504d4d6366b762e3 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Sun, 17 Aug 2025 12:43:44 +0300
Subject: [PATCH] Use packages

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 flake.nix                     | 9 ++++++++-
 lib/default.nix               | 7 +++++--
 lib/fetchers/default.nix      | 5 ++++-
 lib/runtime/default.nix       | 5 ++++-
 lib/runtime/merge/default.nix | 5 ++++-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 99fcaaf..5130f3a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,7 +22,14 @@
         treefmt = inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
       in
       {
-        lib.${system} = import ./lib { inherit pkgs; };
+        packages.${system} =
+          let
+            lib = import ./lib { inherit pkgs; };
+          in
+          {
+            inherit lib;
+            default = lib;
+          };
 
         formatter.${system} = treefmt.config.build.wrapper;
         checks.${system}.formatting = treefmt.config.build.check inputs.self;
diff --git a/lib/default.nix b/lib/default.nix
index 8f17b57..f613ba1 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,5 +1,8 @@
 { pkgs, ... }:
+let
+  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
+in
 {
-  fetchers = import ./fetchers { inherit pkgs; };
-  runtime = import ./runtime { inherit pkgs; };
+  fetchers = callPackage ./fetchers { };
+  runtime = callPackage ./runtime { };
 }
diff --git a/lib/fetchers/default.nix b/lib/fetchers/default.nix
index 2b9448f..4640293 100644
--- a/lib/fetchers/default.nix
+++ b/lib/fetchers/default.nix
@@ -1,4 +1,7 @@
 { pkgs, ... }:
+let
+  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
+in
 {
-  sshKnownHosts = import ./sshKnownHosts { inherit pkgs; };
+  sshKnownHosts = callPackage ./sshKnownHosts { };
 }
diff --git a/lib/runtime/default.nix b/lib/runtime/default.nix
index 8c9cbce..27040c2 100644
--- a/lib/runtime/default.nix
+++ b/lib/runtime/default.nix
@@ -1,4 +1,7 @@
 { pkgs, ... }:
+let
+  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
+in
 {
-  merge = import ./merge { inherit pkgs; };
+  merge = callPackage ./merge { };
 }
diff --git a/lib/runtime/merge/default.nix b/lib/runtime/merge/default.nix
index 347ec94..9324954 100644
--- a/lib/runtime/merge/default.nix
+++ b/lib/runtime/merge/default.nix
@@ -1,4 +1,7 @@
 { pkgs, ... }:
+let
+  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
+in
 {
-  keyValue = import ./keyValue { inherit pkgs; };
+  keyValue = callPackage ./keyValue { };
 }