diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 09:53:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 09:53:53 +0200 |
| commit | 9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274 (patch) | |
| tree | f7bda821b368d3d854d19ced09a82d21a757ebad /lib/strings.nix | |
| parent | 7205dfadec4363e0846d6c65266d92a9dddfef6a (diff) | |
| parent | 5328aac7be5b7ebf794349f915a379efd04b018b (diff) | |
| download | nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.gz nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.bz2 nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.lz nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.xz nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.zst nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'lib/strings.nix')
| -rw-r--r-- | lib/strings.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/strings.nix b/lib/strings.nix index 1cc633c729d..a03694d1b1d 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -33,7 +33,7 @@ rec { concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"] => "1-foo2-bar" */ - concatImapStrings = f: list: concatStrings (lib.imap f list); + concatImapStrings = f: list: concatStrings (lib.imap1 f list); /* Place an element between each element of a list @@ -70,7 +70,7 @@ rec { concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ] => "6-3-2" */ - concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap f list); + concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap1 f list); /* Construct a Unix-style search path consisting of each `subDir" directory of the given list of packages. |