[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/12] guix: download: properly detect https when mirror:// is us
|
From: |
Cyril Roelandt |
|
Subject: |
[PATCH 01/12] guix: download: properly detect https when mirror:// is used. |
|
Date: |
Mon, 12 Oct 2015 23:40:57 +0200 |
* guix/download.scm (url-fetch): fix need-gnutls? which always returned #f when
a URL with "mirror://" scheme was used.
---
guix/download.scm | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/guix/download.scm b/guix/download.scm
index 204cfc0..8ec47ce 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -235,13 +235,12 @@ in the store."
(basename url))))
(define need-gnutls?
- ;; True if any of the URLs need TLS support.
- (let ((https? (cut string-prefix? "https://"; <>)))
- (match url
- ((? string?)
- (https? url))
- ((url ...)
- (any https? url)))))
+ (let ((https? (lambda (uri)
+ (eq? 'https (uri-scheme uri)))))
+ (any https? (append-map (cut build:maybe-expand-mirrors <> %mirrors)
+ (match url
+ ((_ ...) (map string->uri url))
+ (_ (list (string->uri url))))))))
(define builder
#~(begin
--
2.1.4
- [PATCH 07/12] gnu: Add python-hacking., (continued)
- [PATCH 07/12] gnu: Add python-hacking., Cyril Roelandt, 2015/10/12
- [PATCH 08/12] gnu: Add python-oslosphinx., Cyril Roelandt, 2015/10/12
- [PATCH 11/12] gnu: Add python-oslo.log., Cyril Roelandt, 2015/10/12
- [PATCH 09/12] gnu: Add python-os-testr., Cyril Roelandt, 2015/10/12
- [PATCH 10/12] gnu: paramiko: Move python-pycrypto to the propagated inputs., Cyril Roelandt, 2015/10/12
- [PATCH 01/12] guix: download: properly detect https when mirror:// is used.,
Cyril Roelandt <=
- [PATCH 04/12] gnu: Update python-requests., Cyril Roelandt, 2015/10/15
- [PATCH 12/12] gnu: Add python-tempest-lib., Cyril Roelandt, 2015/10/15