From feea1d0e62fdd09c4b209c549d65fe93e506d690 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 22 May 2020 00:23:15 +0200 Subject: lint: archival: Use 'origin-hash'. * guix/lint.scm (check-archival): Use 'origin-hash' instead of 'origin-sha256', removing hard-coded "sha256". --- guix/lint.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index e192f292a4..6271894360 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -1154,15 +1154,18 @@ try again later") ((? origin? origin) ;; Since "save" origins are not supported for non-VCS source, all ;; we can do is tell whether a given tarball is available or not. - (if (origin-sha256 origin) ;XXX: for ungoogled-chromium - (match (lookup-content (origin-sha256 origin) "sha256") - (#f - (list (make-warning package - (G_ "source not archived on Software \ + (if (origin-hash origin) ;XXX: for ungoogled-chromium + (let ((hash (origin-hash origin))) + (match (lookup-content (content-hash-value hash) + (symbol->string + (content-hash-algorithm hash))) + (#f + (list (make-warning package + (G_ "source not archived on Software \ Heritage") - #:field 'source))) - ((? content?) - '())) + #:field 'source))) + ((? content?) + '()))) '())))) (match-lambda* ((key url method response) -- cgit 1.4.1