X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fwebapps%2Fdefault.nix;h=fdf26515e81664125afaa1fc52e9ef2af88777e6;hb=4b0a82cc2f4597a11b9275cf156ae9cceffaf44f;hp=25425757e58bf0033bfb98144b0367b383c8611d;hpb=8a04ee0919035f89c3e12044f077bc438f0d0a46;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 2542575..fdf2651 100644
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, mylibs, composerEnv, lib, private }:
+{ callPackage, mylibs, composerEnv, lib }:
 rec {
   adminer = callPackage ./adminer {};
   apache-theme = callPackage ./apache-theme {};
@@ -15,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 {};
 
@@ -67,6 +53,8 @@ rec {
       (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; };
 
@@ -111,4 +99,4 @@ rec {
   in
     lib.attrsets.genAttrs names
       (name: callPackage (./yourls/plugins + "/${name}") { inherit mylibs; });
-} // private.webapps
+}