From de5b43700403fe3fb6c9c66300a2b5b06af1005c Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 1 Apr 2012 10:54:06 +0000 Subject: [PATCH] assertions '.msg' doesn't exist => .message svn path=/nixos/trunk/; revision=33508 --- modules/misc/assertions.nix | 2 +- modules/programs/ssh.nix | 2 +- modules/services/networking/ssh/sshd.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/misc/assertions.nix b/modules/misc/assertions.nix index 2b06bfbbc034..9cd58550adc9 100644 --- a/modules/misc/assertions.nix +++ b/modules/misc/assertions.nix @@ -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 diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix index 47ce581821d5..5c4b8c3a9a15 100644 --- a/modules/programs/ssh.nix +++ b/modules/programs/ssh.nix @@ -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 = diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix index 715aaa3f882f..f7d2f5c9c875 100644 --- a/modules/services/networking/ssh/sshd.nix +++ b/modules/services/networking/ssh/sshd.nix @@ -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";}]; }; }