X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fwebapps%2Fdefault.nix;h=e3ec07f2c9d1270160a6c0cbfd308f6b4b881cdd;hb=65b715d7e4a47f00fe0fca6c4b0eaff19e874d38;hp=11bd0ce0ca02e981f9be6e3992955134eef866f9;hpb=1247e537b0c8e5ed780ab890cbce4612714a0fa7;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 11bd0ce..e3ec07f 100644
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,6 +1,7 @@
 { callPackage, mylibs, composerEnv, lib }:
 rec {
   adminer = callPackage ./adminer {};
+  apache-theme = callPackage ./apache-theme {};
   awl = callPackage ./awl {};
   davical = callPackage ./davical {};
   diaspora = callPackage ./diaspora { inherit mylibs; };
@@ -14,22 +15,8 @@ rec {
       (name: callPackage (./dokuwiki/plugins + "/${name}.nix") {});
 
   etherpad-lite = callPackage ./etherpad-lite {};
-  etherpad-lite-with-modules = etherpad-lite.withModules (builtins.attrValues etherpad-lite-modules);
-  etherpad-lite-modules = let
-    nodeEnv = callPackage mylibs.nodeEnv {};
-    names = [
-      "ep_aa_file_menu_toolbar" "ep_adminpads" "ep_align" "ep_bookmark"
-      "ep_clear_formatting" "ep_colors" "ep_copy_paste_select_all"
-      "ep_cursortrace" "ep_embedmedia" "ep_font_family" "ep_font_size"
-      "ep_headings2" "ep_ldapauth" "ep_line_height" "ep_markdown"
-      "ep_previewimages" "ep_ruler" "ep_scrollto" "ep_set_title_on_pad"
-      "ep_subscript_and_superscript" "ep_timesliderdiff"
-    ];
-  in
-    # nix files are built using node2nix -i node-packages.json
-    lib.attrsets.genAttrs names
-    (name: (callPackage (./etherpad-lite/modules + "/${name}/node-packages.nix") { inherit nodeEnv; })
-      .${name}.overrideAttrs(old: { passthru = (old.passthru or {}) // { moduleName = name; }; }));
+
+  grocy = callPackage ./grocy { inherit mylibs composerEnv; };
 
   infcloud = callPackage ./infcloud {};
 
@@ -52,18 +39,9 @@ rec {
       (name: callPackage (./mediagoblin/plugins + "/${name}") {});
 
   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; };
@@ -85,6 +63,11 @@ rec {
     lib.attrsets.genAttrs names
       (name: callPackage (./roundcubemail/plugins + "/${name}") { buildPlugin = roundcubemail.buildPlugin; });
 
+  spip = callPackage ./spip {};
+
+  surfer = callPackage ./surfer { inherit mylibs; };
+  taskwarrior-web = callPackage ./taskwarrior-web { inherit mylibs; };
+
   ttrss = callPackage ./ttrss { inherit mylibs; };
   ttrss-with-plugins = ttrss.withPlugins (builtins.attrValues ttrss-plugins);
   ttrss-plugins = let