summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2019-04-17 21:48:20 +0200
committermakefu <github@syntax-fehler.de>2019-04-17 21:48:20 +0200
commit1314eb9284697b46d8208c138cf2349816e15c5f (patch)
treead243d353ccd7f451eb1ee209bedc63c7acc7c41 /lib
parent12f77bbed628e4071ac300af77857815be97a344 (diff)
parent84ad0b0a93eccdef0e4ca05fd4091f014cb1ac25 (diff)
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'lib')
-rw-r--r--lib/types.nix19
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/types.nix b/lib/types.nix
index 23919af38..ffae8c7bc 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -542,21 +542,28 @@ rec {
merge = mergeOneOption;
};
- # POSIX.1‐2013, 3.278 Portable Filename Character Set
+ # POSIX.1‐2017, 3.190 Group Name
+ groupname = mkOptionType {
+ name = "POSIX group name";
+ check = filename.check;
+ merge = mergeOneOption;
+ };
+
+ # POSIX.1‐2017, 3.281 Portable Filename
filename = mkOptionType {
- name = "POSIX filename";
+ name = "POSIX portable filename";
check = test "[0-9A-Za-z._][0-9A-Za-z._-]*";
merge = mergeOneOption;
};
- # POSIX.1‐2013, 3.2 Absolute Pathname
+ # POSIX.1‐2017, 3.2 Absolute Pathname
absolute-pathname = mkOptionType {
name = "POSIX absolute pathname";
check = x: isString x && substring 0 1 x == "/" && pathname.check x;
merge = mergeOneOption;
};
- # POSIX.1‐2013, 3.267 Pathname
+ # POSIX.1-2017, 3.271 Pathname
pathname = mkOptionType {
name = "POSIX pathname";
check = x:
@@ -570,9 +577,9 @@ rec {
merge = mergeOneOption;
};
- # POSIX.1-2013, 3.431 User Name
+ # POSIX.1-2017, 3.216 Login Name
username = mkOptionType {
- name = "POSIX username";
+ name = "POSIX login name";
check = filename.check;
merge = mergeOneOption;
};