diff options
| author | tv <tv@shackspace.de> | 2015-06-18 21:21:54 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-06-18 21:21:54 +0200 |
| commit | 94488da95f3161bc791efa7a5c4d74ce2ebfab21 (patch) | |
| tree | a69e699db645f20ce436d9cc973dffd317459f96 /modules | |
| parent | 15ede8a3a4e64f80416d70084d463a09286b5040 (diff) | |
lib/git: add irc-announce
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/cd/default.nix | 2 | ||||
| -rw-r--r-- | modules/wu/default.nix | 2 | ||||
| -rw-r--r-- | modules/wu/users.nix | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/modules/cd/default.nix b/modules/cd/default.nix index 468d2044..ac32795e 100644 --- a/modules/cd/default.nix +++ b/modules/cd/default.nix @@ -48,7 +48,7 @@ let inherit (builtins) readFile; # TODO lib should already include our stuff - inherit (import ../../lib { inherit lib; }) addNames git; + inherit (import ../../lib { inherit lib pkgs; }) addNames git; in rec { enable = true; diff --git a/modules/wu/default.nix b/modules/wu/default.nix index 84a8361a..68475ad5 100644 --- a/modules/wu/default.nix +++ b/modules/wu/default.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: let - lib = import ../../lib { inherit pkgs; }; + lib = import ../../lib { lib = pkgs.lib; inherit pkgs; }; inherit (lib) majmin; in diff --git a/modules/wu/users.nix b/modules/wu/users.nix index 88f2b658..4c863148 100644 --- a/modules/wu/users.nix +++ b/modules/wu/users.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: let inherit (builtins) attrValues; @@ -194,7 +194,8 @@ let sudoers = let inherit (builtins) filter hasAttr; - inherit (import ../../lib { inherit pkgs; }) concat isSuffixOf removeSuffix setToList; + inherit (import ../../lib { inherit lib pkgs; }) + concat isSuffixOf removeSuffix setToList; hasMaster = { group ? "", ... }: isSuffixOf "-sub" group; |