diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-07-17 06:37:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-07-17 06:38:04 +0200 |
| commit | 9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c (patch) | |
| tree | 946e5c7626f668079bcf35caf203a52c5d33f3c7 /nixos | |
| parent | cf8309ef34b9ec18bc9aeca9e63f984e1be19b56 (diff) | |
| parent | 967abfc78660d0e49a32eac8fe19cec4b6b79d5c (diff) | |
| download | nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.gz nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.bz2 nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.lz nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.xz nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.zst nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.zip | |
Merge master into staging
There are larger-rebuild changes: gnutls and samba.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/bitlbee.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index 1ffd57e0621d..27b7dd71d9e5 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -21,7 +21,7 @@ let DaemonInterface = ${cfg.interface} DaemonPort = ${toString cfg.portNumber} AuthMode = ${cfg.authMode} - ${lib.optionalStringv (cfg.hostName != "") "HostName = ${cfg.hostName}"} + ${lib.optionalString (cfg.hostName != "") "HostName = ${cfg.hostName}"} ${lib.optionalString (cfg.protocols != "") "Protocols = ${cfg.protocols}"} ${cfg.extraSettings} |