Remove mylibs from module dependencies

diff --git a/modules/webapps/webstats/default.nix b/modules/webapps/webstats/default.nix
index 3650e1e713c698a59d3349c388f84d5467c48b10..924d72debdf591af8a5fd4e3fa672fccffa6cca5 100644 (file)
--- 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 59ff85a1fbd6cd5a8d55a5797b2a226a337338de..69231d1336278e19bc620325e894e99babdde36e 100644 (file)
--- 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 <nixpkgsNext> {};
       pkgsPrevious = import <nixpkgsPrevious> {};
-      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 89a0dea10610ff371049201d0f384eb26f608c7f..60279b7b88f87673904d32a52d8fc7db45b250e7 100644 (file)
--- 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 8703fbb9cb397990d5a77af64a5c66f6a829ece1..f085b559f1d4c3dcb503a3ffe08d9dfbaf42f82c 100644 (file)
--- 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 e8d606348bd41c41bf07c544ce730d3deba1d3ef..beedaff594fd46550e857699f79da676af12d426 100644 (file)
--- 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 ];