diff options
| author | Antoine R. Dumont <antoine.romain.dumont@gmail.com> | 2014-11-19 20:13:54 +0100 |
|---|---|---|
| committer | Luca Bruno <lucabru@src.gnome.org> | 2014-11-30 15:19:25 +0100 |
| commit | 3c7e77960282dcf550fc2df8445c7da3ee27fb3c (patch) | |
| tree | 35409f1f24b84e23ff90d93c798f5e2cd4038e37 /nixos/modules/services/misc | |
| parent | 92448fb3ae608c8236140a13cbff635a9133dc86 (diff) | |
| download | nixlib-3c7e77960282dcf550fc2df8445c7da3ee27fb3c.tar nixlib-3c7e77960282dcf550fc2df8445c7da3ee27fb3c.tar.gz nixlib-3c7e77960282dcf550fc2df8445c7da3ee27fb3c.tar.bz2 nixlib-3c7e77960282dcf550fc2df8445c7da3ee27fb3c.tar.lz nixlib-3c7e77960282dcf550fc2df8445c7da3ee27fb3c.tar.xz nixlib-3c7e77960282dcf550fc2df8445c7da3ee27fb3c.tar.zst nixlib-3c7e77960282dcf550fc2df8445c7da3ee27fb3c.zip | |
Introduce a dedicated networking.proxy option
Following the discussion NixOS#5021: - obsolete the nix.proxy option - add the networking.proxy option - open a default no_proxy environment variable - add a rsync option - Manual tests ok. - Automatic tests ok. Amended by lethalman to simplify the option descriptions.
Diffstat (limited to 'nixos/modules/services/misc')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4b398979fbaa..f8f99be9b099 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -193,17 +193,6 @@ in ''; }; - proxy = mkOption { - type = types.str; - default = ""; - description = '' - This option specifies the proxy to use for fetchurl. The real effect - is just exporting http_proxy, https_proxy and ftp_proxy with that - value. - ''; - example = "http://127.0.0.1:3128"; - }; - # Environment variables for running Nix. envVars = mkOption { type = types.attrs; @@ -317,13 +306,6 @@ in NIX_BUILD_HOOK = "${nix}/libexec/nix/build-remote.pl"; NIX_REMOTE_SYSTEMS = "/etc/nix/machines"; NIX_CURRENT_LOAD = "/run/nix/current-load"; - } - - # !!! These should not be defined here, but in some general proxy configuration module! - // optionalAttrs (cfg.proxy != "") { - http_proxy = cfg.proxy; - https_proxy = cfg.proxy; - ftp_proxy = cfg.proxy; }; # Set up the environment variables for running Nix. |