From 5801225b8985f3d437d753e98884ceb4ed58ba22 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 16 Sep 2025 18:54:27 +0200 Subject: [PATCH] import: cpan: Use guix-hash-url. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/cpan.scm (cpan-module->sexp): Use guix-hash-url. Signed-off-by: Ludovic Courtès --- guix/import/cpan.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 5f06aaae907..ac4c0d86338 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -30,15 +30,13 @@ #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (json) - #:use-module (gcrypt hash) #:use-module (guix diagnostics) #:use-module (guix i18n) #:use-module (guix store) #:use-module (guix utils) - #:use-module (guix base32) #:use-module ((guix download) #:select (download-to-store url-fetch)) #:use-module ((guix import utils) - #:select (factorize-uri recursive-import)) + #:select (factorize-uri guix-hash-url recursive-import)) #:use-module (guix import json) #:use-module (guix packages) #:use-module (guix upstream) @@ -293,12 +291,12 @@ in RELEASE, a record." `(package (name ,(cpan-name->downstream-name name)) (version ,version) - (source (origin - (method url-fetch) - (uri (string-append ,@(factorize-uri source-url version))) - (sha256 - (base32 - ,(bytevector->nix-base32-string (file-sha256 tarball)))))) + (source + (origin + (method url-fetch) + (uri (string-append ,@(factorize-uri source-url version))) + (sha256 + (base32 ,(guix-hash-url tarball))))) (build-system perl-build-system) ,@(maybe-inputs 'native-inputs (filter (upstream-input-type-predicate 'native)