From c6903e156fff67ea43bf11443562a8e4f780a54d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 11 Dec 2021 16:03:57 +0100 Subject: challenge: Use SRFI-71 instead of SRFI-11. * guix/scripts/challenge.scm (port-sha256*, call-with-nar): Use SRFI-71. --- guix/scripts/challenge.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/guix/scripts/challenge.scm b/guix/scripts/challenge.scm index 69c2781abb..57ffe88235 100644 --- a/guix/scripts/challenge.scm +++ b/guix/scripts/challenge.scm @@ -35,10 +35,10 @@ #:use-module (gcrypt hash) #: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-37) + #:use-module (srfi srfi-71) #:use-module (ice-9 match) #:use-module (ice-9 vlist) #:use-module (ice-9 format) @@ -196,7 +196,7 @@ taken since we do not import the archives." (define (port-sha256* port size) ;; Like 'port-sha256', but limited to SIZE bytes. - (let-values (((out get) (open-sha256-port))) + (let ((out get (open-sha256-port))) (dump-port* port out size) (close-port out) (get))) @@ -251,10 +251,8 @@ taken since we do not import the archives." (define (call-with-nar narinfo proc) "Call PROC with an input port from which it can read the nar pointed to by NARINFO." - (let*-values (((uri compression size) - (narinfo-best-uri narinfo)) - ((port actual-size) - (http-fetch uri))) + (let* ((uri compression size (narinfo-best-uri narinfo)) + (port actual-size (http-fetch uri))) (define reporter (progress-reporter/file (narinfo-path narinfo) (and size -- cgit 1.4.1