me
/
guix
Archived
1
0
Fork 0
Code

git: Support HTTP and HTTPS proxies. 

This allows 'guix pull' and similar to fetch code over a proxy.

* guix/git.scm (make-default-fetch-options): Pass #:proxy-url.
master
Ludovic Courtès 2020-10-12 22:42:41 +02:00
parent 298f9d29d6
commit 8425a9b60a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/git.scm
View File

@ -161,11 +161,14 @@ the 'SSL_CERT_FILE' and 'SSL_CERT_DIR' environment variables."
(define (make-default-fetch-options) (define (make-default-fetch-options)
"Return the default fetch options." "Return the default fetch options."
(let ((auth-method (%make-auth-ssh-agent))) (let ((auth-method (%make-auth-ssh-agent)))
;; The #:transfer-progress option appeared in Guile-Git 0.4.0. Omit it ;; The #:transfer-progress and #:proxy-url options appeared in Guile-Git
;; when using an older version. ;; 0.4.0. Omit them when using an older version.
(catch 'wrong-number-of-args (catch 'wrong-number-of-args
(lambda () (lambda ()
(make-fetch-options auth-method (make-fetch-options auth-method
;; Guile-Git doesn't distinguish between these.
#:proxy-url (or (getenv "http_proxy")
(getenv "https_proxy"))
#:transfer-progress #:transfer-progress
(and (isatty? (current-error-port)) (and (isatty? (current-error-port))
show-progress))) show-progress)))