summary refs log tree commit diff
path: root/lib/attrsets.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 04:46:36 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 22:45:55 +0100
commit40913958a2c61e49348d2038ae6f2a1d32c126fe (patch)
tree02929d83462f084b245bcc7ebb948fbafc9b4c50 /lib/attrsets.nix
parentcfab329437a24811104bc8daa2b83b80614f753c (diff)
downloadnixpkgs-40913958a2c61e49348d2038ae6f2a1d32c126fe.tar
nixpkgs-40913958a2c61e49348d2038ae6f2a1d32c126fe.tar.gz
nixpkgs-40913958a2c61e49348d2038ae6f2a1d32c126fe.tar.bz2
nixpkgs-40913958a2c61e49348d2038ae6f2a1d32c126fe.tar.lz
nixpkgs-40913958a2c61e49348d2038ae6f2a1d32c126fe.tar.xz
nixpkgs-40913958a2c61e49348d2038ae6f2a1d32c126fe.tar.zst
nixpkgs-40913958a2c61e49348d2038ae6f2a1d32c126fe.zip
Keep position information for option declarations and definitions
Also, when an option definition fails to type-check, print the file
name of the module in which the offending definition occurs, e.g.

  error: user-thrown exception: The option value `boot.loader.grub.version' in `/etc/nixos/configuration.nix' is not a integer.
Diffstat (limited to 'lib/attrsets.nix')
-rw-r--r--lib/attrsets.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 01d51779c80..40bc1667b85 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -240,7 +240,7 @@ rec {
   # names, hopefully this does not affect the system because the maximal
   # laziness avoid computing twice the same expression and listToAttrs does
   # not care about duplicated attribute names.
-  zipAttrsWith = f: sets: zipWithNames (concatMap attrNames sets) f sets;
+  zipAttrsWith = f: sets: zipAttrsWithNames (concatMap attrNames sets) f sets;
 
   zipAttrs = zipAttrsWith (name: values: values);