movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

nixos/docker: fix module, add simple test

Browse source
This commit is contained in:
Jaka Hudoklin 2014-12-01 17:20:18 +01:00
parent 77049af46f
commit 40d73c5eb7
3 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/virtualisation/docker.nix
View file

@ -7,8 +7,8 @@ with lib;
let
cfg = config.virtualisation.docker;
pro = config.nix.proxy;
proxy_env = optionalAttrs (pro != "") { Environment = "\"http_proxy=${pro}\""; };
pro = config.networking.proxy.default;
proxy_env = optionalAttrs (pro != null) { Environment = "\"http_proxy=${pro}\""; };
in