From 7880bc0c21498e27523e42f8d3361492dd4fe165 Mon Sep 17 00:00:00 2001 From: Corbin Date: Fri, 19 Aug 2016 07:34:58 -0700 Subject: [PATCH] fetchfossil: Cleanup some copy-and-paste. --- pkgs/build-support/fetchfossil/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/fetchfossil/default.nix b/pkgs/build-support/fetchfossil/default.nix index 8918c1991b16..54b9e78c5d64 100644 --- a/pkgs/build-support/fetchfossil/default.nix +++ b/pkgs/build-support/fetchfossil/default.nix @@ -2,15 +2,14 @@ {name ? null, url, rev ? null, md5 ? null, sha256 ? null}: -# TODO: statically check if mercurial as the https support if the url starts woth https. stdenv.mkDerivation { name = "fossil-archive" + (if name != null then "-${name}" else ""); builder = ./builder.sh; buildInputs = [fossil]; - impureEnvVars = [ - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - ]; + # Envvar docs are hard to find. A link for the future: + # https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md + impureEnvVars = [ "http_proxy" ]; outputHashAlgo = if md5 != null then "md5" else "sha256"; outputHashMode = "recursive";