alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

Fix #7354 - Accept _module attributes added to every submodule.

Browse source
This commit is contained in:
Nicolas B. Pierron 2015-04-15 00:20:38 +02:00
parent 169efee101
commit 7585d42d2b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/networking/ssh/sshd.nix
View file

@ -377,7 +377,7 @@ in
Port ${toString port} Port ${toString port}
'') cfg.ports} '') cfg.ports}
${concatMapStrings ({ port, addr }: '' ${concatMapStrings ({ port, addr, ... }: ''
ListenAddress ${addr}${if port != null then ":" + toString port else ""} ListenAddress ${addr}${if port != null then ":" + toString port else ""}
'') cfg.listenAddresses} '') cfg.listenAddresses}
@ -416,7 +416,7 @@ in
(data.publicKey != null && data.publicKeyFile == null); (data.publicKey != null && data.publicKeyFile == null);
message = "knownHost ${name} must contain either a publicKey or publicKeyFile"; message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
}) })
++ flip map cfg.listenAddresses ({ addr, port }: { ++ flip map cfg.listenAddresses ({ addr, port, ... }: {
assertion = addr != null; assertion = addr != null;
message = "addr must be specified in each listenAddresses entry"; message = "addr must be specified in each listenAddresses entry";
}); });