mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 13:41:26 +00:00
assertions '.msg' doesn't exist => .message
svn path=/nixos/trunk/; revision=33508
This commit is contained in:
parent
bc6ca7944f
commit
de5b437004
|
@ -14,7 +14,7 @@ in
|
|||
|
||||
assertions = mkOption {
|
||||
default = [];
|
||||
example = [ { assertion = false; msg = "you can't enable this for that reason"; } ];
|
||||
example = [ { assertion = false; message = "you can't enable this for that reason"; } ];
|
||||
merge = pkgs.lib.mergeListOption;
|
||||
description = ''
|
||||
This option allows modules to express conditions that must
|
||||
|
|
|
@ -35,7 +35,7 @@ in
|
|||
};
|
||||
|
||||
assertions = [{ assertion = if cfg.forwardX11 then cfg.setXAuthLocation else true;
|
||||
msg = "cannot enable X11 forwarding without setting xauth location";}];
|
||||
message = "cannot enable X11 forwarding without setting xauth location";}];
|
||||
|
||||
config = {
|
||||
environment.etc =
|
||||
|
|
|
@ -302,7 +302,7 @@ in
|
|||
'';
|
||||
|
||||
assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
|
||||
msg = "cannot enable X11 forwarding without setting xauth location";}];
|
||||
message = "cannot enable X11 forwarding without setting xauth location";}];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue