From e6abbae25ce533e8d38a0e8318b1d5d5a35d813d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Tue, 7 May 2019 15:07:35 +0200
Subject: [PATCH] =?utf8?q?Fix=20passthru=E2=80=99s=20in=20pkgs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 pkgs/webapps/dokuwiki/default.nix    |  6 ++++--
 pkgs/webapps/mantisbt_2/default.nix  |  6 ++++--
 pkgs/webapps/mediagoblin/default.nix |  6 ++++--
 pkgs/webapps/nextcloud/default.nix   | 20 +++++++++++---------
 pkgs/webapps/yourls/default.nix      |  6 ++++--
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/pkgs/webapps/dokuwiki/default.nix b/pkgs/webapps/dokuwiki/default.nix
index 7b5d899..9df88c6 100644
--- a/pkgs/webapps/dokuwiki/default.nix
+++ b/pkgs/webapps/dokuwiki/default.nix
@@ -16,8 +16,10 @@ let
     installPreloadPhase = ''
       cp ${preloadFile plugins} $out/inc/preload.php
       '';
-    passthru.plugins = plugins;
-    passthru.withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
+    passthru = old.passthru // {
+      inherit plugins;
+      withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
+    };
   });
   package = stdenv.mkDerivation (mylibs.fetchedGithub ./dokuwiki.json // rec {
     phases = "unpackPhase buildPhase installPhase installPreloadPhase fixupPhase";
diff --git a/pkgs/webapps/mantisbt_2/default.nix b/pkgs/webapps/mantisbt_2/default.nix
index 3283a01..bb2aad3 100644
--- a/pkgs/webapps/mantisbt_2/default.nix
+++ b/pkgs/webapps/mantisbt_2/default.nix
@@ -10,8 +10,10 @@ let
             "ln -sf ${value} $out/plugins/${value.pluginName}"
         ) plugins
       ));
-    passthru.plugins = plugins;
-    passthru.withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
+    passthru = old.passthru // {
+      inherit plugins;
+      withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
+    };
   });
   package = stdenv.mkDerivation rec {
     name = "mantisbt-${version}";
diff --git a/pkgs/webapps/mediagoblin/default.nix b/pkgs/webapps/mediagoblin/default.nix
index e1ca898..643daed 100644
--- a/pkgs/webapps/mediagoblin/default.nix
+++ b/pkgs/webapps/mediagoblin/default.nix
@@ -108,8 +108,10 @@ let
         map (value: "ln -s ${value} mediagoblin/plugins/${value.pluginName}") plugins
         )
       );
-    passthru.plugins = plugins;
-    passthru.withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
+    passthru = old.passthru // {
+      inherit plugins;
+      withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
+    };
   });
   package = stdenv.mkDerivation (mylibs.fetchedGit ./mediagoblin.json // rec {
     preConfigure = ''
diff --git a/pkgs/webapps/nextcloud/default.nix b/pkgs/webapps/nextcloud/default.nix
index 0287f75..2d4eb39 100644
--- a/pkgs/webapps/nextcloud/default.nix
+++ b/pkgs/webapps/nextcloud/default.nix
@@ -19,15 +19,17 @@ let
         map (value: "ln -sf ${value} $out/apps/${value.appName}") apps
       ));
 
-    passthru.otherConfig = with lib.attrsets; with lib.lists; let
-      zipped = zipAttrs ([old.otherConfig or {}] ++ map (v: v.otherConfig) apps);
-    in
-      {
-        mimetypealiases = foldr (h: prev: prev // h) {} zipped.mimetypealiases;
-        mimetypemapping = mapAttrs (_: v: unique (flatten v)) (zipAttrs zipped.mimetypemapping);
-      };
-    passthru.apps = apps;
-    passthru.withApps = moreApps: old.withApps (moreApps ++ apps);
+    passthru = old.passthru // {
+      otherConfig = with lib.attrsets; with lib.lists; let
+        zipped = zipAttrs ([old.otherConfig or {}] ++ map (v: v.otherConfig) apps);
+      in
+        {
+          mimetypealiases = foldr (h: prev: prev // h) {} zipped.mimetypealiases;
+          mimetypemapping = mapAttrs (_: v: unique (flatten v)) (zipAttrs zipped.mimetypemapping);
+        };
+      inherit apps;
+      withApps = moreApps: old.withApps (moreApps ++ apps);
+    };
   });
 
   package = stdenv.mkDerivation rec {
diff --git a/pkgs/webapps/yourls/default.nix b/pkgs/webapps/yourls/default.nix
index cc880cd..4bcfa4c 100644
--- a/pkgs/webapps/yourls/default.nix
+++ b/pkgs/webapps/yourls/default.nix
@@ -6,8 +6,10 @@ let
       builtins.concatStringsSep "\n" (
         map (value: "ln -s ${value} $out/user/plugins/${value.pluginName}") plugins
       );
-    passthru.plugins = plugins;
-    passthru.withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
+    passthru = old.passthru // {
+      inherit plugins;
+      withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
+    };
   });
   package = stdenv.mkDerivation (mylibs.fetchedGithub ./yourls.json // rec {
     installPhase = ''
-- 
2.41.0