3
0
Fork 0
forked from mirrors/nixpkgs

types.singleLineStr: Disallow \r

This commit is contained in:
Jules Aguillon 2022-01-18 23:56:50 +01:00
parent df590070b0
commit f25a13212b

View file

@ -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 {