summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2019-04-23 20:15:10 +0200
committerjeschli <jeschli@gmail.com>2019-04-23 20:15:10 +0200
commit35fdfbe5ccb3b5844b62ac2486352107484e75d4 (patch)
tree561ff21ae90ce6826ab3d74ebd9f27dee7054a0d /lib
parenta4be985644762dcc2750a366db5780687690ef7d (diff)
parentcd825d99342050bae35d5373e927ca999bae82cf (diff)
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'lib')
-rw-r--r--lib/types.nix21
1 files changed, 14 insertions, 7 deletions
diff --git a/lib/types.nix b/lib/types.nix
index 9001bc7c3..ffae8c7bc 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -89,7 +89,7 @@ rec {
syncthing.id = mkOption {
# TODO syncthing id type
- type = nullOr string;
+ type = nullOr str;
default = null;
};
};
@@ -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;
};