From 986cb78f05538197ed0929c3bbcb9ffd427e9abe Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 28 Apr 2026 20:11:20 +0100 Subject: [PATCH] Reapply "lib/strings.concatLines: call concatStringsSep directly" But also handle empty lists. This effectively reapplies commit d7e6988c9b7bd7ada8662752ff654e4fde1a1426 which was reverted by commit 66f4e5d9886bb7da3055c4f7615f9d093acda60b. Co-authored-by: Eman Resu <78693624+quatquatt@users.noreply.github.com> --- lib/strings.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index 848e61a65ddf..4c78c909b4be 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -337,7 +337,6 @@ rec { /** Concatenate a list of strings, adding a newline at the end of each one. - Defined as `concatMapStrings (s: s + "\n")`. # Inputs @@ -361,7 +360,7 @@ rec { ::: */ - concatLines = concatMapStrings (s: s + "\n"); + concatLines = lines: optionalString (lines != [ ]) (concatStringsSep "\n" lines + "\n"); /** Given string `s`, replace every occurrence of the string `from` with the string `to`.