X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=pkgs%2Fwebapps%2Fdefault.nix;h=68604f59256e51013aeac3cb95ee5dd62622d4c8;hp=3b9cadfae475db6834f757d640daef0a4b4b4475;hb=db343436f0e678ef3a97e6f8ac559ffa0507e422;hpb=7da817e32f5e285f5fe09726f6031d8c6d4c74ea

diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 3b9cadf..68604f5 100644
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,47 +1,27 @@
-{ callPackage, mylibs, lib }:
+{ callPackage, mylibs, composerEnv }:
 rec {
-  diaspora = callPackage ./diaspora { inherit mylibs; };
-
-  mastodon = callPackage ./mastodon { inherit mylibs; };
-
+  adminer = callPackage ./adminer {};
+  apache-theme = callPackage ./apache-theme {};
   awl = callPackage ./awl {};
   davical = callPackage ./davical {};
-
+  diaspora = callPackage ./diaspora { inherit mylibs; };
+  dokuwiki = callPackage ./dokuwiki { inherit mylibs; };
+  etherpad-lite = callPackage ./etherpad-lite {};
+  grocy = callPackage ./grocy { inherit mylibs composerEnv; };
   infcloud = callPackage ./infcloud {};
-
+  mantisbt_2 = callPackage ./mantisbt_2 {};
+  mastodon = callPackage ./mastodon { inherit mylibs; };
+  mediagoblin = callPackage ./mediagoblin { inherit mylibs; };
   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; });
-
+  peertube = callPackage ./peertube { inherit mylibs; };
+  phpbb = callPackage ./phpbb {};
   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}") {});
-
-  dokuwiki = callPackage ./dokuwiki { inherit mylibs; };
-  dokuwiki-with-plugins = dokuwiki.withPlugins (builtins.attrValues dokuwiki-plugins);
-  dokuwiki-plugins = let
-    names = [ "farmer" "todo" ];
-  in
-    lib.attrsets.genAttrs names
-      (name: callPackage (./dokuwiki/plugins + "/${name}.nix") {});
-
-  adminer = callPackage ./adminer {};
+  roundcubemail = callPackage ./roundcubemail {};
+  spip = callPackage ./spip {};
+  surfer = callPackage ./surfer { inherit mylibs; };
+  taskwarrior-web = callPackage ./taskwarrior-web { inherit mylibs; };
+  ttrss = callPackage ./ttrss {};
+  wallabag = callPackage ./wallabag { inherit composerEnv; };
+  yourls = callPackage ./yourls { inherit mylibs; };
 }