Make types.bool complain on conflicting definitions

Previously, conflicting definitions would merge to "true". Now they give an error, e.g. error: The option `hardware.enableAllFirmware' has conflicting definitions, in `/etc/nixos/configurations/misc/eelco/stuff.nix' and `/etc/nixos/configurations/misc/eelco/mandark.nix'.
2015-06-15 18:07:48 +02:00
parent a4925bcfa8
commit e212e07cf6
2 changed files with 10 additions and 1 deletions
@@ -54,7 +54,7 @@ rec {
    bool = mkOptionType {
      name = "boolean";
      check = isBool;
-      merge = loc: fold (x: y: x.value || y) false;
+      merge = mergeEqualOption;
    };

    int = mkOptionType {