diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-30 14:21:41 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-30 14:57:43 +0100 |
| commit | 800f9c203728ee84d50181af6fa34ac9e5c04e73 (patch) | |
| tree | 69192ea9020cffb5a6a51557f17105ec10d76bb5 /nixos/modules/misc/nixpkgs.nix | |
| parent | 4680af6a9334297885a96ba464d58316587a87fd (diff) | |
| download | nixlib-800f9c203728ee84d50181af6fa34ac9e5c04e73.tar nixlib-800f9c203728ee84d50181af6fa34ac9e5c04e73.tar.gz nixlib-800f9c203728ee84d50181af6fa34ac9e5c04e73.tar.bz2 nixlib-800f9c203728ee84d50181af6fa34ac9e5c04e73.tar.lz nixlib-800f9c203728ee84d50181af6fa34ac9e5c04e73.tar.xz nixlib-800f9c203728ee84d50181af6fa34ac9e5c04e73.tar.zst nixlib-800f9c203728ee84d50181af6fa34ac9e5c04e73.zip | |
Show correct position info for errors in submodules
E.g. The unique option `fileSystems./.device' is defined multiple times, in `/etc/nixos/configuration.nix' and `/etc/nixos/foo.nix'. This requires passing file/value tuples to the merge functions.
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 dfbd98bf6ee5..239da2859e9e 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 = args: fold mergeConfig {}; + merge = args: fold (def: mergeConfig def.value) {}; }; in |