nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 11:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

types.singleLineStr: Disallow \r

Browse Source 
(cherry picked from commit f25a13212b)
This commit is contained in:
Jules Aguillon
2022-01-18 23:56:50 +01:00
committed by github-actions[bot]
parent deb63b0aae
commit 03dc83a53c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/types.nix
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 {