From unknown Sat Aug 09 13:07:32 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#75137 <75137@debbugs.gnu.org> To: bug#75137 <75137@debbugs.gnu.org> Subject: Status: [PATCH 0/4] 'package-with-upstream-version' can preserve archive type Reply-To: bug#75137 <75137@debbugs.gnu.org> Date: Sat, 09 Aug 2025 20:07:32 +0000 retitle 75137 [PATCH 0/4] 'package-with-upstream-version' can preserve arch= ive type reassign 75137 guix-patches submitter 75137 Ludovic Court=C3=A8s severity 75137 normal tag 75137 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 27 05:55:45 2024 Received: (at submit) by debbugs.gnu.org; 27 Dec 2024 10:55:45 +0000 Received: from localhost ([127.0.0.1]:44794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tR80P-0001Zn-2X for submit@debbugs.gnu.org; Fri, 27 Dec 2024 05:55:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:41024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tR80L-0001Ze-In for submit@debbugs.gnu.org; Fri, 27 Dec 2024 05:55:44 -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 1tR80K-0001zl-Gk for guix-patches@gnu.org; Fri, 27 Dec 2024 05:55:40 -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 1tR80J-0003ol-G8; Fri, 27 Dec 2024 05:55:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=usgSi3usBFdjRnpQXBaZg6Y9oAtqVuEHsWRBbxSk2IU=; b=JAkUoEOGw6/NNU NdPqCyPG7fS+eH2iNr2erlqKBteX7JlOwu+TAiyaZCnb+khXMGZtAn6TXi/NyR6fWaWt3eOEgNBDV wSwnpL5I9S3cRGDJl40hlvsnmytNss/U2PSSEsPvhOEofqrDpwYuEy+9UadkSlZJrR9+DdIGqLweY hKAfPS5QIJAmIj4tuPFx2wQdQLKwBINwn7GiPqdug1N5wI8oz7QS2EFEP27tDN4y6DzIqSsF3P5Zy UDZF3e36EMAcgEqQDegPF6LAD6nrfGUTM7H/b8SaRTdxnS8RgzRX3lK6W8Zfyez3w0wl0lMQGsUWl SJQOrEzGBD5bv2pl4vEw==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH 0/4] 'package-with-upstream-version' can preserve archive type Date: Fri, 27 Dec 2024 11:55:23 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, This fixes a discrepancy observed in: https://ci.guix.gnu.org/jobset/security-updates For ‘xorg-server’, ‘package-with-upstream-version’ would pick the tar.gz file, whereas running ‘guix refresh -u xorg-server’ would pick the tar.xz file since the package definition already uses a tar.xz file. Ludo’. Ludovic Courtès (4): upstream: Switch to SRFI-71. upstream: Extract ‘preferred-upstream-source-url’. upstream: Define ‘preferred-upstream-source’. transformations: ‘package-with-upstream-version’ can preserve archive type. guix/transformations.scm | 44 ++++++++++++++++++-------------- guix/upstream.scm | 55 +++++++++++++++++++++++++--------------- tests/upstream.scm | 21 ++++++++++++++- 3 files changed, 80 insertions(+), 40 deletions(-) base-commit: e4bdd464ebb49f4e698e5105f70b29688fff9475 -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 27 05:56:59 2024 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: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 75137@debbugs.gnu.org Subject: [PATCH 1/4] upstream: Switch to SRFI-71. 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 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 75137 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 27 05:57:00 2024 Received: (at 75137) by debbugs.gnu.org; 27 Dec 2024 10:57:00 +0000 Received: from localhost ([127.0.0.1]:44812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tR81b-0001cw-Rs for submit@debbugs.gnu.org; Fri, 27 Dec 2024 05:57:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tR81a-0001cQ-0E 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 1tR81U-0003u3-Ov; Fri, 27 Dec 2024 05:56:52 -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=5dhmNPTm6fbis7eIyf3TLOaRsZmZQ9vQmwW7Z+8wvos=; b=OnB8wHVjaYPDbpwsst9K +AcvcexG/mvQOvRvypztJCLEBJngy3D/FVyYygyNBYygVO91mI1WxbOw61cAzIxkRbV/QlNGurhUr SEpfrrjUtliZAr4fmHn+90KAPH/bE2lSmy14TCzL80ekWcVvPGojzA3bznZqTL4ZBZ8D4/fZaM7vQ qqLm+1MA2FHYA0HdFcDDsojuRMcBj+ETqgnaQhpGuJ8FTK7bVrGYWXm/DZuowPKkEPM4nbEGBUAEL SvIX2+QPenP+lD80k71kFaENC5H+lzmurTOuLN13+4iuAp+E9Hh8Cd+zJkR3wqcWMPQrM9rXkSqNa HDZqnjHetKxxiw==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 75137@debbugs.gnu.org Subject: [PATCH 2/4] =?UTF-8?q?upstream:=20Extract=20=E2=80=98preferred-up?= =?UTF-8?q?stream-source-url=E2=80=99.?= Date: Fri, 27 Dec 2024 11:56:41 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 75137 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * guix/upstream.scm (preferred-upstream-source-url): New procedure. (package-update/url-fetch): Use it. Change-Id: I229cdf7668567e30ca156b3d65b77c90ead8bb05 --- guix/upstream.scm | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/guix/upstream.scm b/guix/upstream.scm index d680199578..a6659c3b14 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2010-2023 Ludovic Courtès +;;; Copyright © 2010-2024 Ludovic Courtès ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2019, 2022-2024 Ricardo Wurmus ;;; Copyright © 2021 Sarah Morgensen @@ -430,23 +430,29 @@ (define (package-archive-type package) (string-contains extension "tar")) extension))))) +(define (preferred-upstream-source-url source package) + "Return two values: a source URL that matches the archive type of +PACKAGE (gz, xz, bz2, etc.) and the corresponding signature URL or #f if there +is no signature. Return #f and #f when this is not applicable." + (let ((archive-type (package-archive-type package))) + (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))) + (upstream-source-urls source) + (or (upstream-source-signature-urls source) + (circular-list #f))))) + (define* (package-update/url-fetch store package source #:key key-download key-server) "Return the version, tarball, and SOURCE, to update PACKAGE to SOURCE, an ." (match source (($ _ version urls signature-urls) - (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))))) + (let ((url signature-url + (preferred-upstream-source-url source package))) ;; 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 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 27 05:57:09 2024 Received: (at 75137) by debbugs.gnu.org; 27 Dec 2024 10:57:09 +0000 Received: from localhost ([127.0.0.1]:44824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tR81j-0001e1-Dz for submit@debbugs.gnu.org; Fri, 27 Dec 2024 05:57:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tR81a-0001cT-QO for 75137@debbugs.gnu.org; Fri, 27 Dec 2024 05:56:59 -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 1tR81V-0003uE-Ja; Fri, 27 Dec 2024 05:56:53 -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=RTWZ57pnH1octakJPOtakRXEzLzV4TgFGPPTJchsQ1c=; b=ZzXKG7QAWNcLc5QmDQD+ Sq/wG2Ar6OeEAdBDS0C5+pDNtJMBNAJOp/oGIKrwlLpZb9OG7vhfo9VD6Y7Zh0+ZXA/cXa6fv/sz0 HC/HgZHVtHtysOio7RpM8/SLXwu19jKt4o4ckRwWLTPiXV6SZg8zXDC8CclYY7AnAk8yPkrnMOx68 MQ741ErwuD2GG69nQhZxTQqw/q43BIz+wDRnjOF9dBgFq0LUNRWUq1dW0Duz1FViTpYrx3NmRZPGc 2MRavjv59Jk1pq9b0g1DcaBKWRGYeA93aDMsxHJVvgtaScDlcVY3a2cVfb3y8sbWNOkQ/D6uVCpqK xzPjpJJm8jeN8Q==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 75137@debbugs.gnu.org Subject: [PATCH 3/4] =?UTF-8?q?upstream:=20Define=20=E2=80=98preferred-ups?= =?UTF-8?q?tream-source=E2=80=99.?= Date: Fri, 27 Dec 2024 11:56:42 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 75137 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * guix/upstream.scm (preferred-upstream-source): New procedure. * tests/upstream.scm ("preferred-upstream-source"): New test. Change-Id: I4b48b44f1aa233d2e99bfe2e1359a670297efae8 --- guix/upstream.scm | 12 ++++++++++++ tests/upstream.scm | 21 ++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/guix/upstream.scm b/guix/upstream.scm index a6659c3b14..19c5efc21b 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -76,6 +76,7 @@ (define-module (guix upstream) url-predicate url-prefix-predicate coalesce-sources + preferred-upstream-source upstream-updater upstream-updater? @@ -445,6 +446,17 @@ (define (preferred-upstream-source-url source package) (or (upstream-source-signature-urls source) (circular-list #f))))) +(define (preferred-upstream-source source package) + "Return a variant of SOURCE that uses the same archive type as PACKAGE's +source (gz, xz, zst, etc.). Return SOURCE if this is not applicable." + (let ((url signature-url (preferred-upstream-source-url source package))) + (if url + (upstream-source + (inherit source) + (urls (list url)) + (signature-urls (and=> signature-url list))) + source))) + (define* (package-update/url-fetch store package source #:key key-download key-server) "Return the version, tarball, and SOURCE, to update PACKAGE to diff --git a/tests/upstream.scm b/tests/upstream.scm index a94bb66068..c75ab091e5 100644 --- a/tests/upstream.scm +++ b/tests/upstream.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2023 Ludovic Courtès +;;; Copyright © 2016, 2023-2024 Ludovic Courtès ;;; Copyright © 2022 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -26,6 +26,7 @@ (define-module (test-upstream) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix upstream) #:use-module (guix tests) + #:use-module (srfi srfi-26) #:use-module (srfi srfi-64) #:use-module (ice-9 match)) @@ -55,4 +56,22 @@ (define-module (test-upstream) (signature-urls '("ftp://example.org/foo-1.tar.xz.sig"))))))) +(test-equal "preferred-upstream-source" + '(("http://example.org/foo-2.0.tar.xz") + ("http://example.org/foo-2.0.tar.xz.sig")) + (let* ((package (dummy-package + "foo" + (version "1.0") + (source + (dummy-origin (uri "http://example.org/foo-1.0.tar.xz"))))) + (source (upstream-source + (package "foo") + (version "2.0") + (urls '("http://example.org/foo-2.0.tar.gz" + "http://example.org/foo-2.0.tar.xz")) + (signature-urls (map (cut string-append <> ".sig") urls)))) + (preferred (preferred-upstream-source source package))) + (list (upstream-source-urls preferred) + (upstream-source-signature-urls preferred)))) + (test-end) -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 27 05:57:09 2024 Received: (at 75137) by debbugs.gnu.org; 27 Dec 2024 10:57:09 +0000 Received: from localhost ([127.0.0.1]:44826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tR81l-0001eD-6b for submit@debbugs.gnu.org; Fri, 27 Dec 2024 05:57:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tR81b-0001cV-LJ for 75137@debbugs.gnu.org; Fri, 27 Dec 2024 05:57:00 -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 1tR81W-0003uN-FH; Fri, 27 Dec 2024 05:56:54 -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=2Ql5mPBI+6VirdjeTblezMhGv51kMkI+Tgo9ynQmO2o=; b=V3DogwGXqUBFXdArxyoa 5dBhvglrS+a5bxHNA+f6SfNansqlcw438E6jtR95IazgFhkaw4NCoI2UZza6DbHDQs+w8xcgbsJXE 2d9jyQhFhMHD7J5NeD/ColX7k2m+cVZGRNUIcFw09euEAApiyO5pwiZUiwvE1R/KZ/zT4zdZtjQ26 OSEPXyXLerLCJsV6Z1i+V6vEVQQ2msG41SsyfD2uFUBIXQXbdVvDiYh8SxLOJ3QtnpWT1DJFUHuBT lbJzeRxpyRL4vHaYIdgi3czgV0IAOwawXOmiy1FxcsGiLJ8ssb9ylMpPueUZvsVvTTEct+m1UIc5S W+rEoWonw/1/yg==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 75137@debbugs.gnu.org Subject: [PATCH 4/4] =?UTF-8?q?transformations:=20=E2=80=98package-with-up?= =?UTF-8?q?stream-version=E2=80=99=20can=20preserve=20archive=20type.?= Date: Fri, 27 Dec 2024 11:56:43 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 75137 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Fixes a discrepancy for ‘url-fetch’ packages where upstream provides several source tarballs. For example, for ‘xorg-server’, ‘package-with-upstream-version’ would pick the “tar.gz” tarball even though the package definition uses “tar.xz”. It now picks “tar.xz” by default. * guix/transformations.scm (package-with-upstream-version): Add #:preserve-archive-type?. Call ‘preferred-upstream-source’ to honor it. Change-Id: Iefa007aba339d81709faf82b7c52a5a2c7a6aad7 --- guix/transformations.scm | 44 +++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/guix/transformations.scm b/guix/transformations.scm index 131b8564f8..2887d91a34 100644 --- a/guix/transformations.scm +++ b/guix/transformations.scm @@ -33,6 +33,7 @@ (define-module (guix transformations) #:autoload (guix git) (git-checkout git-checkout? git-checkout-url) #:autoload (guix upstream) (upstream-source package-latest-release + preferred-upstream-source upstream-source-version upstream-source-signature-urls) #:autoload (guix cpu) (current-cpu @@ -865,12 +866,14 @@ (define (upstream-source-without-signatures source) (define* (package-with-upstream-version p #:optional version #:key (preserve-patches? #f) - (authenticate? #t)) + (authenticate? #t) + (preserve-archive-type? #t)) "Return package P changed to use the given upstream VERSION or, if VERSION is #f, the latest known upstream version. When PRESERVE-PATCHES? is true, preserve patches and snippets found in the source of P, provided it's an origin. When AUTHENTICATE? is false, disable OpenPGP signature verification -of upstream source code." +of upstream source code. When PRESERVE-ARCHIVE-TYPE? is true, use the same +archive type as P's source (gz, xz, zstd, etc.)" (let ((source (and=> (package-latest-release p #:version version) (if authenticate? identity @@ -899,24 +902,27 @@ (define* (package-with-upstream-version p #:optional version (upstream-source-version source) (package-version p))) - (unless (pair? (upstream-source-signature-urls source)) - (warning (G_ "cannot authenticate source of '~a', version ~a~%") - (package-name p) - (upstream-source-version source))) + (let ((source (if preserve-archive-type? + (preferred-upstream-source source p) + source))) + (unless (pair? (upstream-source-signature-urls source)) + (warning (G_ "cannot authenticate source of '~a', version ~a~%") + (package-name p) + (upstream-source-version source))) - ;; TODO: Take 'upstream-source-input-changes' into account. - (package - (inherit p) - (version (upstream-source-version source)) - (source (if (and preserve-patches? - (origin? (package-source p))) - ;; Inherit P's origin so snippets and patches are - ;; applied as if we had run 'guix refresh -u'. - (origin - (inherit (package-source p)) - (method upstream-fetch) - (uri source)) - source))))))) + ;; TODO: Take 'upstream-source-input-changes' into account. + (package + (inherit p) + (version (upstream-source-version source)) + (source (if (and preserve-patches? + (origin? (package-source p))) + ;; Inherit P's origin so snippets and patches are + ;; applied as if we had run 'guix refresh -u'. + (origin + (inherit (package-source p)) + (method upstream-fetch) + (uri source)) + source)))))))) (define (transform-package-latest specs) "Return a procedure that rewrites package graphs such that those in SPECS -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 06 12:42:42 2025 Received: (at 75137) by debbugs.gnu.org; 6 Jan 2025 17:42:42 +0000 Received: from localhost ([127.0.0.1]:39906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUr7i-0000qC-ER for submit@debbugs.gnu.org; Mon, 06 Jan 2025 12:42:42 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:57358) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tUr7c-0000pk-Dr for 75137@debbugs.gnu.org; Mon, 06 Jan 2025 12:42:41 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4362f61757fso145747295e9.2 for <75137@debbugs.gnu.org>; Mon, 06 Jan 2025 09:42:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736185355; x=1736790155; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XcchEEUz5ZzbwU/llMfZVWKWbW4sJD0F4kEImr4mmE0=; b=LrZvpZ4WoAwcHdymDh8DYQEImAsag8Bljemp9HhYy4cwvyzBnRXn/h3sZIsk6p4tFe ObrAxax6kzIrH1Muzc6++5EJqDF0JqaAI0XQeouMYZbJn0c7xmdiHus0AO6UaUz+F2jO NYF7J45k7zJMLOoihOrFBdeC50maJx7oRgiB5N89cweHz33xtBY3TtksKKiKa8NCfThJ qkntnPD8mn9bG7g9Bw8+XoP8HLOp5m7xQIVJ66x7uB5NhfnyPTJPyPHPHZJ98E/EyLHC 8iXGGrQCD5SJ+vG6x1T4WXxI6hkH3/Wx/RaGwFOPpDEz0vsogoVbmT8P6IEpArVjE3G0 5XYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736185355; x=1736790155; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XcchEEUz5ZzbwU/llMfZVWKWbW4sJD0F4kEImr4mmE0=; b=UDVVwEo8vFdoSDDRNaNaPmyh20O9ii63shFlDClNPTSmw9FqAdjat5U0798ioX9KPs fp60TQxplDxMEL6jsaSbtHhrn/uKJpmIn21Zx5koRPMll7Gfq7QaQH+GVPGMC8Vwez3a 9+ASf8aOqIO4L2n5bTTLDJNFylBX8ChVQuDhRs95PdWhFN0P4nd3ZrTvw3r/ZH90Md3v n3c7sixlDSibd0kmemEv6X0f4bru4JxDM8WNNhRaifA9RhOhRJo6OemNxFhbtqLJvOEf sXm5tkYYefxJOheFvFsDFAraoAxQfuAlKUjsq0aZkiS+Y8i9+euN9THY1kVWh422gD9K MB8Q== X-Forwarded-Encrypted: i=1; AJvYcCWZUAp5Up3KeOVJhBJGGwG5WgCtSSmNkBgdlkj1giG7mZtoSDp3LgwX722VNtxcqVe+7Prfqg==@debbugs.gnu.org X-Gm-Message-State: AOJu0YxlDeUcFZJ1b4BAjUPR5DK0tZMcdyoR4/9WbAVLXmey7kupPXPy p3LKyacoCyDXX1tHQ/qzaUlLHY5g/pA+h7DBFslJxWm0ou5bKRcp X-Gm-Gg: ASbGncvGGRWp+PQEe4eG71zLRPJDehYwn29UyvMtqkmZTqSP6F/O2tJ4bVlj/fod4gw MZSI0jTh9ek8XRfleYcRCtdvfXhWT8oolyOa4xJM27UOd2My7dHMp6hHnNCLxJNm1NGWHSNUUVx HtESCxAWzQpKTSoWc/s4nr3lLmPBqxOTevtL7YyBfAewg12BTJWKC1WgOd1B3QNYXmfyqPf4g6e XcIgpwJGPU+Bfz3dvnC1EHidV6xw08lci/tmFWpQk0xdHgujevaE4pzifjRiGE4Uy+ZSfTGuEB9 m2Fsh1y8GR88+ZZHFyWsi8A9tgoDxNV+mQQ+S+rDKg== X-Google-Smtp-Source: AGHT+IE+NpKcsaREjt5RT3fTWwXg1D4jlvpGC5szCyV58/OLnD6zwAGJu4ofm8LmF7LK5GRwI+WJnw== X-Received: by 2002:a05:600c:3b9a:b0:42c:bb10:7292 with SMTP id 5b1f17b1804b1-436685470f8mr395819645e9.1.1736185354869; Mon, 06 Jan 2025 09:42:34 -0800 (PST) Received: from lili (roam-nat-fw-prg-194-254-61-40.net.univ-paris-diderot.fr. [194.254.61.40]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43656b013a1sm612193805e9.11.2025.01.06.09.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 09:42:34 -0800 (PST) From: Simon Tournier To: Ludovic =?utf-8?Q?Court=C3=A8s?= , 75137@debbugs.gnu.org Subject: Re: [bug#75137] [PATCH 1/4] upstream: Switch to SRFI-71. In-Reply-To: <1878ae44b216f1f8b92efb19a7a67b435af23c90.1735296761.git.ludo@gnu.org> References: <1878ae44b216f1f8b92efb19a7a67b435af23c90.1735296761.git.ludo@gnu.org> Date: Mon, 06 Jan 2025 11:57:03 +0100 Message-ID: <87zfk4xla8.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, On Fri, 27 Dec 2024 at 11:56, Ludovic Courtès wrote: > * guix/upstream.scm (download-tarball, package-update/url-fetch): Use > SRFI-71 instead of SRFI-11. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zimon.toutoune[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:333 listed in] [list.dnswl.org] X-Debbugs-Envelope-To: 75137 Cc: Christopher Baines , Ludovic =?utf-8?Q?Court=C3=A8s?= , Tobias Geerinckx-Rice , Josselin Poiret , Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) Hi, On Fri, 27 Dec 2024 at 11:56, Ludovic Court=C3=A8s wrote: > * guix/upstream.scm (download-tarball, package-update/url-fetch): Use > SRFI-71 instead of SRFI-11. Out of curiosity, could you explain why SRFI-71 is preferred over SRFI-11? And is it only for this specific case? Or something that might be better for all the code base? Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 06 12:42:51 2025 Received: (at 75137) by debbugs.gnu.org; 6 Jan 2025 17:42:51 +0000 Received: from localhost ([127.0.0.1]:39919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUr7r-0000rG-8T for submit@debbugs.gnu.org; Mon, 06 Jan 2025 12:42:51 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:47138) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tUr7i-0000pq-Si for 75137@debbugs.gnu.org; Mon, 06 Jan 2025 12:42:48 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-385e27c75f4so10542472f8f.2 for <75137@debbugs.gnu.org>; Mon, 06 Jan 2025 09:42:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736185357; x=1736790157; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=tFJ0pOF/j0I7LTiVhr9Kqqj5WeONVGR4oCjnRyZvRDs=; b=Dt8JMzDfHe3BJ1KJ9c638UV3q0BLuciEk/9zUmJhAZ5G2dYVCzdTnGglXCv7M0qP+3 m092z8iu1dc92jPm1Ic9QHAXWdZ5dE9LSXotG+hGQUF7JeplRxQtIdCtSiZmaLaJklEp TdDH7EW46zvN5Fayc++IyXQvipaxxjKDlB4HkvVXiR4PB2HW8wSOynMgOkwsgtEBt2bj SlWgbUjlx9tL/UWO8KARDagS5BBq2m6Q4xj4VjjiYy6udC8CiyP4NxWyr1pJulcTxvz1 dUT0xZCpJgnzg3KSp2D2CtByow7Wnn9eaPs3xDNesJ/33PD+DOKPIlaOFNwweeN+qun6 jZBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736185357; x=1736790157; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tFJ0pOF/j0I7LTiVhr9Kqqj5WeONVGR4oCjnRyZvRDs=; b=N4+Kgs8KP/D8qHarlcdPn3XbuY5rEALW/pLS5ZGU1Agl0UUusd7IQR57X4y6t/BLu+ fZRnl1v+GwizzsMMWGBbhas2V7xmkYggKNmbX/AEdiPq4dAod6FHY8MQ/EWiYhITVPHE OFOEyWvyAwrQK5x+bSQEGPpVh6qYsFMmwsO2UgmoIDQQZv1N2KDy+Grm4FREJmf7NIWN 6jnEB5/KtXaooHNsr/XKAf6uZBXkpzR3B+AtBVkGPpOxEOlK3EyYmggcvOI24Hl4DYyn F1Qz2YIxYnqnQAbU2l5hePynwpvXTE2WP/GjTo/yAF9DwR7hzQhfLZEpqWC5XnlQlBsS 2GCw== X-Forwarded-Encrypted: i=1; AJvYcCXG/P7L05dg+Ara8KbcDico2kwcRuJIRUQ5fAuMOR3QdrDITwE2i4nboPaJiorLteIBGOSkgA==@debbugs.gnu.org X-Gm-Message-State: AOJu0YyPQ+VEt9QRPQIG7toXo9IXgNd7Mv4iHni2YfJuj6MrYeh60G7t 0I0VlcguFbIhPjtgYKJE1SqRJxhSRbZOUo8FjgT0F4cudHCd/w9e X-Gm-Gg: ASbGncvyP/FfT6SggG96IUlnwOITv7FIZsIK0MtOzGl/61HtH3hon8FzhXTWtIYQRCE rTJvRahLvgfo/B/dKE81ouGbz2pQL1uYdYEW1X2aa+mSV9bj/iCefYXpvzWleyUy3o88tIDrRqw 3RxxZzGagw+OLcjhLVspH3jDcLO8m1J8ARKTYcIFjlSZlmHhhB7VAFoeFlkEI6gaiuUUNcKDVNj V9Qeeyu5hAvtZRiW5qW+wzm3wufTJ7ybv//HqNTaGq9P5K5dgZvzD4MC2ruvB/WtATb6W6XWdt8 YQXSysrbauWW92V9wDl3JAuXplfSA8vU7WSgMdAoNQ== X-Google-Smtp-Source: AGHT+IEMYHBXRhx5qpZdLsiWNLqEW8cVl/2OcMTPhojtmXKI4L2kmrB0eI1Yfqc8LkUMu4BxRxVmTQ== X-Received: by 2002:a05:6000:2c6:b0:386:857:cc54 with SMTP id ffacd0b85a97d-38a221e2d13mr49089595f8f.9.1736185356608; Mon, 06 Jan 2025 09:42:36 -0800 (PST) Received: from lili (roam-nat-fw-prg-194-254-61-47.net.univ-paris-diderot.fr. [194.254.61.47]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a1c89e278sm48979423f8f.75.2025.01.06.09.42.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 09:42:36 -0800 (PST) From: Simon Tournier To: Ludovic =?utf-8?Q?Court=C3=A8s?= , 75137@debbugs.gnu.org Subject: Re: [bug#75137] [PATCH 0/4] 'package-with-upstream-version' can preserve archive type In-Reply-To: References: Date: Mon, 06 Jan 2025 12:09:40 +0100 Message-ID: <87ttacxkp7.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, On Fri, 27 Dec 2024 at 11:55, Ludovic Courtès wrote: > Ludovic Courtès (4): > upstream: Switch to SRFI-71. > upstream: Extract ‘preferred-upstream-source-url’. > upstream: Define ‘preferred-upstream-source’. > transformations: ‘package-with-u [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:42d listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zimon.toutoune[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date X-Debbugs-Envelope-To: 75137 Cc: Christopher Baines , Ludovic =?utf-8?Q?Court=C3=A8s?= , Tobias Geerinckx-Rice , Josselin Poiret , Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) Hi, On Fri, 27 Dec 2024 at 11:55, Ludovic Court=C3=A8s wrote: > Ludovic Court=C3=A8s (4): > upstream: Switch to SRFI-71. > upstream: Extract =E2=80=98preferred-upstream-source-url=E2=80=99. > upstream: Define =E2=80=98preferred-upstream-source=E2=80=99. > transformations: =E2=80=98package-with-upstream-version=E2=80=99 can pr= eserve archive > type. > > guix/transformations.scm | 44 ++++++++++++++++++-------------- > guix/upstream.scm | 55 +++++++++++++++++++++++++--------------- > tests/upstream.scm | 21 ++++++++++++++- > 3 files changed, 80 insertions(+), 40 deletions(-) LGTM. Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 08 04:59:28 2025 Received: (at 75137) by debbugs.gnu.org; 8 Jan 2025 09:59:28 +0000 Received: from localhost ([127.0.0.1]:46027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVSqW-0001jW-1j for submit@debbugs.gnu.org; Wed, 08 Jan 2025 04:59:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53658) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tVSqT-0001jG-M1 for 75137@debbugs.gnu.org; Wed, 08 Jan 2025 04:59:26 -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 1tVSqM-00078y-FL; Wed, 08 Jan 2025 04:59:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=tJUwGW8Enx2po7KAF4UPyZCGGZF1GjjpX7Oc6vUgbcE=; b=nmKpkJBWUKCvQyuH/LlA FJsmeTBhs26rBXvzJwmtmLx1SUoiDsf2vatd5xStw+k3MwXof2CLJISuCZHcAYOJHFCnXNuXHV3cH YJKAQP6btftDw05xfcTSbohT9xVmX7GU2aZ8gXj8HmrCg7sPqn5ght73uKWtniEexA145dYWNkA0J 7+s5sxWVrMbHiqMvIyXtQPMTqR08bstlAWSPTI1UG8xqBiFA/AOwG1BiDvJT3+sL/tEF7PqLQFFkT unTW0s+T0E86LYMCz+sAAhSPCsmV0wV69YHN/xuG5bJuw2wfMjOsryri3lTgtnn3om9Igw0rF57zT 2ZRyMvea4b9ZPA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Simon Tournier Subject: Re: [bug#75137] [PATCH 1/4] upstream: Switch to SRFI-71. In-Reply-To: <87zfk4xla8.fsf@gmail.com> (Simon Tournier's message of "Mon, 06 Jan 2025 11:57:03 +0100") References: <1878ae44b216f1f8b92efb19a7a67b435af23c90.1735296761.git.ludo@gnu.org> <87zfk4xla8.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Nonidi 19 =?utf-8?Q?Niv=C3=B4se?= an 233 de la =?utf-8?Q?R=C3=A9volution=2C?= jour du Marbre X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 08 Jan 2025 10:59:15 +0100 Message-ID: <87y0zlvd70.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 75137 Cc: 75137@debbugs.gnu.org, Christopher Baines , Josselin Poiret , Tobias Geerinckx-Rice , Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Simon Tournier skribis: > On Fri, 27 Dec 2024 at 11:56, Ludovic Court=C3=A8s wrote: > >> * guix/upstream.scm (download-tarball, package-update/url-fetch): Use >> SRFI-71 instead of SRFI-11. > > Out of curiosity, could you explain why SRFI-71 is preferred over > SRFI-11? It=E2=80=99s just that it has fewer parens and looks nicer: https://lists.gnu.org/archive/html/guix-devel/2021-01/msg00234.html Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 08 18:26:20 2025 Received: (at 75137-done) by debbugs.gnu.org; 8 Jan 2025 23:26:20 +0000 Received: from localhost ([127.0.0.1]:49495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVfRM-0001La-Ju for submit@debbugs.gnu.org; Wed, 08 Jan 2025 18:26:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41320) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tVfRL-0001LM-23 for 75137-done@debbugs.gnu.org; Wed, 08 Jan 2025 18:26:19 -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 1tVfRF-0002tS-Iw; Wed, 08 Jan 2025 18:26:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=nWxx7v5H/PiME+kBWalDn94iZBJ8FSlaHjR/tcvScMw=; b=KQA+wl9eYTU+7JZOUyNE 8/YMYZIRI61oZWk0KQuXaOO5NBHraTFlvmAm9bLsq0sD9fwpBo4Qnwhho1zvTIhpWsqm7dkUIpI20 ST91tqVqlgRrPUAMk16TRt/9rkI/kwcTH9v1UdLvtGElIVBscrxjBGXzMXIKsHauy6dTb/yqpAsqd kSOCOKmsZCWBqzyZwsKwy9oHUjQYx2DGKlZZ+GQNZ8i9pg5ECXhWGGIG9oKYG7nUhoOYSZ1lcLaF0 IvjVAviyf3pvHiXSGcX/+hgxRG4dXMvoq8JcxpJtNV+J7IqXK+3/GnLGtSvdR+ecCeSO4WITNm8uR zDyOqA5l5fOhPA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Simon Tournier Subject: Re: [bug#75137] [PATCH 0/4] 'package-with-upstream-version' can preserve archive type In-Reply-To: <87ttacxkp7.fsf@gmail.com> (Simon Tournier's message of "Mon, 06 Jan 2025 12:09:40 +0100") References: <87ttacxkp7.fsf@gmail.com> Date: Thu, 09 Jan 2025 00:26:11 +0100 Message-ID: <87plkwsx9o.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 75137-done Cc: 75137-done@debbugs.gnu.org, Christopher Baines , Josselin Poiret , Tobias Geerinckx-Rice , Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Pushed as c8797e81fbf1d7ac810b8b3cadef3637746c210e, thanks for taking a look! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 09 09:27:02 2025 Received: (at 75137) by debbugs.gnu.org; 9 Jan 2025 14:27:03 +0000 Received: from localhost ([127.0.0.1]:51288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVtV0-0002ao-Al for submit@debbugs.gnu.org; Thu, 09 Jan 2025 09:27:02 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:58757) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tVtUy-0002aT-6T for 75137@debbugs.gnu.org; Thu, 09 Jan 2025 09:27:00 -0500 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-385e3621518so564328f8f.1 for <75137@debbugs.gnu.org>; Thu, 09 Jan 2025 06:27:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736432814; x=1737037614; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ZnhIkv/Yig86Fankprshk4efB4KjR/BeANcGLO1hKKg=; b=ljbbSEfxRWnwEUAISTrsBvautAEVxVZ86SHrYGvnZzVGxS09jSvMfypL2p/XZNMBo4 x88HMA1aYXw8hqEkI77h23WlRCHzzq6513iHf4HQnVPC6XX9jI653zmiOgMccFzFKvFZ 3EYbha7Go6b3d856OctU8mVkchb1Vj1lJy13Coc1KPG5QSJlry983dVuUvpWnwz6IEte ZaWLIB7SschePKBwn3Rzgrl+mL1kaOC3KsBs726fUZivf3acwxh4QpUnEYkurOaVmRvi JXAJHpjXYUzUz53syfr0IEK0047sdwQk+RFhyNmvlDJrD/skpPD4eQru1dPlyd93XXhl Vscw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736432814; x=1737037614; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZnhIkv/Yig86Fankprshk4efB4KjR/BeANcGLO1hKKg=; b=mJG7G+67zrNEQ0nLtUV7hieqxnuoGb9PeLtRPfG9X2gnNCDbdIGkD2/RQFgCIRXeN0 MhxI1pSi7RQhFm65DpveoASjaDBky7lDrp4o+GY9dVdhyM3h1RVhZgRfebiuu+/2KgID xED/mzhcAd4jdqPffMIsRA4PMfZN/H/H6KJcXN4XtXweLFVA/c63yOSb2YiFkpUwA63W n/ZKu9niV8qw6YGK2Xv57C1gRPlilk60/PsCfiCdBBT7d+0RV2RG6W6fCLMR3qCDmREj B4wAJxcf9viKNQBR+ea/NxCPXcXEP/E7akyJ1Xx5mZ8N32/sY8m3ty6ZtuHl04LxbMzO QL9Q== X-Gm-Message-State: AOJu0YzuZQnAIr6oPwiGcLNb1hW0/prFfW8xGAWibWoLcW80I+ZOsrbh d8ykeiBZvYy6/ujy4ghF2f+UNk/YTAbR7aFLYompwGu7nFh+ry+B X-Gm-Gg: ASbGncuvbJOF0vA16uBjd18v4vw/c1UBJapwKNBniS4Sc6PjUzViycGSUufde6brCiI Nn1MPKU3ZebCpbL+WjAVLoIIXBWvTPIW59uWHncdHQ8F1CBIeqMaSkg4pKfx9Xwg7w8bWze8Q86 LMAIghnlDzSNgBy3JmRri4GDlTjS4ijihF+2qsx5Qq1zLYVrG2JNDoekdBIfCrjLvto3qEpJzw6 VexLeHQh76oifRSJrsczaAX9pI+jOsL6/byYUtcDDKolppGNnYeVL1Bhtp/1yWG9Z3T92IckNbb LS6HLSZCK60JRCix/Ja0ilwZLXpjUBpVGinfX2PxOA== X-Google-Smtp-Source: AGHT+IHb0QNYG2Onap8eMBvN8I9VY59noKqjoYXbtG/2108uiPwT4H8VnGUzIpBF8WlYr7xWZTBMiQ== X-Received: by 2002:adf:9793:0:b0:385:f631:612 with SMTP id ffacd0b85a97d-38a87303f9dmr5159716f8f.17.1736432813935; Thu, 09 Jan 2025 06:26:53 -0800 (PST) Received: from lili (roam-nat-fw-prg-194-254-61-40.net.univ-paris-diderot.fr. [194.254.61.40]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a8e4b80c9sm1959170f8f.84.2025.01.09.06.26.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2025 06:26:53 -0800 (PST) From: Simon Tournier To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#75137] [PATCH 1/4] upstream: Switch to SRFI-71. In-Reply-To: <87y0zlvd70.fsf@gnu.org> References: <1878ae44b216f1f8b92efb19a7a67b435af23c90.1735296761.git.ludo@gnu.org> <87zfk4xla8.fsf@gmail.com> <87y0zlvd70.fsf@gnu.org> Date: Thu, 09 Jan 2025 12:11:03 +0100 Message-ID: <87ikqo5jjs.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, On Wed, 08 Jan 2025 at 10:59, Ludovic Courtès wrote: > It’s just that it has fewer parens and looks nicer: > https://lists.gnu.org/archive/html/guix-devel/2021-01/msg00234.html Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:434 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_03_06 Date: is 3 to 6 hours before Received: date 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zimon.toutoune[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 75137 Cc: 75137@debbugs.gnu.org, Christopher Baines , Josselin Poiret , Tobias Geerinckx-Rice , Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) Hi, On Wed, 08 Jan 2025 at 10:59, Ludovic Court=C3=A8s wrote: > It=E2=80=99s just that it has fewer parens and looks nicer: > https://lists.gnu.org/archive/html/guix-devel/2021-01/msg00234.html Thanks for explaining and the pointer. Cheers, simon From unknown Sat Aug 09 13:07:32 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 07 Feb 2025 12:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator