From d3b5b7c198289610b098ba422f1b3232adf11fb9 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 16 Sep 2025 19:02:07 +0200 Subject: [PATCH] import: gnu: Use guix-hash-url. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/gnu.scm (gnu-package->sexp): Use guix-hash-url. Signed-off-by: Ludovic Courtès --- guix/import/gnu.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/guix/import/gnu.scm b/guix/import/gnu.scm index 0416a80fe65..0b65af598ed 100644 --- a/guix/import/gnu.scm +++ b/guix/import/gnu.scm @@ -24,8 +24,6 @@ #:use-module (guix import utils) #:use-module (guix i18n) #:use-module (guix store) - #:use-module (gcrypt hash) - #:use-module (guix base32) #:use-module (guix upstream) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) @@ -87,14 +85,13 @@ download policy (see 'download-tarball' for details.)" `(package (name ,name) (version ,(upstream-source-version release)) - (source (origin - (method url-fetch) - (uri (string-append ,url-base version - ,(string-append ".tar." archive-type))) - (sha256 - (base32 - ,(bytevector->nix-base32-string - (file-sha256 tarball)))))) + (source + (origin + (method url-fetch) + (uri (string-append ,url-base version + ,(string-append ".tar." archive-type))) + (sha256 + (base32 (guix-hash-url tarball))))) (build-system gnu-build-system) (synopsis ,(gnu-package-doc-summary package)) (description ,(beautify-description