public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

assertions '.msg' doesn't exist => .message

Browse Source 
svn path=/nixos/trunk/; revision=33508
This commit is contained in:
Mathijs Kwik 2012-04-01 10:54:06 +00:00
parent bc6ca7944f
commit de5b437004
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/misc/assertions.nix
View File

@ -14,7 +14,7 @@ in
assertions = mkOption { assertions = mkOption {
default = []; 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; merge = pkgs.lib.mergeListOption;
description = '' description = ''
This option allows modules to express conditions that must This option allows modules to express conditions that must

2
modules/programs/ssh.nix
View File

@ -35,7 +35,7 @@ in
}; };
assertions = [{ assertion = if cfg.forwardX11 then cfg.setXAuthLocation else true; 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 = { config = {
environment.etc = environment.etc =

2
modules/services/networking/ssh/sshd.nix
View File

@ -302,7 +302,7 @@ in
''; '';
assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; 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";}];
}; };
} }