movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00
Code Activity

Merge master into staging

Browse source 
There are larger-rebuild changes: gnutls and samba.
This commit is contained in:
Vladimír Čunát 2015-07-17 06:37:13 +02:00
commit 9f37e91ec5
46 changed files with 791 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/networking/bitlbee.nix
View file

@ -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}