diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-15 18:04:27 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-15 18:07:48 +0200 |
| commit | e212e07cf6aac9d9e1c46db34b17fd16be2399c3 (patch) | |
| tree | c8e6598f823255362e6f3ff703e359a0bfa3ffc6 /lib/types.nix | |
| parent | a4925bcfa8ba5517dda7fa5369b2493f363936af (diff) | |
| download | nixpkgs-e212e07cf6aac9d9e1c46db34b17fd16be2399c3.tar nixpkgs-e212e07cf6aac9d9e1c46db34b17fd16be2399c3.tar.gz nixpkgs-e212e07cf6aac9d9e1c46db34b17fd16be2399c3.tar.bz2 nixpkgs-e212e07cf6aac9d9e1c46db34b17fd16be2399c3.tar.lz nixpkgs-e212e07cf6aac9d9e1c46db34b17fd16be2399c3.tar.xz nixpkgs-e212e07cf6aac9d9e1c46db34b17fd16be2399c3.tar.zst nixpkgs-e212e07cf6aac9d9e1c46db34b17fd16be2399c3.zip | |
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'.
Diffstat (limited to 'lib/types.nix')
| -rw-r--r-- | lib/types.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/types.nix b/lib/types.nix index f22c7661634..0a54a5598f1 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -54,7 +54,7 @@ rec { bool = mkOptionType { name = "boolean"; check = isBool; - merge = loc: fold (x: y: x.value || y) false; + merge = mergeEqualOption; }; int = mkOptionType { |