From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kH1bBQmIbmc3NwAAqHPOHw:P1 (envelope-from ) for ; Fri, 27 Dec 2024 10:57:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id kH1bBQmIbmc3NwAAqHPOHw (envelope-from ) for ; Fri, 27 Dec 2024 11:57:13 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=JDIrIkND; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=GDatA28m; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735297032; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=zlRyDz1aTmIvjSZqDu4NAnchp2ghsIhbAQK80mOsnqQ=; b=t0+TWtdI+cCdpXd/LP73eI2QFr5vTkUqxKauJqmsCrJx4dRxynnubYs40Mut8DViFgbQSD bMdZTSpV395VKvktAkWxTbGB/0GOsgmmuXEzxfxOlOsO/9i1qih4QtUk9VOr1GCsY8D1BL 3G+/TMnMUUwB2oxMrww+9OxyVbRE87C8ZWbvl9mKU1uvh220GK0u4EYfDLvu8t4+gbE1ff jvFOtgn+VcQAJtLteAeogAcCIRUIuw2LpeNwvtc2dJ6BsSZrzMTBRZjxDAPXleKz8D+nSr xROs0RfycN0L+Pdm+ApPXK8oaYs1+E29yWyNN36bLINcwqvbMQvmzqBu9v67Nw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=JDIrIkND; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=GDatA28m; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735297032; a=rsa-sha256; cv=none; b=HBNX42L127rMfUh+EU4+0COV5MeUiJbThjR8AhWubSuLfoR7zCiZ7BPvli4z56iO/mUaHb PnDLlwDTUM6RHTBy2tfmvQqy77E5PKYEN0E9nIAj/9SQkZwZ6KfTZolaLEyEuXsPFDP0Pp NGoK0LubTtQute/CiE8Uc/9hnmfGqJcrVk3NrDCT4JvTpugTDzSC8fF8d+S2iI5HFtYU7/ KUh3C2Cl8awmW5fHurKajZgu+8Yee0AgfEBaW9et9RE2IBpQFDLGUwKB0y1cTaMiHaSr9b IYCwVRy2htIvlVHOytLk2GTXe8oDldcAUMHAZSvI+cLZgVawnTrE//N3gmDcew== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 365CE3035C for ; Fri, 27 Dec 2024 11:57:12 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tR81h-0002mD-RT; Fri, 27 Dec 2024 05:57:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tR81g-0002li-8J for guix-patches@gnu.org; Fri, 27 Dec 2024 05:57:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tR81f-0003uo-Vu; Fri, 27 Dec 2024 05:57:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=zlRyDz1aTmIvjSZqDu4NAnchp2ghsIhbAQK80mOsnqQ=; b=JDIrIkND0TY/3fepAV5fS+GpOClvjzuaFjIyHAQJWGZkoV2pW0uWLac3QeG2ZMziPtyX95yu6aFiWicRvuGL3EjgSQrXOjggkcSrz1A25jkBZOFlnyrmmElSJnyoyAvk3eUTxN6or8O8YBo8vDP4wACFa2U9Io43iTPYM34SENsRdbZ8NVrFr0D+hGLoyEecnmTkn8Lv6Ekjvb+LshLoJQ04EAssbZENQgjwkQ+B3+7lGSEwyxI6yWiP8re6811FUAwngbEO9ve08Avsxuq5sE9pCAFZi36EryPbbdIgl0DexIy9tfnOOA05W91ZyBp3UaLPFMWk7ipQ+dmh8O36HA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tR81d-0001dN-Nq; Fri, 27 Dec 2024 05:57:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75137] [PATCH 1/4] upstream: Switch to SRFI-71. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Fri, 27 Dec 2024 10:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75137@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 75137-submit@debbugs.gnu.org id=B75137.17352970196261 (code B ref 75137); Fri, 27 Dec 2024 10:57:01 +0000 Received: (at 75137) by debbugs.gnu.org; 27 Dec 2024 10:56:59 +0000 Received: from localhost ([127.0.0.1]:44808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tR81b-0001ct-FC for submit@debbugs.gnu.org; Fri, 27 Dec 2024 05:56:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32834) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tR81Z-0001cP-II for 75137@debbugs.gnu.org; Fri, 27 Dec 2024 05:56:58 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tR81T-0003to-Uv; Fri, 27 Dec 2024 05:56:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=zlRyDz1aTmIvjSZqDu4NAnchp2ghsIhbAQK80mOsnqQ=; b=GDatA28mHIWNbmFFBzQf jwD4H/fPIgLWVYUOUQ+n0fuB8ttW4WYIzanBIDO3cGRyDfSijCt1LiVK5ygAl5XrvK5uFd7eOsOrh 0rdX0GhYxTEIHdDplkwCe0saVUC77bS1yFt+l+VmurMNvqFWYXqNbMpBIpaT1MfM7PSKYpV4ommj7 fBit0UajLO1zV4U6D2qyhNRGBTvoHTBHyRhzMCS472QtTZE30jpFXWLEvT20aOsRUyrMEi2hGzb7q +h60fVxHnZj0+vsjEvzefeFHjR8Enuh8a/JkFXB1wksO43E7ZNaKeZ8/4E/UP4ufGRI/H8mXNE8TU cAsENfNsjNsVYw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 27 Dec 2024 11:56:40 +0100 Message-ID: <1878ae44b216f1f8b92efb19a7a67b435af23c90.1735296761.git.ludo@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 0.59 X-Spam-Score: 0.59 X-Migadu-Queue-Id: 365CE3035C X-TUID: Xgv24bGNbIlS * guix/upstream.scm (download-tarball, package-update/url-fetch): Use SRFI-71 instead of SRFI-11. Change-Id: Ic7ca79b8e1248d01fd48a07faad3a6fa6a1d0c5f --- guix/upstream.scm | 35 ++++++++++++++++------------------- 1 file 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 @@ (define-module (guix upstream) #: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 @@ (define* (download-tarball store url signature-url (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 @@ (define* (package-update/url-fetch store package source SOURCE, an ." (match 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 -- 2.46.0