From e21ff2c03ee7aada9586b1fcd983aa65f89a0503 Mon Sep 17 00:00:00 2001 From: Eman Resu Date: Mon, 20 Jul 2026 09:54:49 -0400 Subject: [PATCH] lib.types.singleLineStr: partially apply removeSuffix --- lib/types.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index 6d6f471e51b4..3002b3c2bf8e 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -536,13 +536,14 @@ rec { singleLineStr = let inherit (strMatching "[^\n\r]*\n?") check merge; + removeNewlineSuffix = lib.removeSuffix "\n"; in mkOptionType { name = "singleLineStr"; description = "(optionally newline-terminated) single-line string"; descriptionClass = "noun"; inherit check; - merge = loc: defs: lib.removeSuffix "\n" (merge loc defs); + merge = loc: defs: removeNewlineSuffix (merge loc defs); }; strMatching =