From 8a964143a4173fcbd6f398fffee727f228f952fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sun, 12 May 2019 11:31:07 +0200
Subject: Remove unneeded dependencies in modules

---
 nixops/modules/certificates.nix                    | 2 +-
 nixops/modules/databases/default.nix               | 2 +-
 nixops/modules/databases/mysql.nix                 | 2 +-
 nixops/modules/databases/openldap.nix              | 2 +-
 nixops/modules/databases/postgresql.nix            | 2 +-
 nixops/modules/databases/redis.nix                 | 2 +-
 nixops/modules/dns.nix                             | 2 +-
 nixops/modules/irc.nix                             | 2 +-
 nixops/modules/mail.nix                            | 2 +-
 nixops/modules/mpd.nix                             | 2 +-
 nixops/modules/pub/default.nix                     | 2 +-
 nixops/modules/task/default.nix                    | 2 +-
 nixops/modules/websites/aten/default.nix           | 2 +-
 nixops/modules/websites/capitaines/default.nix     | 2 +-
 nixops/modules/websites/chloe/default.nix          | 2 +-
 nixops/modules/websites/connexionswing/default.nix | 2 +-
 nixops/modules/websites/default.nix                | 2 +-
 nixops/modules/websites/emilia/default.nix         | 2 +-
 nixops/modules/websites/ftp/denisejerome.nix       | 2 +-
 nixops/modules/websites/ftp/florian.nix            | 2 +-
 nixops/modules/websites/ftp/immae.nix              | 2 +-
 nixops/modules/websites/ftp/jerome.nix             | 2 +-
 nixops/modules/websites/ftp/nassime.nix            | 2 +-
 nixops/modules/websites/ftp/papa.nix               | 2 +-
 nixops/modules/websites/ftp/release.nix            | 2 +-
 nixops/modules/websites/ftp/temp.nix               | 2 +-
 nixops/modules/websites/ludivine/default.nix       | 2 +-
 nixops/modules/websites/piedsjaloux/default.nix    | 2 +-
 nixops/modules/websites/tellesflorian/default.nix  | 2 +-
 nixops/modules/websites/tools/cloud.nix            | 2 +-
 nixops/modules/websites/tools/dav/default.nix      | 2 +-
 nixops/modules/websites/tools/db.nix               | 2 +-
 nixops/modules/websites/tools/diaspora.nix         | 2 +-
 nixops/modules/websites/tools/ether.nix            | 2 +-
 nixops/modules/websites/tools/git/default.nix      | 3 +--
 nixops/modules/websites/tools/git/mantisbt.nix     | 2 +-
 nixops/modules/websites/tools/mastodon.nix         | 2 +-
 nixops/modules/websites/tools/mediagoblin.nix      | 2 +-
 nixops/modules/websites/tools/peertube.nix         | 2 +-
 nixops/modules/websites/tools/tools/default.nix    | 2 +-
 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 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config,  ... }:
 {
   options.services.myCertificates = {
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myDatabases;
 in {
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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myDatabases;
 in {
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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myDatabases;
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myDatabases;
 in {
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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myDatabases;
 in {
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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 {
   config = let
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 {
   options = {
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 {
   config.users.users.nullmailer.uid = config.ids.uids.nullmailer;
   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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 {
   config = {
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 {
   options = {
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   cfg = config.services.myTasks;
   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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   aten_dev = pkgs.callPackage ./aten.nix {
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myWebsites.Capitaines;
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   chloe_dev  = pkgs.callPackage ./chloe.nix {
     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 @@
-{ lib, pkgs, config, mylibs, myconfig, ... }:
+{ lib, pkgs, config,  myconfig, ... }:
 let
   connexionswing_dev  = pkgs.callPackage ./connexionswing.nix {
     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 @@
-{ lib, pkgs, config, mylibs, myconfig, ... }:
+{ lib, pkgs, config,  myconfig, ... }:
 let
   cfg = config.services.myWebsites;
   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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myWebsites.Emilia;
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myWebsites.DeniseJerome;
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     adminer = pkgs.callPackage ../commons/adminer.nix {};
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myWebsites.Immae;
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     adminer = pkgs.callPackage ../commons/adminer.nix {};
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myWebsites.Nassime;
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myWebsites.Papa;
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myWebsites.Release;
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myWebsites.Temp;
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     ludivinecassal_dev  = pkgs.callPackage ./ludivinecassal.nix {
       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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   piedsjaloux_dev  = pkgs.callPackage ./piedsjaloux.nix {
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   adminer = pkgs.callPackage ../commons/adminer.nix {};
 
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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   nextcloud = pkgs.webapps.nextcloud.withApps (builtins.attrValues pkgs.webapps.nextcloud-apps);
   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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     infcloud = rec {
       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 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config,  ... }:
 let
     adminer = pkgs.callPackage ../commons/adminer.nix {};
 
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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   env = myconfig.env.tools.diaspora;
   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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   env = myconfig.env.tools.etherpad-lite;
   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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig, ... }:
 let
     mantisbt = pkgs.callPackage ./mantisbt.nix {
-      inherit (mylibs) fetchedGithub;
       inherit (pkgs.webapps) mantisbt_2 mantisbt_2-plugins;
       env = myconfig.env.tools.mantisbt;
     };
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 @@
-{ lib, env, mantisbt_2, mantisbt_2-plugins, writeText, stdenv, fetchurl, fetchedGithub }:
+{ env, mantisbt_2, mantisbt_2-plugins }:
 rec {
   keys = [{
     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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   env = myconfig.env.tools.mastodon;
   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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   env = myconfig.env.tools.mediagoblin;
   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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   env = myconfig.env.tools.peertube;
   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 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     adminer = pkgs.callPackage ../../commons/adminer.nix {};
     ympd = pkgs.callPackage ./ympd.nix {
-- 
cgit v1.2.3