download: Remove obsolete workaround.
* guix/download.scm (%content-addressed-mirrors): Use (guix base16) unconditionally.master
parent
3858275962
commit
67da646087
|
@ -369,7 +369,7 @@
|
||||||
;; 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.
|
||||||
'(begin
|
'(begin
|
||||||
(use-modules (guix base32))
|
(use-modules (guix base16) (guix base32))
|
||||||
|
|
||||||
(define (guix-publish host)
|
(define (guix-publish host)
|
||||||
(lambda (file algo hash)
|
(lambda (file algo hash)
|
||||||
|
@ -379,12 +379,6 @@
|
||||||
file "/" (symbol->string algo) "/"
|
file "/" (symbol->string algo) "/"
|
||||||
(bytevector->nix-base32-string hash))))
|
(bytevector->nix-base32-string hash))))
|
||||||
|
|
||||||
;; XXX: (guix base16) appeared in March 2017 (and thus 0.13.0) so old
|
|
||||||
;; installations of the daemon might lack it. Thus, load it lazily to
|
|
||||||
;; avoid gratuitous errors. See <https://bugs.gnu.org/33542>.
|
|
||||||
(module-autoload! (current-module)
|
|
||||||
'(guix base16) '(bytevector->base16-string))
|
|
||||||
|
|
||||||
(list (guix-publish "ci.guix.gnu.org")
|
(list (guix-publish "ci.guix.gnu.org")
|
||||||
(lambda (file algo hash)
|
(lambda (file algo hash)
|
||||||
;; 'tarballs.nixos.org' supports several algorithms.
|
;; 'tarballs.nixos.org' supports several algorithms.
|
||||||
|
|
Reference in New Issue