From 66454f0e5a1720b8ac9886ef79ce863b8f6ee0a0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 22 Mar 2021 14:44:45 +0100 Subject: [PATCH] !fixup get rid of trailing comment hack --- nixos/tests/inspircd.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/tests/inspircd.nix b/nixos/tests/inspircd.nix index b2975091d365..ceeca970f5fe 100644 --- a/nixos/tests/inspircd.nix +++ b/nixos/tests/inspircd.nix @@ -74,9 +74,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { ${client}.succeed( "grep '${msg other}$' ${iiDir}/${server}/#${channel}/out" ) - '') clients ++ [ - "# trailing comment to please reformatter :)" - ]; + '') clients; # foldl', but requires a non-empty list instead of a start value reduce = f: list: @@ -88,9 +86,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { # run clientScript for all clients so that every list # entry is executed by every client before advancing # to the next one. - ${lib.concatStringsSep "\n" - (reduce - (a: b: lib.zipListsWith (cs: c: cs + "\n" + c) a b) - (builtins.map clientScript clients))} - ''; + '' + lib.concatStrings + (reduce + (a: b: lib.zipListsWith (cs: c: cs + "\n" + c) a b) + (builtins.map clientScript clients)); })