aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nixops/modules/certificates.nix2
-rw-r--r--nixops/modules/databases/default.nix2
-rw-r--r--nixops/modules/databases/mysql.nix2
-rw-r--r--nixops/modules/databases/openldap.nix2
-rw-r--r--nixops/modules/databases/postgresql.nix2
-rw-r--r--nixops/modules/databases/redis.nix2
-rw-r--r--nixops/modules/dns.nix2
-rw-r--r--nixops/modules/irc.nix2
-rw-r--r--nixops/modules/mail.nix2
-rw-r--r--nixops/modules/mpd.nix2
-rw-r--r--nixops/modules/pub/default.nix2
-rw-r--r--nixops/modules/task/default.nix2
-rw-r--r--nixops/modules/websites/aten/default.nix2
-rw-r--r--nixops/modules/websites/capitaines/default.nix2
-rw-r--r--nixops/modules/websites/chloe/default.nix2
-rw-r--r--nixops/modules/websites/connexionswing/default.nix2
-rw-r--r--nixops/modules/websites/default.nix2
-rw-r--r--nixops/modules/websites/emilia/default.nix2
-rw-r--r--nixops/modules/websites/ftp/denisejerome.nix2
-rw-r--r--nixops/modules/websites/ftp/florian.nix2
-rw-r--r--nixops/modules/websites/ftp/immae.nix2
-rw-r--r--nixops/modules/websites/ftp/jerome.nix2
-rw-r--r--nixops/modules/websites/ftp/nassime.nix2
-rw-r--r--nixops/modules/websites/ftp/papa.nix2
-rw-r--r--nixops/modules/websites/ftp/release.nix2
-rw-r--r--nixops/modules/websites/ftp/temp.nix2
-rw-r--r--nixops/modules/websites/ludivine/default.nix2
-rw-r--r--nixops/modules/websites/piedsjaloux/default.nix2
-rw-r--r--nixops/modules/websites/tellesflorian/default.nix2
-rw-r--r--nixops/modules/websites/tools/cloud.nix2
-rw-r--r--nixops/modules/websites/tools/dav/default.nix2
-rw-r--r--nixops/modules/websites/tools/db.nix2
-rw-r--r--nixops/modules/websites/tools/diaspora.nix2
-rw-r--r--nixops/modules/websites/tools/ether.nix2
-rw-r--r--nixops/modules/websites/tools/git/default.nix3
-rw-r--r--nixops/modules/websites/tools/git/mantisbt.nix2
-rw-r--r--nixops/modules/websites/tools/mastodon.nix2
-rw-r--r--nixops/modules/websites/tools/mediagoblin.nix2
-rw-r--r--nixops/modules/websites/tools/peertube.nix2
-rw-r--r--nixops/modules/websites/tools/tools/default.nix2
40 files changed, 40 insertions, 41 deletions
diff --git a/nixops/modules/certificates.nix b/nixops/modules/certificates.nix
index 7fae729..bfad4e1 100644
--- a/nixops/modules/certificates.nix
+++ b/nixops/modules/certificates.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, mylibs, ... }: 1{ lib, pkgs, config, ... }:
2{ 2{
3 options.services.myCertificates = { 3 options.services.myCertificates = {
4 certConfig = lib.mkOption { 4 certConfig = lib.mkOption {
diff --git a/nixops/modules/databases/default.nix b/nixops/modules/databases/default.nix
index 01a130c..be549b1 100644
--- a/nixops/modules/databases/default.nix
+++ b/nixops/modules/databases/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myDatabases; 3 cfg = config.services.myDatabases;
4in { 4in {
diff --git a/nixops/modules/databases/mysql.nix b/nixops/modules/databases/mysql.nix
index 23b8b90..6739aaa 100644
--- a/nixops/modules/databases/mysql.nix
+++ b/nixops/modules/databases/mysql.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myDatabases; 3 cfg = config.services.myDatabases;
4in { 4in {
diff --git a/nixops/modules/databases/openldap.nix b/nixops/modules/databases/openldap.nix
index 542e209..ff97fb3 100644
--- a/nixops/modules/databases/openldap.nix
+++ b/nixops/modules/databases/openldap.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myDatabases; 3 cfg = config.services.myDatabases;
4 ldapConfig = let 4 ldapConfig = let
diff --git a/nixops/modules/databases/postgresql.nix b/nixops/modules/databases/postgresql.nix
index 3a58c48..37fcc14 100644
--- a/nixops/modules/databases/postgresql.nix
+++ b/nixops/modules/databases/postgresql.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myDatabases; 3 cfg = config.services.myDatabases;
4in { 4in {
diff --git a/nixops/modules/databases/redis.nix b/nixops/modules/databases/redis.nix
index 7379685..a0917df 100644
--- a/nixops/modules/databases/redis.nix
+++ b/nixops/modules/databases/redis.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myDatabases; 3 cfg = config.services.myDatabases;
4in { 4in {
diff --git a/nixops/modules/dns.nix b/nixops/modules/dns.nix
index 0096f55..ced8d9b 100644
--- a/nixops/modules/dns.nix
+++ b/nixops/modules/dns.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2{ 2{
3 config = let 3 config = let
4 cfg = config.services.bind; 4 cfg = config.services.bind;
diff --git a/nixops/modules/irc.nix b/nixops/modules/irc.nix
index 6500ca5..a4f6f93 100644
--- a/nixops/modules/irc.nix
+++ b/nixops/modules/irc.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2{ 2{
3 options = { 3 options = {
4 services.irc.enable = lib.mkOption { 4 services.irc.enable = lib.mkOption {
diff --git a/nixops/modules/mail.nix b/nixops/modules/mail.nix
index 993e5f1..611c8b4 100644
--- a/nixops/modules/mail.nix
+++ b/nixops/modules/mail.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2{ 2{
3 config.users.users.nullmailer.uid = config.ids.uids.nullmailer; 3 config.users.users.nullmailer.uid = config.ids.uids.nullmailer;
4 config.users.groups.nullmailer.gid = config.ids.gids.nullmailer; 4 config.users.groups.nullmailer.gid = config.ids.gids.nullmailer;
diff --git a/nixops/modules/mpd.nix b/nixops/modules/mpd.nix
index 83c225b..bc8b8df 100644
--- a/nixops/modules/mpd.nix
+++ b/nixops/modules/mpd.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2{ 2{
3 config = { 3 config = {
4 secrets.keys = [ 4 secrets.keys = [
diff --git a/nixops/modules/pub/default.nix b/nixops/modules/pub/default.nix
index f566e69..cdc68db 100644
--- a/nixops/modules/pub/default.nix
+++ b/nixops/modules/pub/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2{ 2{
3 options = { 3 options = {
4 services.pub.enable = lib.mkOption { 4 services.pub.enable = lib.mkOption {
diff --git a/nixops/modules/task/default.nix b/nixops/modules/task/default.nix
index 01d032d..8454c4b 100644
--- a/nixops/modules/task/default.nix
+++ b/nixops/modules/task/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myTasks; 3 cfg = config.services.myTasks;
4 server_vardir = config.services.taskserver.dataDir; 4 server_vardir = config.services.taskserver.dataDir;
diff --git a/nixops/modules/websites/aten/default.nix b/nixops/modules/websites/aten/default.nix
index efd3619..0b2ce69 100644
--- a/nixops/modules/websites/aten/default.nix
+++ b/nixops/modules/websites/aten/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 aten_dev = pkgs.callPackage ./aten.nix { 3 aten_dev = pkgs.callPackage ./aten.nix {
4 inherit (pkgs.private.webapps) aten; 4 inherit (pkgs.private.webapps) aten;
diff --git a/nixops/modules/websites/capitaines/default.nix b/nixops/modules/websites/capitaines/default.nix
index 08f6dd3..648cb1b 100644
--- a/nixops/modules/websites/capitaines/default.nix
+++ b/nixops/modules/websites/capitaines/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myWebsites.Capitaines; 3 cfg = config.services.myWebsites.Capitaines;
4 env = myconfig.env.websites.capitaines; 4 env = myconfig.env.websites.capitaines;
diff --git a/nixops/modules/websites/chloe/default.nix b/nixops/modules/websites/chloe/default.nix
index 874b81b..ea984ae 100644
--- a/nixops/modules/websites/chloe/default.nix
+++ b/nixops/modules/websites/chloe/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 chloe_dev = pkgs.callPackage ./chloe.nix { 3 chloe_dev = pkgs.callPackage ./chloe.nix {
4 inherit (pkgs.private.webapps) chloe; 4 inherit (pkgs.private.webapps) chloe;
diff --git a/nixops/modules/websites/connexionswing/default.nix b/nixops/modules/websites/connexionswing/default.nix
index 2f82428..e31a574 100644
--- a/nixops/modules/websites/connexionswing/default.nix
+++ b/nixops/modules/websites/connexionswing/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, mylibs, myconfig, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 connexionswing_dev = pkgs.callPackage ./connexionswing.nix { 3 connexionswing_dev = pkgs.callPackage ./connexionswing.nix {
4 inherit (pkgs.private.webapps) connexionswing; 4 inherit (pkgs.private.webapps) connexionswing;
diff --git a/nixops/modules/websites/default.nix b/nixops/modules/websites/default.nix
index 79cd1a1..7ed00db 100644
--- a/nixops/modules/websites/default.nix
+++ b/nixops/modules/websites/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, mylibs, myconfig, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myWebsites; 3 cfg = config.services.myWebsites;
4 www_root = "/run/current-system/webapps/_www"; 4 www_root = "/run/current-system/webapps/_www";
diff --git a/nixops/modules/websites/emilia/default.nix b/nixops/modules/websites/emilia/default.nix
index 4002caa..97173b9 100644
--- a/nixops/modules/websites/emilia/default.nix
+++ b/nixops/modules/websites/emilia/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myWebsites.Emilia; 3 cfg = config.services.myWebsites.Emilia;
4 env = myconfig.env.websites.emilia; 4 env = myconfig.env.websites.emilia;
diff --git a/nixops/modules/websites/ftp/denisejerome.nix b/nixops/modules/websites/ftp/denisejerome.nix
index 4069b46..85aae27 100644
--- a/nixops/modules/websites/ftp/denisejerome.nix
+++ b/nixops/modules/websites/ftp/denisejerome.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myWebsites.DeniseJerome; 3 cfg = config.services.myWebsites.DeniseJerome;
4 varDir = "/var/lib/ftp/denisejerome"; 4 varDir = "/var/lib/ftp/denisejerome";
diff --git a/nixops/modules/websites/ftp/florian.nix b/nixops/modules/websites/ftp/florian.nix
index 9688700..2c8edbb 100644
--- a/nixops/modules/websites/ftp/florian.nix
+++ b/nixops/modules/websites/ftp/florian.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 adminer = pkgs.callPackage ../commons/adminer.nix {}; 3 adminer = pkgs.callPackage ../commons/adminer.nix {};
4 cfg = config.services.myWebsites.Florian; 4 cfg = config.services.myWebsites.Florian;
diff --git a/nixops/modules/websites/ftp/immae.nix b/nixops/modules/websites/ftp/immae.nix
index d4e6d39..64f8f31 100644
--- a/nixops/modules/websites/ftp/immae.nix
+++ b/nixops/modules/websites/ftp/immae.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myWebsites.Immae; 3 cfg = config.services.myWebsites.Immae;
4 varDir = "/var/lib/ftp/immae"; 4 varDir = "/var/lib/ftp/immae";
diff --git a/nixops/modules/websites/ftp/jerome.nix b/nixops/modules/websites/ftp/jerome.nix
index 60e4dfb..5b86697 100644
--- a/nixops/modules/websites/ftp/jerome.nix
+++ b/nixops/modules/websites/ftp/jerome.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 adminer = pkgs.callPackage ../commons/adminer.nix {}; 3 adminer = pkgs.callPackage ../commons/adminer.nix {};
4 cfg = config.services.myWebsites.Jerome; 4 cfg = config.services.myWebsites.Jerome;
diff --git a/nixops/modules/websites/ftp/nassime.nix b/nixops/modules/websites/ftp/nassime.nix
index f295045..0e54786 100644
--- a/nixops/modules/websites/ftp/nassime.nix
+++ b/nixops/modules/websites/ftp/nassime.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myWebsites.Nassime; 3 cfg = config.services.myWebsites.Nassime;
4 varDir = "/var/lib/ftp/nassime"; 4 varDir = "/var/lib/ftp/nassime";
diff --git a/nixops/modules/websites/ftp/papa.nix b/nixops/modules/websites/ftp/papa.nix
index ca1aabe..aedae63 100644
--- a/nixops/modules/websites/ftp/papa.nix
+++ b/nixops/modules/websites/ftp/papa.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myWebsites.Papa; 3 cfg = config.services.myWebsites.Papa;
4 varDir = "/var/lib/ftp/papa"; 4 varDir = "/var/lib/ftp/papa";
diff --git a/nixops/modules/websites/ftp/release.nix b/nixops/modules/websites/ftp/release.nix
index 896691b..4d996e3 100644
--- a/nixops/modules/websites/ftp/release.nix
+++ b/nixops/modules/websites/ftp/release.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myWebsites.Release; 3 cfg = config.services.myWebsites.Release;
4 varDir = "/var/lib/ftp/release.immae.eu"; 4 varDir = "/var/lib/ftp/release.immae.eu";
diff --git a/nixops/modules/websites/ftp/temp.nix b/nixops/modules/websites/ftp/temp.nix
index 7f9f681..087b499 100644
--- a/nixops/modules/websites/ftp/temp.nix
+++ b/nixops/modules/websites/ftp/temp.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 cfg = config.services.myWebsites.Temp; 3 cfg = config.services.myWebsites.Temp;
4 varDir = "/var/lib/ftp/temp.immae.eu"; 4 varDir = "/var/lib/ftp/temp.immae.eu";
diff --git a/nixops/modules/websites/ludivine/default.nix b/nixops/modules/websites/ludivine/default.nix
index bd2bbea..69c5720 100644
--- a/nixops/modules/websites/ludivine/default.nix
+++ b/nixops/modules/websites/ludivine/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 ludivinecassal_dev = pkgs.callPackage ./ludivinecassal.nix { 3 ludivinecassal_dev = pkgs.callPackage ./ludivinecassal.nix {
4 inherit (pkgs.private.webapps) ludivinecassal; 4 inherit (pkgs.private.webapps) ludivinecassal;
diff --git a/nixops/modules/websites/piedsjaloux/default.nix b/nixops/modules/websites/piedsjaloux/default.nix
index 2a1271b..97f9557 100644
--- a/nixops/modules/websites/piedsjaloux/default.nix
+++ b/nixops/modules/websites/piedsjaloux/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 piedsjaloux_dev = pkgs.callPackage ./piedsjaloux.nix { 3 piedsjaloux_dev = pkgs.callPackage ./piedsjaloux.nix {
4 inherit (pkgs.private.webapps) piedsjaloux; 4 inherit (pkgs.private.webapps) piedsjaloux;
diff --git a/nixops/modules/websites/tellesflorian/default.nix b/nixops/modules/websites/tellesflorian/default.nix
index 381476c..da4b5a6 100644
--- a/nixops/modules/websites/tellesflorian/default.nix
+++ b/nixops/modules/websites/tellesflorian/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, ... }:
2let 2let
3 adminer = pkgs.callPackage ../commons/adminer.nix {}; 3 adminer = pkgs.callPackage ../commons/adminer.nix {};
4 4
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, ... }:
2let 2let
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, ... }:
2let 2let
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, ... }:
2let 2let
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, ... }:
2let 2let
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, ... }:
2let 2let
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, ... }:
2let 2let
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 }:
2rec { 2rec {
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, ... }:
2let 2let
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, ... }:
2let 2let
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, ... }:
2let 2let
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, ... }:
2let 2let
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 {