Move buildbot plugin buildslist to pkgs

[perso/Immae/Config/Nix.git] / pkgs / default.nix

diff --git a/pkgs/default.nix b/pkgs/default.nix
index c407a75622b9edaaeae3adeeb63bae043e71dce4..26b32e1ba3e72d33d16cd41ca7401d1301585134 100644 (file)
--- 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 {};
@@ -36,5 +37,15 @@ in
 
   bitlbee-mastodon = callPackage ./bitlbee-mastodon {};
 
-  webapps = callPackage ./webapps { inherit mylibs; };
+  composerEnv = callPackage ./composer-env {};
+  webapps = callPackage ./webapps { inherit mylibs composerEnv; };
+
+  private = if builtins.pathExists (./. + "/private")
+    then import ./private { inherit pkgs; }
+    else { webapps = {}; };
+
+  python3PackagesPlus = callPackage ./python-packages {
+    python = python3;
+    inherit mylibs;
+  };
 }