From 6bbccd8edd06ff5c65e28c9be63f35224b7feaa3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 24 Jan 2023 17:09:54 +0100 Subject: [PATCH] types: relax filename, pathname & absolute pathname --- types.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/types.nix b/types.nix index e12c894..fb90399 100644 --- a/types.nix +++ b/types.nix @@ -247,25 +247,22 @@ rec { }; optionTypes = rec { - # POSIX.1‐2017, 3.281 Portable Filename filename = mkOptionType { - name = "POSIX portable filename"; - check = x: isString x && builtins.match "[0-9A-Za-z._][0-9A-Za-z._-]*" x != null; + name = "filename"; + check = x: isString x; merge = mergeOneOption; description = "A filename"; }; - # POSIX.1‐2017, 3.2 Absolute Pathname absolute-pathname = mkOptionType { - name = "POSIX absolute pathname"; + name = "absolute pathname"; check = x: isString x && substring 0 1 x == "/" && pathname.check x; merge = mergeOneOption; description = "An absolute path"; }; - # POSIX.1-2017, 3.271 Pathname pathname = mkOptionType { - name = "POSIX pathname"; + name = "pathname"; check = x: let # The filter is used to normalize paths, i.e. to remove duplicated and