ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-27 04:59:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

download: Access content-addressed mirrors over HTTPS.

Browse source 
Bug <http://bugs.gnu.org/22774> is no longer relevant now that we use
"builtin:download" exclusively.

* guix/download.scm (%content-addressed-mirrors): Use "https", not
"http".
This commit is contained in:
Ludovic Courtès 2018-11-13 22:27:58 +01:00
parent ee2cfdfe86
commit 89f1fee8e7
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
guix/download.scm
View file

@ -372,19 +372,18 @@ (define %content-addressed-mirrors
;; List of content-addressed mirrors. Each mirror is represented as a ;; List of content-addressed mirrors. Each mirror is represented as a
;; procedure that takes a file name, an algorithm (symbol) and a hash ;; procedure that takes a file name, an algorithm (symbol) and a hash
;; (bytevector), and returns a URL or #f. ;; (bytevector), and returns a URL or #f.
;; Note: Avoid 'https' to mitigate <http://bugs.gnu.org/22774>.
'(begin '(begin
(use-modules (guix base32) (guix base16)) (use-modules (guix base32) (guix base16))
(list (lambda (file algo hash) (list (lambda (file algo hash)
;; Files served by 'guix publish' are accessible under a single ;; Files served by 'guix publish' are accessible under a single
;; hash algorithm. ;; hash algorithm.
(string-append "http://mirror.hydra.gnu.org/file/" (string-append "https://mirror.hydra.gnu.org/file/"
file "/" (symbol->string algo) "/" file "/" (symbol->string algo) "/"
(bytevector->nix-base32-string hash))) (bytevector->nix-base32-string hash)))
(lambda (file algo hash) (lambda (file algo hash)
;; 'tarballs.nixos.org' supports several algorithms. ;; 'tarballs.nixos.org' supports several algorithms.
(string-append "http://tarballs.nixos.org/" (string-append "https://tarballs.nixos.org/"
(symbol->string algo) "/" (symbol->string algo) "/"
(bytevector->nix-base32-string hash))) (bytevector->nix-base32-string hash)))
(lambda (file algo hash) (lambda (file algo hash)
@ -392,7 +391,7 @@ (define %content-addressed-mirrors
;; tarballs, but tarballs are sometimes available (and can be ;; tarballs, but tarballs are sometimes available (and can be
;; explicitly stored there.) For example, see ;; explicitly stored there.) For example, see
;; <https://archive.softwareheritage.org/api/1/content/sha256:92d0fa1c311cacefa89853bdb53c62f4110cdfda3820346b59cbd098f40f955e/>. ;; <https://archive.softwareheritage.org/api/1/content/sha256:92d0fa1c311cacefa89853bdb53c62f4110cdfda3820346b59cbd098f40f955e/>.
(string-append "http://archive.softwareheritage.org/api/1/content/" (string-append "https://archive.softwareheritage.org/api/1/content/"
(symbol->string algo) ":" (symbol->string algo) ":"
(bytevector->base16-string hash) "/raw/"))))) (bytevector->base16-string hash) "/raw/")))))