Unverified Commit 7f2d963f authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 782c6bb3 93dc7332

lib/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ let 
        hasInfix

        hasPrefix

        hasSuffix

        join

        stringToCharacters

        stringAsChars

        escape

lib/strings.nix

+30 −0
Original line number Diff line number Diff line
@@ -41,6 +41,36 @@ rec { 
    unsafeDiscardStringContext

    ;



  /**

    Concatenates a list of strings with a separator between each element.



    # Inputs



    `sep`

    : Separator to add between elements



    `list`

    : List of strings that will be joined



    # Type



    ```

    join :: string -> [ string ] -> string

    ```



    # Examples

    :::{.example}

    ## `lib.strings.join` usage example



    ```nix

    join ", " ["foo" "bar"]

    => "foo, bar"

    ```



    :::

  */

  join = builtins.concatStringsSep;



  /**

    Concatenate a list of strings.

lib/tests/misc.nix

+10 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ let 
    id

    ifilter0

    isStorePath

    join

    lazyDerivation

    length

    lists
@@ -435,6 +436,15 @@ runTests { 


  # STRINGS



  testJoin = {

    expr = join "," [

      "a"

      "b"

      "c"

    ];

    expected = "a,b,c";

  };



  testConcatMapStrings = {

    expr = concatMapStrings (x: x + ";") [

      "a"

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -4981,6 +4981,12 @@ 
    githubId = 118829;

    name = "codec";

  };

  CodedNil = {

    github = "CodedNil";

    githubId = 5075747;

    email = "codenil@proton.me";

    name = "Dan Lock";

  };

  CodeLongAndProsper90 = {

    github = "CodeLongAndProsper90";

    githubId = 50145141;

nixos/tests/wasabibackend.nix

+0 −4
Original line number Diff line number Diff line
@@ -33,9 +33,5 @@ 
    machine.wait_until_succeeds(

        "grep 'Wasabi Backend started' /var/lib/wasabibackend/.walletwasabi/backend/Logs.txt"

    )

    machine.sleep(5)

    machine.succeed(

        "grep 'Config is successfully initialized' /var/lib/wasabibackend/.walletwasabi/backend/Logs.txt"

    )

  '';

}