summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-09-14 09:54:12 +0200
committerLudovic Courtès <ludo@gnu.org>2021-09-14 11:50:58 +0200
commit67da64608773772f75983415dd90584025ecd523 (patch)
tree593baf46de28154eb820cc48f8bb4d36d4243393
parent3858275962f1ac567b5dce2355035f9eddea0a05 (diff)
downloadguix-67da64608773772f75983415dd90584025ecd523.tar.gz
download: Remove obsolete workaround.
* guix/download.scm (%content-addressed-mirrors): Use (guix base16)
unconditionally.
-rw-r--r--guix/download.scm8
1 files changed, 1 insertions, 7 deletions
diff --git a/guix/download.scm b/guix/download.scm
index d60c898c57..a66cf0cea1 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -369,7 +369,7 @@
   ;; procedure that takes a file name, an algorithm (symbol) and a hash
   ;; (bytevector), and returns a URL or #f.
   '(begin
-     (use-modules (guix base32))
+     (use-modules (guix base16) (guix base32))
 
      (define (guix-publish host)
        (lambda (file algo hash)
@@ -379,12 +379,6 @@
                         file "/" (symbol->string algo) "/"
                         (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")
            (lambda (file algo hash)
              ;; 'tarballs.nixos.org' supports several algorithms.