X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fdefault.nix;h=8ea65a5ce1f6c601804eff073228686b28c73168;hb=d823e010d653a6bf33ff232da5f90103be7515b8;hp=8a991eb30f9d9cff1e8f5a59e371f6929fe98a86;hpb=1017ce8ed4eb5eef826bf7a55a132923439cd978;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 8a991eb..8ea65a5 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,8 +1,9 @@
 { pkgs }:
 with pkgs;
-let mylibs = import ../libs.nix { inherit pkgs; };
+let
+  mylibs = import ../libs.nix { inherit pkgs; };
 in
-{
+rec {
   boinctui = callPackage ../pkgs/boinctui {};
   cnagios = callPackage ../pkgs/cnagios { inherit mylibs; };
   duply = callPackage ../pkgs/duply {};
@@ -37,5 +38,14 @@ in
   bitlbee-mastodon = callPackage ./bitlbee-mastodon {};
 
   composerEnv = callPackage ./composer-env {};
-  webapps = callPackage ./webapps { inherit mylibs; };
+  webapps = callPackage ./webapps { inherit mylibs composerEnv private; };
+
+  private = if builtins.pathExists (./. + "/private")
+    then import ./private { inherit pkgs; }
+    else { webapps = {}; };
+
+  python3PackagesPlus = callPackage ./python-packages {
+    python = python3;
+    inherit mylibs;
+  };
 }