diff options
| author | lassulus <lass@lassul.us> | 2017-06-20 16:05:27 +0200 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-06-20 16:05:27 +0200 |
| commit | f0bcc6e1f147726cbbf8c3d8a9da503886d2321d (patch) | |
| tree | bf8e0eabe03a8dcf9201c580ab1f4ecc4660b8b4 /krebs/3modules | |
| parent | bda14221cf46003ecf76756a5db7422c70737c85 (diff) | |
| parent | 57c6b890f9088bb333eeab215ecfeca9d09ce3ef (diff) | |
Merge remote-tracking branch 'ni/master' into HEAD
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/default.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/setuid.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 227eb209b..081724cfe 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -186,7 +186,7 @@ let makefu tv ]; - ciko.mail = "wieczorek.stefan@gmail.com"; + ciko.mail = "ciko@slash16.net"; in { "anmeldung@eloop.org" = eloop-ml; "cfp@eloop.org" = eloop-ml; diff --git a/krebs/3modules/setuid.nix b/krebs/3modules/setuid.nix index c9677fd24..a17ec0883 100644 --- a/krebs/3modules/setuid.nix +++ b/krebs/3modules/setuid.nix @@ -47,9 +47,7 @@ let type = mkOptionType { # TODO admit symbolic mode name = "octal mode"; - check = x: - isString x && - match "[0-7][0-7][0-7][0-7]" x != null; + check = test "[0-7][0-7][0-7][0-7]"; merge = mergeOneOption; }; }; |