7 files changed, 140 insertions, 180 deletions

diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index e3ec07f..33fd730 100644
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,92 +1,27 @@
-{ callPackage, mylibs, composerEnv, lib }:
+{ callPackage, mylibs, composerEnv }:
 rec {
   adminer = callPackage ./adminer {};
   apache-theme = callPackage ./apache-theme {};
   awl = callPackage ./awl {};
   davical = callPackage ./davical {};
   diaspora = callPackage ./diaspora { inherit mylibs; };
-
   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") {});
-
   etherpad-lite = callPackage ./etherpad-lite {};
-
   grocy = callPackage ./grocy { inherit mylibs composerEnv; };
-
   infcloud = callPackage ./infcloud {};
-
   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}") {});
-
   mastodon = callPackage ./mastodon { inherit mylibs; };
-
   mediagoblin = callPackage ./mediagoblin { inherit mylibs; };
-  mediagoblin-with-plugins = mediagoblin.withPlugins (builtins.attrValues mediagoblin-plugins);
-  mediagoblin-plugins = let
-    names = [ "basicsearch" ];
-  in
-    lib.attrsets.genAttrs names
-      (name: callPackage (./mediagoblin/plugins + "/${name}") {});
-
   nextcloud = callPackage ./nextcloud {};
-
   peertube = callPackage ./peertube { inherit mylibs; };
   phpbb = callPackage ./phpbb {};
-
   phpldapadmin = callPackage ./phpldapadmin {};
   rompr = callPackage ./rompr { inherit mylibs; };
-
   roundcubemail = callPackage ./roundcubemail {};
-  roundcubemail-with-plugins-skins = roundcubemail.withPlugins (builtins.attrValues roundcubemail-plugins) (builtins.attrValues roundcubemail-skins);
-  roundcubemail-skins = let
-    names = [];
-  in
-    lib.attrsets.genAttrs names
-      (name: callPackage (./roundcubemail/skins + "/${name}") {});
-  roundcubemail-plugins = let
-    names = [
-      "automatic_addressbook" "carddav" "contextmenu"
-      "contextmenu_folder" "html5_notifier" "ident_switch"
-      "message_highlight" "thunderbird_labels"
-    ];
-  in
-    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
-    names = [ "auth_ldap" "af_feedmod" "feediron" "ff_instagram" "tumblr_gdpr_ua" ];
-    patched = [ "af_feedmod" "feediron" ];
-  in
-    lib.attrsets.genAttrs names
-      (name: callPackage (./ttrss/plugins + "/${name}") (
-        { inherit mylibs; } //
-        (if builtins.elem name patched then { patched = true; } else {})
-        )
-      );
-
   wallabag = callPackage ./wallabag { inherit composerEnv; };
   yourls = callPackage ./yourls { inherit mylibs; };
-  yourls-with-plugins = yourls.withPlugins (builtins.attrValues yourls-plugins);
-  yourls-plugins = let
-    names = [ "ldap" ];
-  in
-    lib.attrsets.genAttrs names
-      (name: callPackage (./yourls/plugins + "/${name}") { inherit mylibs; });
 }
diff --git a/pkgs/webapps/dokuwiki/default.nix b/pkgs/webapps/dokuwiki/default.nix
index 9df88c6..874f0d8 100644
--- a/pkgs/webapps/dokuwiki/default.nix
+++ b/pkgs/webapps/dokuwiki/default.nix
@@ -1,4 +1,4 @@
-{ varDir ? "/var/lib/dokuwiki", preload ? "", lib, stdenv, mylibs, writeText }:
+{ varDir ? "/var/lib/dokuwiki", preload ? "", lib, callPackage, stdenv, mylibs, writeText }:
 let
   preloadFile = plugins: let preloads = [preload]
       ++ builtins.concatMap (p: lib.optional (lib.hasAttr "preload" p) (p.preload p)) plugins;
@@ -6,21 +6,26 @@ let
       <?php
       '' + builtins.concatStringsSep "\n" preloads
     );
-  withPlugins = plugins: package.overrideAttrs(old: {
-    name = "${old.name}-with-plugins";
-    installPhase = old.installPhase + (
-      builtins.concatStringsSep "\n" (
-        map (value: "ln -sf ${value} $out/lib/plugins/${value.pluginName}") plugins
-        )
-      );
-    installPreloadPhase = ''
-      cp ${preloadFile plugins} $out/inc/preload.php
-      '';
-    passthru = old.passthru // {
-      inherit plugins;
-      withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
-    };
-  });
+  pluginNames = [ "farmer" "todo" ];
+  allPlugins = lib.attrsets.genAttrs pluginNames
+    (name: callPackage (./plugins + "/${name}.nix") {});
+  toPassthru = pkg: plugins: {
+    inherit plugins varDir allPlugins;
+    withPlugins = withPlugins pkg;
+  };
+  withPlugins = pkg: toPlugins:
+    let
+      plugins = toPlugins allPlugins;
+      toInstallPlugin = n:
+        "ln -sf ${n} $out/lib/plugins/${n.pluginName}";
+      newDokuwiki = pkg.overrideAttrs(old: {
+        installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallPlugin plugins);
+        installPreloadPhase = ''
+          cp ${preloadFile (pkg.plugins ++ plugins)} $out/inc/preload.php
+        '';
+        passthru = toPassthru newDokuwiki (pkg.plugins ++ plugins);
+      });
+    in newDokuwiki;
   package = stdenv.mkDerivation (mylibs.fetchedGithub ./dokuwiki.json // rec {
     phases = "unpackPhase buildPhase installPhase installPreloadPhase fixupPhase";
     buildPhase = ''
@@ -35,9 +40,6 @@ let
     installPreloadPhase = ''
       cp ${preloadFile []} $out/inc/preload.php
       '';
-    passthru = {
-      plugins = [];
-      inherit withPlugins varDir;
-    };
+    passthru = toPassthru package [];
   });
 in package
diff --git a/pkgs/webapps/mantisbt_2/default.nix b/pkgs/webapps/mantisbt_2/default.nix
index bb2aad3..5aa04d1 100644
--- a/pkgs/webapps/mantisbt_2/default.nix
+++ b/pkgs/webapps/mantisbt_2/default.nix
@@ -1,20 +1,25 @@
-{ mantis_config ? "/etc/mantisbt/config_inc.php", stdenv, fetchurl }:
+{ mantis_config ? "/etc/mantisbt/config_inc.php", stdenv, fetchurl, lib, callPackage}:
 let
-  withPlugins = plugins: package.overrideAttrs(old: {
-    name = "${old.name}-with-plugins";
-    installPhase = old.installPhase + (
-      builtins.concatStringsSep "\n" (
-        map (value: if builtins.hasAttr "selector" value then
-            "ln -sf ${value}/${value.selector} $out/plugins/"
-          else
-            "ln -sf ${value} $out/plugins/${value.pluginName}"
-        ) plugins
-      ));
-    passthru = old.passthru // {
-      inherit plugins;
-      withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
-    };
-  });
+  pluginNames = [ "slack" "source-integration" ];
+  allPlugins = lib.attrsets.genAttrs pluginNames
+    (name: callPackage (./plugins + "/${name}") {});
+  toPassthru = pkg: plugins: {
+    inherit plugins allPlugins;
+    withPlugins = withPlugins pkg;
+  };
+  withPlugins = pkg: toPlugins:
+    let
+      plugins = toPlugins allPlugins;
+      toInstallPlugin = n:
+        if builtins.hasAttr "selector" n then
+          "ln -sf ${n}/${n.selector} $out/plugins/"
+        else
+          "ln -sf ${n} $out/plugins/${n.pluginName}";
+      newMantisbt = pkg.overrideAttrs(old: {
+        installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallPlugin plugins);
+        passthru = toPassthru newMantisbt (pkg.plugins ++ plugins);
+      });
+    in newMantisbt;
   package = stdenv.mkDerivation rec {
     name = "mantisbt-${version}";
     version = "2.21.0";
@@ -33,9 +38,6 @@ let
     ln -s ${mantis_config} $out/config/config_inc.php
     '';
 
-    passthru = {
-      plugins = [];
-      inherit withPlugins;
-    };
+    passthru = toPassthru package [];
   };
 in package
diff --git a/pkgs/webapps/mediagoblin/default.nix b/pkgs/webapps/mediagoblin/default.nix
index c20bcb4..d348ce1 100644
--- a/pkgs/webapps/mediagoblin/default.nix
+++ b/pkgs/webapps/mediagoblin/default.nix
@@ -1,4 +1,4 @@
-{ makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages }:
+{ makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage }:
 let
   overridePython = let
     packageOverrides = self: super: {
@@ -113,18 +113,22 @@ let
     generated = ./bower-packages.nix;
     src = (mylibs.fetchedGit ./mediagoblin.json).src;
   };
-  withPlugins = plugins: package.overrideAttrs(old: {
-    name = "${old.name}-with-plugins";
-    postBuild = old.postBuild + (
-      builtins.concatStringsSep "\n" (
-        map (value: "ln -s ${value} mediagoblin/plugins/${value.pluginName}") plugins
-        )
-      );
-    passthru = old.passthru // {
-      inherit plugins;
-      withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
-    };
-  });
+  pluginNames = [ "basicsearch" ];
+  allPlugins = lib.attrsets.genAttrs pluginNames
+    (name: callPackage (./plugins + "/${name}") {});
+  toPassthru = pkg: {
+    inherit allPlugins;
+    withPlugins = withPlugins pkg;
+  };
+  withPlugins = pkg: toPlugins:
+    let
+      plugins = toPlugins allPlugins;
+      toBuildPlugin = n: "ln -s ${n} mediagoblin/plugins/${n.pluginName}";
+      newMediagoblin = pkg.overrideAttrs(old: {
+        postBuild = old.postBuild + "\n" + builtins.concatStringsSep "\n" (map toBuildPlugin plugins);
+        passthru = toPassthru newMediagoblin;
+      });
+    in newMediagoblin;
   package = stdenv.mkDerivation (mylibs.fetchedGit ./mediagoblin.json // rec {
     preConfigure = ''
       # ./bootstrap.sh
@@ -173,9 +177,6 @@ let
       '';
     buildInputs = [ makeWrapper automake autoconf which nodePackages.bower nodejs python ];
     propagatedBuildInputs = with gst_all_1; [ python gst-libav gst-plugins-good gst-plugins-bad gst-plugins-ugly gstreamer ];
-    passthru = {
-      plugins = [];
-      inherit withPlugins;
-    };
+    passthru = toPassthru package;
   });
 in package
diff --git a/pkgs/webapps/roundcubemail/default.nix b/pkgs/webapps/roundcubemail/default.nix
index 4f288b8..2b22b29 100644
--- a/pkgs/webapps/roundcubemail/default.nix
+++ b/pkgs/webapps/roundcubemail/default.nix
@@ -1,6 +1,6 @@
 { varDir ? "/var/lib/roundcubemail"
 , roundcube_config ? "/etc/roundcube/config.php"
-, stdenv, fetchurl, jre, unzip }:
+, stdenv, fetchurl, jre, unzip, lib, callPackage }:
 let
   defaultInstall = ''
     mkdir -p $out
@@ -19,20 +19,39 @@ let
       src = fetchurl { inherit url sha256; };
       passthru.pluginName = appName;
     };
-  withPlugins = plugins: skins: package.overrideAttrs(old: {
-    name = "${old.name}${if builtins.length skins > 0 then "-with-skins" else ""}${if builtins.length plugins > 0 then "-with-plugins" else ""}";
-    installPhase = old.installPhase +
-      builtins.concatStringsSep "\n" (
-        map (value: "ln -s ${value} $out/plugins/${value.pluginName}") plugins
-      ) +
-      builtins.concatStringsSep "\n" (
-        map (value: "ln -s ${value} $out/skins/${value.skinName}") skins
-      );
-    passthru = old.passthru // {
-      inherit plugins skins;
-      withPlugins = morePlugins: moreSkins: old.withPlugins (morePlugins ++ plugins) (morePlugins ++ skins);
-    };
-  });
+  skinNames = [];
+  allSkins = lib.attrsets.genAttrs skinNames
+    (name: callPackage (./skins + "/${name}") {});
+  pluginNames = [
+    "automatic_addressbook" "carddav" "contextmenu"
+    "contextmenu_folder" "html5_notifier" "ident_switch"
+    "message_highlight" "thunderbird_labels"
+  ];
+  allPlugins = lib.attrsets.genAttrs pluginNames
+    (name: callPackage (./plugins + "/${name}") { inherit buildPlugin; });
+  toPassthru = pkg: plugins: skins: {
+    inherit plugins skins allSkins allPlugins;
+    withSkins = withSkins pkg;
+    withPlugins = withPlugins pkg;
+  };
+  withPlugins = pkg: toPlugins:
+    let
+      plugins = toPlugins allPlugins;
+      toInstallPlugin = n: "ln -s ${n} $out/plugins/${n.pluginName}";
+      newRoundcube = pkg.overrideAttrs(old: {
+        installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallPlugin plugins);
+        passthru = toPassthru newRoundcube (pkg.plugins ++ plugins) pkg.skins;
+      });
+    in newRoundcube;
+  withSkins = pkg: toSkins:
+    let
+      skins = toSkins allSkins;
+      toInstallSkin = n: "ln -s ${n} $out/skins/${n.skinName}";
+      newRoundcube = pkg.overrideAttrs(old: {
+        installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallSkin skins);
+        passthru = toPassthru newRoundcube pkg.plugins (pkg.skins ++ skins);
+      });
+    in newRoundcube;
   shrinker = fetchurl {
     url = "http://dl.google.com/closure-compiler/compiler-latest.zip";
     sha256 = "0naf3kflhlkm17ls1x7mgddd3b01f8yzbbbdjqwy5m12jmkzl2d5";
@@ -61,10 +80,6 @@ let
       cp -a . $out
       ln -s ${roundcube_config} $out/config/config.inc.php
     '';
-    passthru = {
-      plugins = [];
-      skins = [];
-      inherit withPlugins buildPlugin;
-    };
+    passthru = toPassthru package [] [];
   };
 in package
diff --git a/pkgs/webapps/ttrss/default.nix b/pkgs/webapps/ttrss/default.nix
index 0ce2f94..38200a1 100644
--- a/pkgs/webapps/ttrss/default.nix
+++ b/pkgs/webapps/ttrss/default.nix
@@ -1,30 +1,33 @@
 { ttrss_config ? "/etc/ttrss/config.php"
 , varDir ? "/var/lib/ttrss"
-, stdenv, mylibs }:
+, stdenv, mylibs, lib, callPackage }:
 let
-  withPlugins = plugins: package.overrideAttrs(old: rec {
-    name = "${old.name}-with-plugins";
-    installPhase = old.installPhase +
-      builtins.concatStringsSep "\n" (
-        map (value: "ln -s ${value} $out/plugins/${value.pluginName}") plugins
-      );
-    passthru = old.passthru // {
-      inherit plugins;
-      withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
-    };
-  });
+  pluginNames = [ "auth_ldap" "af_feedmod" "feediron" "ff_instagram" "tumblr_gdpr_ua" ];
+  allPlugins = lib.attrsets.genAttrs pluginNames
+    (name: callPackage (./plugins + "/${name}") {});
+  toPassthru = pkg: plugins: {
+    inherit plugins allPlugins;
+    withPlugins = withPlugins pkg;
+  };
+  withPlugins = pkg: toPlugins:
+    let
+      plugins = toPlugins allPlugins;
+      toInstallPlugin = n:
+        "ln -sf ${n} $out/plugins/${n.pluginName}";
+      newTtrss = pkg.overrideAttrs(old: {
+        installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallPlugin plugins);
+        passthru = toPassthru newTtrss (pkg.plugins ++ plugins);
+      });
+    in newTtrss;
   package = stdenv.mkDerivation (mylibs.fetchedGit ./tt-rss.json // rec {
     buildPhase = ''
       rm -rf lock feed-icons cache
       ln -sf ${varDir}/{lock,feed-icons,cache} .
-      '';
-      installPhase = ''
-        cp -a . $out
-        ln -s ${ttrss_config} $out/config.php
-      '';
-    passthru = {
-      plugins = [];
-      inherit withPlugins;
-    };
+    '';
+    installPhase = ''
+      cp -a . $out
+      ln -s ${ttrss_config} $out/config.php
+    '';
+    passthru = toPassthru package [];
   });
 in package
diff --git a/pkgs/webapps/yourls/default.nix b/pkgs/webapps/yourls/default.nix
index 4bcfa4c..d940c54 100644
--- a/pkgs/webapps/yourls/default.nix
+++ b/pkgs/webapps/yourls/default.nix
@@ -1,16 +1,21 @@
-{ yourls_config ? "/etc/yourls/config.php", mylibs, stdenv }:
+{ yourls_config ? "/etc/yourls/config.php", mylibs, callPackage, lib, stdenv }:
 let
-  withPlugins = plugins: package.overrideAttrs(old: {
-    name = "${old.name}-with-plugins";
-    installPhase = old.installPhase +
-      builtins.concatStringsSep "\n" (
-        map (value: "ln -s ${value} $out/user/plugins/${value.pluginName}") plugins
-      );
-    passthru = old.passthru // {
-      inherit plugins;
-      withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
-    };
-  });
+  pluginNames = [ "ldap" ];
+  allPlugins = lib.attrsets.genAttrs pluginNames
+    (name: callPackage (./plugins + "/${name}") { inherit mylibs; });
+  toPassthru = pkg: plugins: {
+    inherit plugins allPlugins;
+    withPlugins = withPlugins pkg;
+  };
+  withPlugins = pkg: toPlugins:
+    let
+      plugins = toPlugins allPlugins;
+      toInstallPlugin = n: "ln -s ${n} $out/user/plugins/${n.pluginName}";
+      newYourls = pkg.overrideAttrs(old: {
+        installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallPlugin plugins);
+        passthru = toPassthru newYourls (pkg.plugins ++ plugins);
+      });
+    in newYourls;
   package = stdenv.mkDerivation (mylibs.fetchedGithub ./yourls.json // rec {
     installPhase = ''
       mkdir -p $out
@@ -18,9 +23,6 @@ let
       cp sample-robots.txt $out/robots.txt
       ln -sf ${yourls_config} $out/includes/config.php
     '';
-    passthru = {
-      plugins = [];
-      inherit withPlugins;
-    };
+    passthru = toPassthru package [];
   });
 in package