From a52ae1b6620fcef28e668047a51a6b2a9fb89e35 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 28 Nov 2018 22:17:39 +0100
Subject: download: Make (guix base16) a soft dependency.

Fixes <https://bugs.gnu.org/33542>.
Reported by Mark H Weaver <mhw@netris.org>.

* guix/download.scm (%content-addressed-mirrors): Autoload (guix base16).
---
 guix/download.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/guix/download.scm b/guix/download.scm
index 0f92e12c08..7aebec44ac 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -373,7 +373,13 @@
   ;; procedure that takes a file name, an algorithm (symbol) and a hash
   ;; (bytevector), and returns a URL or #f.
   '(begin
-     (use-modules (guix base32) (guix base16))
+     (use-modules (guix base32))
+
+     ;; 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 (lambda (file algo hash)
              ;; Files served by 'guix publish' are accessible under a single
-- 
cgit v1.2.3