From e330807e1fbd05828f5b905e9c356b803b04302e Mon Sep 17 00:00:00 2001 From: Wei-Ming Yang Date: Wed, 14 Sep 2016 07:24:25 +0800 Subject: murmur service: welcome -> welcometext fixed incorrect option name `welcome` to `welcometext`. joachifm added a rename for backwards compat. Closes https://github.com/NixOS/nixpkgs/pull/18570 --- nixos/modules/services/networking/murmur.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/modules/services') diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 1cc19a2c9e09..134544cda681 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -15,7 +15,7 @@ let logfile=/var/log/murmur/murmurd.log pidfile=${cfg.pidfile} - welcome="${cfg.welcome}" + welcometext="${cfg.welcometext}" port=${toString cfg.port} ${if cfg.hostName == "" then "" else "host="+cfg.hostName} @@ -84,7 +84,7 @@ in description = "Path to PID file for Murmur daemon."; }; - welcome = mkOption { + welcometext = mkOption { type = types.str; default = ""; description = "Welcome message for connected clients."; -- cgit 1.4.1