guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: download: Pass 'http_proxy' et al. to git, hg, etc.


From: guix-commits
Subject: 01/02: download: Pass 'http_proxy' et al. to git, hg, etc.
Date: Thu, 5 Sep 2019 12:33:36 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 67c2db17bc29e483dbaffbee246c910a617744c6
Author: Ludovic Courtès <address@hidden>
Date:   Thu Sep 5 17:05:08 2019 +0200

    download: Pass 'http_proxy' et al. to git, hg, etc.
    
    This allows 'git-fetch' etc. origins to honor the proxy and locale of
    the daemon.
    
    * guix/bzr-download.scm (bzr-fetch): Pass #:leaked-env-vars to
    'gexp->derivation'.
    * guix/cvs-download.scm (cvs-fetch): Likewise.
    * guix/git-download.scm (git-fetch): Likewise.
    * guix/hg-download.scm (hg-fetch): Likewise.
    * guix/svn-download.scm (svn-multi-fetch): Likewise.
---
 guix/bzr-download.scm | 3 +++
 guix/cvs-download.scm | 5 ++++-
 guix/git-download.scm | 3 +++
 guix/hg-download.scm  | 5 ++++-
 guix/svn-download.scm | 5 ++++-
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/guix/bzr-download.scm b/guix/bzr-download.scm
index d30833c..010e0de 100644
--- a/guix/bzr-download.scm
+++ b/guix/bzr-download.scm
@@ -75,6 +75,9 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
                       #:env-vars
                       `(("bzr url" . ,(bzr-reference-url ref))
                         ("bzr reference" . ,(bzr-reference-revision ref)))
+                      #:leaked-env-vars '("http_proxy" "https_proxy"
+                                          "LC_ALL" "LC_MESSAGES" "LANG"
+                                          "COLUMNS")
                       #:system system
                       #:local-build? #t  ;don't offload repo branching
                       #:hash-algo hash-algo
diff --git a/guix/cvs-download.scm b/guix/cvs-download.scm
index 8b46f8e..cb42103 100644
--- a/guix/cvs-download.scm
+++ b/guix/cvs-download.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2014 Sree Harsha Totakura <address@hidden>
 ;;; Copyright © 2015 Mark H Weaver <address@hidden>
 ;;;
@@ -92,6 +92,9 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
 
   (mlet %store-monad ((guile (package->derivation guile system)))
     (gexp->derivation (or name "cvs-checkout") build
+                      #:leaked-env-vars '("http_proxy" "https_proxy"
+                                          "LC_ALL" "LC_MESSAGES" "LANG"
+                                          "COLUMNS")
                       #:system system
                       #:hash-algo hash-algo
                       #:hash hash
diff --git a/guix/git-download.scm b/guix/git-download.scm
index c62bb8a..1eae035 100644
--- a/guix/git-download.scm
+++ b/guix/git-download.scm
@@ -157,6 +157,9 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
                         ("git commit" . ,(git-reference-commit ref))
                         ("git recursive?" . ,(object->string
                                               (git-reference-recursive? ref))))
+                      #:leaked-env-vars '("http_proxy" "https_proxy"
+                                          "LC_ALL" "LC_MESSAGES" "LANG"
+                                          "COLUMNS")
 
                       #:system system
                       #:local-build? #t           ;don't offload repo cloning
diff --git a/guix/hg-download.scm b/guix/hg-download.scm
index 6b25b87..4cdc1a7 100644
--- a/guix/hg-download.scm
+++ b/guix/hg-download.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -92,6 +92,9 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
 
   (mlet %store-monad ((guile (package->derivation guile system)))
     (gexp->derivation (or name "hg-checkout") build
+                      #:leaked-env-vars '("http_proxy" "https_proxy"
+                                          "LC_ALL" "LC_MESSAGES" "LANG"
+                                          "COLUMNS")
                       #:system system
                       #:local-build? #t           ;don't offload repo cloning
                       #:hash-algo hash-algo
diff --git a/guix/svn-download.scm b/guix/svn-download.scm
index 5c25437..4139cbc 100644
--- a/guix/svn-download.scm
+++ b/guix/svn-download.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2019 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2014 Sree Harsha Totakura <address@hidden>
 ;;; Copyright © 2017, 2019 Ricardo Wurmus <address@hidden>
 ;;;
@@ -131,6 +131,9 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
 
   (mlet %store-monad ((guile (package->derivation guile system)))
     (gexp->derivation (or name "svn-checkout") build
+                      #:leaked-env-vars '("http_proxy" "https_proxy"
+                                          "LC_ALL" "LC_MESSAGES" "LANG"
+                                          "COLUMNS")
                       #:system system
                       #:hash-algo hash-algo
                       #:hash hash



reply via email to

[Prev in Thread] Current Thread [Next in Thread]