Unverified Commit 6677694a authored by Johannes Kirschbauer's avatar Johannes Kirschbauer Committed by GitHub
Browse files

Revert "lib/strings.concatLines: call concatStringsSep directly" (#514350)

parents 5162f2ba 5c9f6077

lib/strings.nix

+2 −1
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ rec { 


  /**

    Concatenate a list of strings, adding a newline at the end of each one.

    Defined as `concatMapStrings (s: s + "\n")`.



    # Inputs
@@ -360,7 +361,7 @@ rec { 


    :::

  */

  concatLines = str: concatStringsSep "\n" str + "\n";

  concatLines = concatMapStrings (s: s + "\n");



  /**

    Given string `s`, replace every occurrence of the string `from` with the string `to`.

lib/tests/misc.nix

+4 −0
Original line number Diff line number Diff line
@@ -559,6 +559,10 @@ runTests { 
    ];

    expected = "a\nb\nc\n";

  };

  testConcatLinesEmpty = {

    expr = concatLines [ ];

    expected = "";

  };



  testMakeIncludePathWithPkgs = {

    expr = (