From 4b0a82cc2f4597a11b9275cf156ae9cceffaf44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 4 May 2020 00:12:46 +0200 Subject: Fix some etherpad-lite modules and packaging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- pkgs/webapps/default.nix | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'pkgs/webapps/default.nix') diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix index 05172a9..fdf2651 100644 --- a/pkgs/webapps/default.nix +++ b/pkgs/webapps/default.nix @@ -15,23 +15,6 @@ 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" - "ep_delete_empty_pads" "ep_mypads" - ]; - 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; }; -- cgit v1.2.3