summary refs log tree commit diff
path: root/pkgs/lib/trivial.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-07-02 08:58:30 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-07-02 08:58:30 +0000
commit0281a7deb877757e9902292fc7730463d156afc8 (patch)
treeeaca0d1e976f117aeb5039d3d72acd30b0421668 /pkgs/lib/trivial.nix
parent70e1cd9c101947c337b090cc24147731e2636ca5 (diff)
downloadnixpkgs-0281a7deb877757e9902292fc7730463d156afc8.tar
nixpkgs-0281a7deb877757e9902292fc7730463d156afc8.tar.gz
nixpkgs-0281a7deb877757e9902292fc7730463d156afc8.tar.bz2
nixpkgs-0281a7deb877757e9902292fc7730463d156afc8.tar.lz
nixpkgs-0281a7deb877757e9902292fc7730463d156afc8.tar.xz
nixpkgs-0281a7deb877757e9902292fc7730463d156afc8.tar.zst
nixpkgs-0281a7deb877757e9902292fc7730463d156afc8.zip
svn path=/nixpkgs/trunk/; revision=16131
Diffstat (limited to 'pkgs/lib/trivial.nix')
-rw-r--r--pkgs/lib/trivial.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/lib/trivial.nix b/pkgs/lib/trivial.nix
index a4fbd164fe5..4b99ad8c72c 100644
--- a/pkgs/lib/trivial.nix
+++ b/pkgs/lib/trivial.nix
@@ -10,7 +10,7 @@ rec {
   concat = x: y: x ++ y;
   or = x: y: x || y;
   and = x: y: x && y;
-  mergeAttrs = x : y : x // y;
+  mergeAttrs = x: y: x // y;
   
   # Take a function and evaluate it with its own returned value.
   fix = f: let result = f result; in result;