Fix some etherpad-lite modules and packaging

The upgrade to 1.8.3 broke many modules, which were patched to continue
working correctly.

This commit also reworks the module system, making it similar to
python’s withPackages.

1 files changed, 14 insertions, 1 deletions

diff --git a/modules/private/websites/tools/ether/default.nix b/modules/private/websites/tools/ether/default.nix
index a0329ef..3350a4a 100644
--- a/modules/private/websites/tools/ether/default.nix
+++ b/modules/private/websites/tools/ether/default.nix
@@ -125,6 +125,10 @@ in {
                 "defaultLang": "fr"
               }
             },
+            "ep_comments_page": {
+              "displayCommentAsIcon": true,
+              "highlightSelectedText": true
+            },
             "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"],
             "loadTest": false,
             "indentationOnNewLine": false,
@@ -152,7 +156,16 @@ in {
     ];
     services.etherpad-lite = {
       enable = true;
-      modules = builtins.attrValues pkgs.webapps.etherpad-lite-modules;
+      package = pkgs.webapps.etherpad-lite.withModules (p: [
+        p.ep_align p.ep_bookmark p.ep_colors p.ep_comments_page
+        p.ep_cursortrace p.ep_delete_empty_pads p.ep_embedmedia
+        p.ep_font_size p.ep_headings2 p.ep_immae_buttons p.ep_ldapauth
+        p.ep_line_height p.ep_markdown p.ep_mypads p.ep_page_view
+        p.ep_previewimages p.ep_ruler p.ep_scrollto
+        p.ep_set_title_on_pad p.ep_subscript_and_superscript
+        p.ep_timesliderdiff
+      ]);
+      modules = [];
       sessionKeyFile = "/var/secrets/webapps/tools-etherpad-sessionkey";
       apiKeyFile = "/var/secrets/webapps/tools-etherpad-apikey";
       configFile = "/var/secrets/webapps/tools-etherpad";