guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/12: download: Remove obsolete workaround.


From: guix-commits
Subject: 02/12: download: Remove obsolete workaround.
Date: Tue, 14 Sep 2021 05:53:02 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 67da64608773772f75983415dd90584025ecd523
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Sep 14 09:54:12 2021 +0200

    download: Remove obsolete workaround.
    
    * guix/download.scm (%content-addressed-mirrors): Use (guix base16)
    unconditionally.
---
 guix/download.scm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/guix/download.scm b/guix/download.scm
index d60c898..a66cf0c 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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]