Use standard packages and move bitlbee-mastodon to pkgs for bitlbee

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

diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 94d2157b4edabde47c5b1bce1c021fa2b53d667d..7e04e8d498d4a558f365769d3a7d70365bcc80b0 100644 (file)
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,7 +1,26 @@
-{ callPackage, mylibs }:
-{
+{ 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-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 {};
 }