types.singleLineStr: Disallow \r

2 years ago · f25a13212b
parent df590070b0
commit f25a13212b
1 changed files with 2 additions and 3 deletions
--- a/lib/types.nix
+++ b/lib/types.nix
@ -302,9 +302,8 @@ rec {

    singleLineStr = mkOptionType {
      name = "singleLineStr";
-      description = "string that doesn't contain '\\n'";
-      check = x: str.check x && !(lib.hasInfix "\n" x);
-      inherit (str) merge;
+      description = "string that doesn't contain [\\n\\r]";
+      inherit (strMatching "[^\n\r]*") check merge;
    };

    strMatching = pattern: mkOptionType {