diff options
| author | Ludovic Courtès <[email protected]> | 2024-12-27 11:25:52 +0100 |
|---|---|---|
| committer | Ludovic Courtès <[email protected]> | 2025-01-08 23:03:04 +0100 |
| commit | 47ef4591746780c8d61cedb7cccdbfcb81322ea9 (patch) | |
| tree | 91f2e828dfbc5ea1c308edd3be74474a24e8ab44 | |
| parent | 20a74ce28dab6717c3742b4dae8e3c45d7847fce (diff) | |
upstream: Switch to SRFI-71.
* guix/upstream.scm (download-tarball, package-update/url-fetch): Use
SRFI-71 instead of SRFI-11.
Change-Id: Ic7ca79b8e1248d01fd48a07faad3a6fa6a1d0c5f
| -rw-r--r-- | guix/upstream.scm | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/guix/upstream.scm b/guix/upstream.scm index 0593c363aa..d680199578 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -44,7 +44,6 @@ #:use-module (guix monads) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) @@ -339,12 +338,11 @@ the OpenPGP key server where the key should be looked up." (mbegin %store-monad (built-derivations (list drv)) (return (derivation->output-path drv)))))))) - (let-values (((status data) - (if sig - (gnupg-verify* sig data - #:server key-server - #:key-download key-download) - (values 'missing-signature data)))) + (let ((status data (if sig + (gnupg-verify* sig data + #:server key-server + #:key-download key-download) + (values 'missing-signature data)))) (match status ('valid-signature tarball) @@ -438,18 +436,17 @@ string such as \"xz\". Otherwise return #f." SOURCE, an <upstream-source>." (match source (($ <upstream-source> _ version urls signature-urls) - (let*-values (((archive-type) - (package-archive-type package)) - ((url signature-url) - ;; Try to find a URL that matches ARCHIVE-TYPE. - (find2 (lambda (url sig-url) - ;; Some URIs lack a file extension, like - ;; 'https://crates.io/???/0.1/download'. In that - ;; case, pick the first URL. - (or (not archive-type) - (string-suffix? archive-type url))) - urls - (or signature-urls (circular-list #f))))) + (let* ((archive-type (package-archive-type package)) + (url signature-url + ;; Try to find a URL that matches ARCHIVE-TYPE. + (find2 (lambda (url sig-url) + ;; Some URIs lack a file extension, like + ;; 'https://crates.io/???/0.1/download'. In that + ;; case, pick the first URL. + (or (not archive-type) + (string-suffix? archive-type url))) + urls + (or signature-urls (circular-list #f))))) ;; If none of URLS matches ARCHIVE-TYPE, then URL is #f; in that case, ;; pick up the first element of URLS. (let ((tarball (download-tarball store |