From 8a964143a4173fcbd6f398fffee727f228f952fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 12 May 2019 11:31:07 +0200 Subject: Remove unneeded dependencies in modules --- 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 +- 11 files changed, 11 insertions(+), 12 deletions(-) (limited to 'nixops/modules/websites/tools') 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