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.
2013-10-30 14:57:43 +01:00
parent 4680af6a93
commit 800f9c2037
6 changed files with 88 additions and 93 deletions
@@ -7,7 +7,7 @@ let
  sysctlOption = mkOptionType {
    name = "sysctl option value";
    check = x: builtins.isBool x || builtins.isString x || builtins.isInt x;
-    merge = args: xs: last xs; # FIXME: hacky way to allow overriding in configuration.nix.
+    merge = args: defs: (last defs).value; # FIXME: hacky way to allow overriding in configuration.nix.
  };

 in