diff options
| author | lassulus <lass@aidsballs.de> | 2015-06-18 22:27:45 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-06-18 22:27:45 +0200 |
| commit | cfbfa6db864d99148c6160625b2799480e6c51c9 (patch) | |
| tree | debad5b3b6f2fa97a997caab7cf8f39acb73bbe4 /modules/wu | |
| parent | 2874f6ed04d530d6a278cf52acbee66fa107f174 (diff) | |
| parent | 1325e5a6757c5825704e74b641e829c25c810124 (diff) | |
Merge branch 'master' of nomic:config into tv
Diffstat (limited to 'modules/wu')
| -rw-r--r-- | modules/wu/default.nix | 2 | ||||
| -rw-r--r-- | modules/wu/users.nix | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/modules/wu/default.nix b/modules/wu/default.nix index 84a8361af..68475ad5b 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 88f2b658e..4c8631489 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; |