lib.types.singleLineStr: partially apply removeSuffix

2026-07-20 10:30:11 -04:00
parent cbd756b6a8
commit e21ff2c03e
1 changed files with 2 additions and 1 deletions
@@ -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 =