diff options
Diffstat (limited to 'nixops/modules/websites/tools')
-rw-r--r-- | nixops/modules/websites/tools/cloud.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/dav/default.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/db.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/diaspora.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/ether.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/git/default.nix | 3 | ||||
-rw-r--r-- | nixops/modules/websites/tools/git/mantisbt.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/mastodon.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/mediagoblin.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/peertube.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/tools/tools/default.nix | 2 |
11 files changed, 11 insertions, 12 deletions
diff --git a/nixops/modules/websites/tools/cloud.nix b/nixops/modules/websites/tools/cloud.nix index 8af2914..40faec7 100644 --- a/nixops/modules/websites/tools/cloud.nix +++ b/nixops/modules/websites/tools/cloud.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, ... }: |
2 | let | 2 | let |
3 | nextcloud = pkgs.webapps.nextcloud.withApps (builtins.attrValues pkgs.webapps.nextcloud-apps); | 3 | nextcloud = pkgs.webapps.nextcloud.withApps (builtins.attrValues pkgs.webapps.nextcloud-apps); |
4 | env = myconfig.env.tools.nextcloud; | 4 | env = myconfig.env.tools.nextcloud; |
diff --git a/nixops/modules/websites/tools/dav/default.nix b/nixops/modules/websites/tools/dav/default.nix index bf5e412..5b5a076 100644 --- a/nixops/modules/websites/tools/dav/default.nix +++ b/nixops/modules/websites/tools/dav/default.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, ... }: |
2 | let | 2 | let |
3 | infcloud = rec { | 3 | infcloud = rec { |
4 | webappName = "tools_infcloud"; | 4 | webappName = "tools_infcloud"; |
diff --git a/nixops/modules/websites/tools/db.nix b/nixops/modules/websites/tools/db.nix index 6957e30..f7ca585 100644 --- a/nixops/modules/websites/tools/db.nix +++ b/nixops/modules/websites/tools/db.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, mylibs, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | adminer = pkgs.callPackage ../commons/adminer.nix {}; | 3 | adminer = pkgs.callPackage ../commons/adminer.nix {}; |
4 | 4 | ||
diff --git a/nixops/modules/websites/tools/diaspora.nix b/nixops/modules/websites/tools/diaspora.nix index ebb7612..f6097a0 100644 --- a/nixops/modules/websites/tools/diaspora.nix +++ b/nixops/modules/websites/tools/diaspora.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, ... }: |
2 | let | 2 | let |
3 | env = myconfig.env.tools.diaspora; | 3 | env = myconfig.env.tools.diaspora; |
4 | root = "/run/current-system/webapps/tools_diaspora"; | 4 | root = "/run/current-system/webapps/tools_diaspora"; |
diff --git a/nixops/modules/websites/tools/ether.nix b/nixops/modules/websites/tools/ether.nix index 9c78b0c..0ce5788 100644 --- a/nixops/modules/websites/tools/ether.nix +++ b/nixops/modules/websites/tools/ether.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, ... }: |
2 | let | 2 | let |
3 | env = myconfig.env.tools.etherpad-lite; | 3 | env = myconfig.env.tools.etherpad-lite; |
4 | cfg = config.services.myWebsites.tools.etherpad-lite; | 4 | cfg = config.services.myWebsites.tools.etherpad-lite; |
diff --git a/nixops/modules/websites/tools/git/default.nix b/nixops/modules/websites/tools/git/default.nix index 799c180..bfcfc62 100644 --- a/nixops/modules/websites/tools/git/default.nix +++ b/nixops/modules/websites/tools/git/default.nix | |||
@@ -1,7 +1,6 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, ... }: |
2 | let | 2 | let |
3 | mantisbt = pkgs.callPackage ./mantisbt.nix { | 3 | mantisbt = pkgs.callPackage ./mantisbt.nix { |
4 | inherit (mylibs) fetchedGithub; | ||
5 | inherit (pkgs.webapps) mantisbt_2 mantisbt_2-plugins; | 4 | inherit (pkgs.webapps) mantisbt_2 mantisbt_2-plugins; |
6 | env = myconfig.env.tools.mantisbt; | 5 | env = myconfig.env.tools.mantisbt; |
7 | }; | 6 | }; |
diff --git a/nixops/modules/websites/tools/git/mantisbt.nix b/nixops/modules/websites/tools/git/mantisbt.nix index 36193a7..0c459a7 100644 --- a/nixops/modules/websites/tools/git/mantisbt.nix +++ b/nixops/modules/websites/tools/git/mantisbt.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, env, mantisbt_2, mantisbt_2-plugins, writeText, stdenv, fetchurl, fetchedGithub }: | 1 | { env, mantisbt_2, mantisbt_2-plugins }: |
2 | rec { | 2 | rec { |
3 | keys = [{ | 3 | keys = [{ |
4 | dest = "webapps/tools-mantisbt"; | 4 | dest = "webapps/tools-mantisbt"; |
diff --git a/nixops/modules/websites/tools/mastodon.nix b/nixops/modules/websites/tools/mastodon.nix index 4b9b73e..e0f589a 100644 --- a/nixops/modules/websites/tools/mastodon.nix +++ b/nixops/modules/websites/tools/mastodon.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, ... }: |
2 | let | 2 | let |
3 | env = myconfig.env.tools.mastodon; | 3 | env = myconfig.env.tools.mastodon; |
4 | root = "/run/current-system/webapps/tools_mastodon"; | 4 | root = "/run/current-system/webapps/tools_mastodon"; |
diff --git a/nixops/modules/websites/tools/mediagoblin.nix b/nixops/modules/websites/tools/mediagoblin.nix index cdc45ae..6b26681 100644 --- a/nixops/modules/websites/tools/mediagoblin.nix +++ b/nixops/modules/websites/tools/mediagoblin.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, ... }: |
2 | let | 2 | let |
3 | env = myconfig.env.tools.mediagoblin; | 3 | env = myconfig.env.tools.mediagoblin; |
4 | cfg = config.services.myWebsites.tools.mediagoblin; | 4 | cfg = config.services.myWebsites.tools.mediagoblin; |
diff --git a/nixops/modules/websites/tools/peertube.nix b/nixops/modules/websites/tools/peertube.nix index a9f06cc..0184a30 100644 --- a/nixops/modules/websites/tools/peertube.nix +++ b/nixops/modules/websites/tools/peertube.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, ... }: |
2 | let | 2 | let |
3 | env = myconfig.env.tools.peertube; | 3 | env = myconfig.env.tools.peertube; |
4 | cfg = config.services.myWebsites.tools.peertube; | 4 | cfg = config.services.myWebsites.tools.peertube; |
diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix index 7a14e12..10feefe 100644 --- a/nixops/modules/websites/tools/tools/default.nix +++ b/nixops/modules/websites/tools/tools/default.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, ... }: |
2 | let | 2 | let |
3 | adminer = pkgs.callPackage ../../commons/adminer.nix {}; | 3 | adminer = pkgs.callPackage ../../commons/adminer.nix {}; |
4 | ympd = pkgs.callPackage ./ympd.nix { | 4 | ympd = pkgs.callPackage ./ympd.nix { |