Bubble up the imports to the main file

1 files changed, 7 insertions, 8 deletions

diff --git a/virtual/packages.nix b/virtual/packages.nix
index a115693..f3689b6 100644
--- a/virtual/packages.nix
+++ b/virtual/packages.nix
@@ -1,12 +1,11 @@
-with import ../libs.nix;
-with nixpkgs_unstable;
+{ callPackage, checkEnv, fetchedGitPrivate, fetchedGithub, gitwebOverride }:
 let
-  connexionswing = import ./packages/connexionswing.nix;
-  nextcloud = import ./packages/nextcloud.nix;
-  adminer = import ./packages/adminer.nix;
-  ympd = import ./packages/ympd.nix;
-  gitweb = import ./packages/gitweb.nix;
-  mantisbt = import ./packages/mantisbt.nix;
+  connexionswing = callPackage ./packages/connexionswing.nix { inherit checkEnv fetchedGitPrivate; };
+  nextcloud = callPackage ./packages/nextcloud.nix { inherit checkEnv; };
+  adminer = callPackage ./packages/adminer.nix {};
+  ympd = callPackage ./packages/ympd.nix {};
+  gitweb = callPackage ./packages/gitweb.nix { gitweb = gitwebOverride; };
+  mantisbt = callPackage ./packages/mantisbt.nix { inherit checkEnv fetchedGithub; };
 in
   {
     inherit adminer;