aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkgs/webapps/dokuwiki/default.nix6
-rw-r--r--pkgs/webapps/mantisbt_2/default.nix6
-rw-r--r--pkgs/webapps/mediagoblin/default.nix6
-rw-r--r--pkgs/webapps/nextcloud/default.nix20
-rw-r--r--pkgs/webapps/yourls/default.nix6
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
16 installPreloadPhase = '' 16 installPreloadPhase = ''
17 cp ${preloadFile plugins} $out/inc/preload.php 17 cp ${preloadFile plugins} $out/inc/preload.php
18 ''; 18 '';
19 passthru.plugins = plugins; 19 passthru = old.passthru // {
20 passthru.withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins); 20 inherit plugins;
21 withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
22 };
21 }); 23 });
22 package = stdenv.mkDerivation (mylibs.fetchedGithub ./dokuwiki.json // rec { 24 package = stdenv.mkDerivation (mylibs.fetchedGithub ./dokuwiki.json // rec {
23 phases = "unpackPhase buildPhase installPhase installPreloadPhase fixupPhase"; 25 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
10 "ln -sf ${value} $out/plugins/${value.pluginName}" 10 "ln -sf ${value} $out/plugins/${value.pluginName}"
11 ) plugins 11 ) plugins
12 )); 12 ));
13 passthru.plugins = plugins; 13 passthru = old.passthru // {
14 passthru.withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins); 14 inherit plugins;
15 withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
16 };
15 }); 17 });
16 package = stdenv.mkDerivation rec { 18 package = stdenv.mkDerivation rec {
17 name = "mantisbt-${version}"; 19 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
108 map (value: "ln -s ${value} mediagoblin/plugins/${value.pluginName}") plugins 108 map (value: "ln -s ${value} mediagoblin/plugins/${value.pluginName}") plugins
109 ) 109 )
110 ); 110 );
111 passthru.plugins = plugins; 111 passthru = old.passthru // {
112 passthru.withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins); 112 inherit plugins;
113 withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
114 };
113 }); 115 });
114 package = stdenv.mkDerivation (mylibs.fetchedGit ./mediagoblin.json // rec { 116 package = stdenv.mkDerivation (mylibs.fetchedGit ./mediagoblin.json // rec {
115 preConfigure = '' 117 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
19 map (value: "ln -sf ${value} $out/apps/${value.appName}") apps 19 map (value: "ln -sf ${value} $out/apps/${value.appName}") apps
20 )); 20 ));
21 21
22 passthru.otherConfig = with lib.attrsets; with lib.lists; let 22 passthru = old.passthru // {
23 zipped = zipAttrs ([old.otherConfig or {}] ++ map (v: v.otherConfig) apps); 23 otherConfig = with lib.attrsets; with lib.lists; let
24 in 24 zipped = zipAttrs ([old.otherConfig or {}] ++ map (v: v.otherConfig) apps);
25 { 25 in
26 mimetypealiases = foldr (h: prev: prev // h) {} zipped.mimetypealiases; 26 {
27 mimetypemapping = mapAttrs (_: v: unique (flatten v)) (zipAttrs zipped.mimetypemapping); 27 mimetypealiases = foldr (h: prev: prev // h) {} zipped.mimetypealiases;
28 }; 28 mimetypemapping = mapAttrs (_: v: unique (flatten v)) (zipAttrs zipped.mimetypemapping);
29 passthru.apps = apps; 29 };
30 passthru.withApps = moreApps: old.withApps (moreApps ++ apps); 30 inherit apps;
31 withApps = moreApps: old.withApps (moreApps ++ apps);
32 };
31 }); 33 });
32 34
33 package = stdenv.mkDerivation rec { 35 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
6 builtins.concatStringsSep "\n" ( 6 builtins.concatStringsSep "\n" (
7 map (value: "ln -s ${value} $out/user/plugins/${value.pluginName}") plugins 7 map (value: "ln -s ${value} $out/user/plugins/${value.pluginName}") plugins
8 ); 8 );
9 passthru.plugins = plugins; 9 passthru = old.passthru // {
10 passthru.withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins); 10 inherit plugins;
11 withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins);
12 };
11 }); 13 });
12 package = stdenv.mkDerivation (mylibs.fetchedGithub ./yourls.json // rec { 14 package = stdenv.mkDerivation (mylibs.fetchedGithub ./yourls.json // rec {
13 installPhase = '' 15 installPhase = ''