summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-06-11 16:36:42 +0200
committertv <tv@krebsco.de>2016-06-11 16:36:42 +0200
commit8353b1293e4e4c307e7b875a5449ac901a5afc7d (patch)
treec00b0111494d3a1bef39a1c0d101ee198b6ad9de
parentcda4c2d96b70c296ad97e4d9118aa55ea7c3a594 (diff)
krebs {{absolute-,}path,user}name: mergeOneOption
-rw-r--r--krebs/4lib/types.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/krebs/4lib/types.nix b/krebs/4lib/types.nix
index 628555a9e..678ae7a60 100644
--- a/krebs/4lib/types.nix
+++ b/krebs/4lib/types.nix
@@ -335,6 +335,7 @@ types // rec {
absolute-pathname = mkOptionType {
name = "POSIX absolute pathname";
check = s: s == "/" || (pathname.check s && substring 0 1 s == "/");
+ merge = mergeOneOption;
};
# POSIX.1‐2013, 3.267 Pathname
@@ -342,11 +343,13 @@ types // rec {
pathname = mkOptionType {
name = "POSIX pathname";
check = s: isString s && all filename.check (splitString "/" s);
+ merge = mergeOneOption;
};
# POSIX.1-2013, 3.431 User Name
username = mkOptionType {
name = "POSIX username";
check = filename.check;
+ merge = mergeOneOption;
};
}