Use packages

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

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;

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 { };
 }

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 { };
 }

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 { };
 }

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 { };
 }