Rename davical config field to avoid clash

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

diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 6afccde8865314b5c59f51532ed7f7b8d00403c8..109eb6db237b0f232c9f89cd29e3b677755a7869 100644 (file)
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,18 +1,37 @@
 { callPackage, mylibs, lib }:
 rec {
   diaspora = callPackage ./diaspora { inherit mylibs; };
+
   mastodon = callPackage ./mastodon { inherit mylibs; };
+
   awl = callPackage ./awl {};
   davical = callPackage ./davical {};
+
   infcloud = callPackage ./infcloud {};
+
   nextcloud = callPackage ./nextcloud {};
+  nextcloud-with-apps = nextcloud.withPlugins (builtins.attrValues nextcloud-apps);
   nextcloud-apps = let
       names = [
         "audioplayer" "bookmarks" "calendar" "contacts" "deck"
         "files_markdown" "gpxedit" "gpxpod" "keeweb" "music"
         "notes" "ocsms" "passman" "spreed" "tasks"
+        "flowupload" "carnet"
+        # FIXME: fix passman for NC 16
       ];
     in
     lib.attrsets.genAttrs names
       (name: callPackage (./nextcloud/apps + "/${name}.nix") { buildApp = nextcloud.buildApp; });
+
+  phpldapadmin = callPackage ./phpldapadmin {};
+
+  rompr = callPackage ./rompr { inherit mylibs; };
+
+  mantisbt_2 = callPackage ./mantisbt_2 {};
+  mantisbt_2-with-plugins = mantisbt_2.withPlugins (builtins.attrValues mantisbt_2-plugins);
+  mantisbt_2-plugins = let
+    names = [ "slack" "source-integration" ];
+  in
+    lib.attrsets.genAttrs names
+      (name: callPackage (./mantisbt_2/plugins + "/${name}") {});
 }