diff --git a/lib/default.nix b/lib/default.nix index 5b742b195d340..83ce7a6d7ea98 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -100,7 +100,7 @@ let length head tail elem elemAt isList; inherit (self.strings) concatStrings concatMapStrings concatImapStrings stringLength substring isString replaceStrings - intersperse concatStringsSep concatMapStringsSep + intersperse concatStringsSep concatMapStringsSep concatMapAttrsStringSep concatImapStringsSep concatLines makeSearchPath makeSearchPathOutput makeLibraryPath makeIncludePath makeBinPath optionalString hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape diff --git a/lib/strings.nix b/lib/strings.nix index d9a2d786ed289..5ea86e0d7e079 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -269,6 +269,43 @@ rec { f: list: concatStringsSep sep (lib.imap1 f list); + /** + Like [`concatMapStringsSep`](#function-library-lib.strings.concatMapStringsSep) + but takes an attribute set instead of a list. + + # Inputs + + `sep` + : Separator to add between item strings + + `f` + : Function that takes each key and value and return a string + + `attrs` + : Attribute set to map from + + # Type + + ``` + concatMapAttrsStringSep :: String -> (String -> Any -> String) -> AttrSet -> String + ``` + + # Examples + + :::{.example} + ## `lib.strings.concatMapAttrsStringSep` usage example + + ```nix + concatMapAttrsStringSep "\n" (name: value: "${name}: foo-${value}") { a = "0.1.0"; b = "0.2.0"; } + => "a: foo-0.1.0\nb: foo-0.2.0" + ``` + + ::: + */ + concatMapAttrsStringSep = + sep: f: attrs: + concatStringsSep sep (lib.attrValues (lib.mapAttrs f attrs)); + /** Concatenate a list of strings, adding a newline at the end of each one. Defined as `concatMapStrings (s: s + "\n")`. diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 72b3d630b8da8..6357cc3ec1cf5 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -39,6 +39,7 @@ let composeManyExtensions concatLines concatMapAttrs + concatMapAttrsStringSep concatMapStrings concatStrings concatStringsSep @@ -328,6 +329,11 @@ runTests { expected = "a,b,c"; }; + testConcatMapAttrsStringSepExamples = { + expr = concatMapAttrsStringSep "\n" (name: value: "${name}: foo-${value}") { a = "0.1.0"; b = "0.2.0"; }; + expected = "a: foo-0.1.0\nb: foo-0.2.0"; + }; + testConcatLines = { expr = concatLines ["a" "b" "c"]; expected = "a\nb\nc\n"; diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 12a9039cb016b..a84cc4ad540e8 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -102,10 +102,6 @@ in }@args: let - concatMapStringAttrsSep = - sep: f: attrs: - lib.concatMapStringsSep sep (name: f name attrs.${name}) (lib.attrNames attrs); - addShellDoubleQuotes = s: lib.escapeShellArg ''"'' + s + lib.escapeShellArg ''"''; in (buildGoModule { @@ -210,7 +206,7 @@ in patchShebangs --build "$configureScript" makeit e2e scripts mlocal/scripts # Patching the hard-coded defaultPath by prefixing the packages in defaultPathInputs - ${concatMapStringAttrsSep "\n" (fileName: originalDefaultPaths: '' + ${lib.concatMapAttrsStringSep "\n" (fileName: originalDefaultPaths: '' substituteInPlace ${lib.escapeShellArg fileName} \ ${ lib.concatMapStringsSep " \\\n " ( diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix index a9fa482e4e588..8fc7274c27c25 100644 --- a/pkgs/test/overriding.nix +++ b/pkgs/test/overriding.nix @@ -158,5 +158,5 @@ stdenvNoCC.mkDerivation { passthru = { inherit tests; }; buildCommand = '' touch $out - '' + lib.concatStringsSep "\n" (lib.attrValues (lib.mapAttrs (name: t: "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${name} success') || (echo '${name} fail' && exit 1)") tests)); + '' + lib.concatMapAttrsStringSep "\n" (name: t: "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${name} success') || (echo '${name} fail' && exit 1)") tests; }