diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 19:48:30 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:57 +0100 |
| commit | 73f32d03758a53ad1baac31795cfd99e325032f3 (patch) | |
| tree | 8df21c7319e758a85a4916890714b0d90c631a67 /nixos/modules/misc/nixpkgs.nix | |
| parent | dbefab9cf42c09444dd2554380104096969c0728 (diff) | |
| download | nixlib-73f32d03758a53ad1baac31795cfd99e325032f3.tar nixlib-73f32d03758a53ad1baac31795cfd99e325032f3.tar.gz nixlib-73f32d03758a53ad1baac31795cfd99e325032f3.tar.bz2 nixlib-73f32d03758a53ad1baac31795cfd99e325032f3.tar.lz nixlib-73f32d03758a53ad1baac31795cfd99e325032f3.tar.xz nixlib-73f32d03758a53ad1baac31795cfd99e325032f3.tar.zst nixlib-73f32d03758a53ad1baac31795cfd99e325032f3.zip | |
Show precise error messages in option merge failures
For instance, if time.timeZone is defined multiple times, you now get the error message: error: user-thrown exception: The unique option `time.timeZone' is defined multiple times, in `/etc/nixos/configurations/misc/eelco/x11vnc.nix' and `/etc/nixos/configuration.nix'. while previously you got: error: user-thrown exception: Multiple definitions of string. Only one is allowed for this option. and only an inspection of the stack trace gave a clue as to what option caused the problem.
Diffstat (limited to 'nixos/modules/misc/nixpkgs.nix')
| -rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 9eba728c3390..dfbd98bf6ee5 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -26,7 +26,7 @@ let configType = mkOptionType { name = "nixpkgs config"; check = traceValIfNot isConfig; - merge = fold mergeConfig {}; + merge = args: fold mergeConfig {}; }; in |