Author: mkwik
Date: Sun Apr 1 10:54:06 2012
New Revision: 33508
URL: https://nixos.org/websvn/nix/?rev=33508&sc=1
Log:
assertions '.msg' doesn't exist => .message
Modified:
nixos/trunk/modules/misc/assertions.nix
nixos/trunk/modules/programs/ssh.nix
nixos/trunk/modules/services/networking/ssh/sshd.nix
Modified: nixos/trunk/modules/misc/assertions.nix
==============================================================================
--- nixos/trunk/modules/misc/assertions.nix Sun Apr 1 10:49:49 2012
(r33507)
+++ nixos/trunk/modules/misc/assertions.nix Sun Apr 1 10:54:06 2012
(r33508)
@@ -14,7 +14,7 @@
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
Modified: nixos/trunk/modules/programs/ssh.nix
==============================================================================
--- nixos/trunk/modules/programs/ssh.nix Sun Apr 1 10:49:49 2012
(r33507)
+++ nixos/trunk/modules/programs/ssh.nix Sun Apr 1 10:54:06 2012
(r33508)
@@ -35,7 +35,7 @@
};
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 =
Modified: nixos/trunk/modules/services/networking/ssh/sshd.nix
==============================================================================
--- nixos/trunk/modules/services/networking/ssh/sshd.nix Sun Apr 1
10:49:49 2012 (r33507)
+++ nixos/trunk/modules/services/networking/ssh/sshd.nix Sun Apr 1
10:54:06 2012 (r33508)
@@ -302,7 +302,7 @@
'';
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";}];
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
