X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fpackages.nix;h=f3689b612d63e83b53739e3a5284b66e1f10df1e;hb=5c101474d350289370105c99bbf65f8bb3a4ef39;hp=a115693c374da6382957b933c6c8fceb0f43d7b4;hpb=91493dc0e93b89a24617738ca466e12957143eb0;p=perso%2FImmae%2FConfig%2FNix.git

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;