alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

murmur service: welcome -> welcometext

Browse source 
fixed incorrect option name `welcome` to `welcometext`.

joachifm added a rename for backwards compat.

Closes https://github.com/NixOS/nixpkgs/pull/18570
This commit is contained in:
Wei-Ming Yang 2016-09-14 07:24:25 +08:00 committed by Joachim Fasting
parent de9546307f
commit e330807e1f
No known key found for this signature in database
GPG key ID: 7544761007FE4E08
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/rename.nix
View file

@ -139,6 +139,9 @@ with lib;
# fontconfig-ultimate # fontconfig-ultimate
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "rendering" ] [ "fonts" "fontconfig" "ultimate" "preset" ]) (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "rendering" ] [ "fonts" "fontconfig" "ultimate" "preset" ])
# murmur
(mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])
# Options that are obsolete and have no replacement. # Options that are obsolete and have no replacement.
(mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
(mkRemovedOptionModule [ "programs" "bash" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")

4
nixos/modules/services/networking/murmur.nix
View file

@ -15,7 +15,7 @@ let
logfile=/var/log/murmur/murmurd.log logfile=/var/log/murmur/murmurd.log
pidfile=${cfg.pidfile} pidfile=${cfg.pidfile}
welcome="${cfg.welcome}" welcometext="${cfg.welcometext}"
port=${toString cfg.port} port=${toString cfg.port}
${if cfg.hostName == "" then "" else "host="+cfg.hostName} ${if cfg.hostName == "" then "" else "host="+cfg.hostName}
@ -84,7 +84,7 @@ in
description = "Path to PID file for Murmur daemon."; description = "Path to PID file for Murmur daemon.";
}; };
welcome = mkOption { welcometext = mkOption {
type = types.str; type = types.str;
default = ""; default = "";
description = "Welcome message for connected clients."; description = "Welcome message for connected clients.";