From a1a8649a2be768685eb04c246c114fce36b8096f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 22 May 2019 20:11:21 +0200 Subject: [PATCH] Remove mylibs from module dependencies --- modules/webapps/webstats/default.nix | 2 +- nixops/eldiron.nix | 3 +-- nixops/modules/buildbot/default.nix | 2 +- nixops/modules/gitolite/default.nix | 4 ++-- nixops/modules/ssh/default.nix | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/webapps/webstats/default.nix b/modules/webapps/webstats/default.nix index 3650e1e..924d72d 100644 --- a/modules/webapps/webstats/default.nix +++ b/modules/webapps/webstats/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, mylibs, ... }: +{ lib, pkgs, config, ... }: let name = "goaccess"; cfg = config.services.webstats; diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix index 59ff85a..69231d1 100644 --- a/nixops/eldiron.nix +++ b/nixops/eldiron.nix @@ -5,13 +5,12 @@ enableRollback = true; }; - eldiron = { config, pkgs, mylibs, myconfig, ... }: + eldiron = { config, pkgs, myconfig, ... }: { nixpkgs.overlays = builtins.attrValues (import ../overlays); _module.args = { pkgsNext = import {}; pkgsPrevious = import {}; - mylibs = import ../libs.nix { inherit pkgs; }; myconfig = { inherit privateFiles; env = import "${privateFiles}/environment.nix"; diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix index 89a0dea..60279b7 100644 --- a/nixops/modules/buildbot/default.nix +++ b/nixops/modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, myconfig, mylibs, ... }: +{ lib, pkgs, config, myconfig, ... }: let varDir = "/var/lib/buildbot"; buildbot_common = pkgs.python3Packages.buildPythonPackage rec { diff --git a/nixops/modules/gitolite/default.nix b/nixops/modules/gitolite/default.nix index 8703fbb..f085b55 100644 --- a/nixops/modules/gitolite/default.nix +++ b/nixops/modules/gitolite/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, myconfig, mylibs, ... }: +{ lib, pkgs, config, myconfig, ... }: let cfg = config.services.myGitolite; in { @@ -21,7 +21,7 @@ in { }; system.activationScripts.gitolite = let - gitolite_ldap_groups = mylibs.wrap { + gitolite_ldap_groups = pkgs.mylibs.wrap { name = "gitolite_ldap_groups.sh"; file = ./gitolite_ldap_groups.sh; vars = { diff --git a/nixops/modules/ssh/default.nix b/nixops/modules/ssh/default.nix index e8d6063..beedaff 100644 --- a/nixops/modules/ssh/default.nix +++ b/nixops/modules/ssh/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, mylibs, myconfig, ... }: +{ lib, pkgs, config, myconfig, ... }: { config = { networking.firewall.allowedTCPPorts = [ 22 ]; @@ -25,7 +25,7 @@ # move it in the nix store. environment.etc."ssh/ldap_authorized_keys" = let ldap_authorized_keys = - mylibs.wrap { + pkgs.mylibs.wrap { name = "ldap_authorized_keys"; file = ./ldap_authorized_keys.sh; paths = [ pkgs.which pkgs.gitolite pkgs.openldap pkgs.stdenv.shellPackage pkgs.gnugrep pkgs.gnused pkgs.coreutils ]; -- 2.41.0