summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2009-01-08 23:04:18 +0000
committerMichael Raskin <7c6f434c@mail.ru>2009-01-08 23:04:18 +0000
commitc87887ddd00aea0cad015947bfebf52c960c83a3 (patch)
tree1d496d4e4e827ad4597ecade8da402ab16f9aee4
parent46fec9e4c984da52fa92acc65583cfd45b8dd2f5 (diff)
downloadnixpkgs-c87887ddd00aea0cad015947bfebf52c960c83a3.tar
nixpkgs-c87887ddd00aea0cad015947bfebf52c960c83a3.tar.gz
nixpkgs-c87887ddd00aea0cad015947bfebf52c960c83a3.tar.bz2
nixpkgs-c87887ddd00aea0cad015947bfebf52c960c83a3.tar.lz
nixpkgs-c87887ddd00aea0cad015947bfebf52c960c83a3.tar.xz
nixpkgs-c87887ddd00aea0cad015947bfebf52c960c83a3.tar.zst
nixpkgs-c87887ddd00aea0cad015947bfebf52c960c83a3.zip
Oops. A typo fix
svn path=/nixpkgs/trunk/; revision=13727
-rw-r--r--pkgs/lib/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix
index ca882003433..73cb9d383c4 100644
--- a/pkgs/lib/default.nix
+++ b/pkgs/lib/default.nix
@@ -484,7 +484,7 @@ rec {
     else if all __isList list then concatLists list
     else if all __isAttrs list then mergeAttrs list
     else if all (x: true == x || false == x) list then fold logicalOR false list
-    else if all (x: x == toString x) list then concatStrings x
+    else if all (x: x == toString x) list then concatStrings list
     else abort "${name}: Cannot merge values.";
 
   mergeTypedOption = typeName: predicate: merge: name: list: