~ruther/guix-local

ab84b927efa44cd3e81568db4c775f6ab7e3c344 — Ludovic Courtès 10 years ago ff6638d
download: Prepare to support the 'guix publish' /file URLs.

* guix/download.scm (%content-addressed-mirrors): Add 'file' parameter
to the lambda.
* guix/build/download.scm (url-fetch)[content-addressed-uris]: Adjust
accordingly.
2 files changed, 4 insertions(+), 4 deletions(-)

M guix/build/download.scm
M guix/download.scm
M guix/build/download.scm => guix/build/download.scm +1 -1
@@ 737,7 737,7 @@ or #f."
    (append-map (lambda (make-url)
                  (filter-map (match-lambda
                                ((hash-algo . hash)
                                 (string->uri (make-url hash-algo hash))))
                                 (string->uri (make-url file hash-algo hash))))
                              hashes))
                content-addressed-mirrors))


M guix/download.scm => guix/download.scm +3 -3
@@ 232,10 232,10 @@

(define %content-addressed-mirrors
  ;; List of content-addressed mirrors.  Each mirror is represented as a
  ;; procedure that takes an algorithm (symbol) and a hash (bytevector), and
  ;; returns a URL or #f.
  ;; procedure that takes a file name, an algorithm (symbol) and a hash
  ;; (bytevector), and returns a URL or #f.
  ;; TODO: Add more.
  '(list (lambda (algo hash)
  '(list (lambda (file algo hash)
           ;; 'tarballs.nixos.org' supports several algorithms.
           (string-append "http://tarballs.nixos.org/"
                          (symbol->string algo) "/"