From patchwork Tue Dec 19 10:38:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 57708 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B0D9427BBEA; Tue, 19 Dec 2023 10:39:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0C5F427BBE2 for ; Tue, 19 Dec 2023 10:39:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFXV8-0000ah-7s; Tue, 19 Dec 2023 05:39:02 -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 1rFXV6-0000aT-BD for guix-patches@gnu.org; Tue, 19 Dec 2023 05:39:00 -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 1rFXV6-0001ar-21 for guix-patches@gnu.org; Tue, 19 Dec 2023 05:39:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFXV8-0000Gg-6v for guix-patches@gnu.org; Tue, 19 Dec 2023 05:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67897] [PATCH] guix: import: composer: Fix latest-release function. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Dec 2023 10:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67897@debbugs.gnu.org Cc: ludo@gnu.org, ngraves@ngraves.fr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1702982314928 (code B ref -1); Tue, 19 Dec 2023 10:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Dec 2023 10:38:34 +0000 Received: from localhost ([127.0.0.1]:34485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFXUf-0000Er-W5 for submit@debbugs.gnu.org; Tue, 19 Dec 2023 05:38:34 -0500 Received: from lists.gnu.org ([2001:470:142::17]:51730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFXUc-0000EK-CW for submit@debbugs.gnu.org; Tue, 19 Dec 2023 05:38:31 -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 1rFXUU-0000Wy-JI for guix-patches@gnu.org; Tue, 19 Dec 2023 05:38:22 -0500 Received: from 2.mo582.mail-out.ovh.net ([46.105.76.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFXUN-00013T-1b for guix-patches@gnu.org; Tue, 19 Dec 2023 05:38:21 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.148.22]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 9C2972BB2E for ; Tue, 19 Dec 2023 10:38:10 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-svfw8 (unknown [10.110.168.23]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 3518F1FE8B; Tue, 19 Dec 2023 10:38:10 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-svfw8 with ESMTPSA id +c6CCJJygWXofwAA1jTRqg (envelope-from ); Tue, 19 Dec 2023 10:38:10 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S003e703b300-fe3d-47fc-b586-839f853ba4db, 0A183DEDD9F7D7733B4F13041BD52F66DC821FED) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Tue, 19 Dec 2023 11:38:02 +0100 Message-ID: <20231219103802.15994-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 8255661070367843037 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvddutddgudekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutdelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht Received-SPF: pass client-ip=46.105.76.65; envelope-from=ngraves@ngraves.fr; helo=2.mo582.mail-out.ovh.net X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/composer.scm (latest-release): Support additional version argument. Replace package-name by composer-package-name. Change-Id: Ia55a841c8fe23e2d9c35ce80ab695c325ad8f962 --- guix/import/composer.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/import/composer.scm b/guix/import/composer.scm index 1ad608964b..069a950f90 100644 --- a/guix/import/composer.scm +++ b/guix/import/composer.scm @@ -243,14 +243,14 @@ (define (php-package? package) (eq? (package-build-system package) composer-build-system) (string-prefix? "php-" (package-name package)))) -(define (latest-release package) +(define* (latest-release package #:key (version #f)) "Return an for the latest release of PACKAGE." (let* ((php-name (guix-package->composer-name package)) - (package (composer-fetch php-name)) + (package (composer-fetch php-name #:version version)) (version (composer-package-version package)) (url (composer-source-url (composer-package-source package)))) (upstream-source - (package (package-name package)) + (package (composer-package-name package)) (version version) (urls (list url)))))