From 03dc83a53c378d599b4aa8ace558f2b29de02fdf Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Tue, 18 Jan 2022 23:56:50 +0100
Subject: [PATCH] types.singleLineStr: Disallow \r

(cherry picked from commit f25a13212be9bd716db9420a59cb74ecab02937a)
---
 lib/types.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index 0e702fb2f2ed..18e95caaee84 100644
--- 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 {