From patchwork Sat Apr 6 02:08:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 62760 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 CD53427BBEA; Sat, 6 Apr 2024 03:10:05 +0100 (BST) 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 0083B27BBE2 for ; Sat, 6 Apr 2024 03:10:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rsvVG-0002Z5-Md; Fri, 05 Apr 2024 22:09:58 -0400 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 1rsvVE-0002YZ-T1 for guix-patches@gnu.org; Fri, 05 Apr 2024 22:09:56 -0400 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 1rsvVE-0002Ff-K9 for guix-patches@gnu.org; Fri, 05 Apr 2024 22:09:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rsvVK-00088p-EO for guix-patches@gnu.org; Fri, 05 Apr 2024 22:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70227] [PATCH 2/2] guix: import: composer: Implement recursive package refresh. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Apr 2024 02:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70227@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 70227-submit@debbugs.gnu.org id=B70227.171236935431095 (code B ref 70227); Sat, 06 Apr 2024 02:10:02 +0000 Received: (at 70227) by debbugs.gnu.org; 6 Apr 2024 02:09:14 +0000 Received: from localhost ([127.0.0.1]:37882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsvUX-00085S-Qb for submit@debbugs.gnu.org; Fri, 05 Apr 2024 22:09:14 -0400 Received: from 7.mo561.mail-out.ovh.net ([46.105.57.200]:36971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsvUU-000856-He for 70227@debbugs.gnu.org; Fri, 05 Apr 2024 22:09:11 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.139.217]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4VBJgg1Q3Zz1Mfl for <70227@debbugs.gnu.org>; Sat, 6 Apr 2024 02:09:03 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-p9bpr (unknown [10.110.168.159]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 053541FD43; Sat, 6 Apr 2024 02:09:02 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-p9bpr with ESMTPSA id dnUFOr6uEGYDrQIADCYBAg (envelope-from ); Sat, 06 Apr 2024 02:09:02 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R00462e35e1e-cec0-4859-8cdd-c3807333bc31, 864EC9CA9318039CF6D4BAE14C4DDD6D93296F2D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.110.172.34 Date: Sat, 6 Apr 2024 04:08:51 +0200 Message-ID: <20240406020852.15996-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240406020852.15996-1-ngraves@ngraves.fr> References: <20240406020852.15996-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12591783085524509410 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeguddgheehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddruddutddrudejvddrfeegpdefjedrheelrddugedvrddutddvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtddvvdejseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedupdhmohguvgepshhmthhpohhuth 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 (composer-fetch): Replace reduce by fold to correct version selection logic. (latest-release): Implement recursive package refresh. Rename to import-release. (import-release): New function, formerly known as latest-release. Change-Id: I8f629b4d1da866f5986d39b4e159f2b44af9ee49 --- guix/import/composer.scm | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/guix/import/composer.scm b/guix/import/composer.scm index 75419ca63e..e2a60969aa 100644 --- a/guix/import/composer.scm +++ b/guix/import/composer.scm @@ -113,7 +113,7 @@ (define* (composer-fetch name #:key (version #f)) (if version (assoc-ref packages version) (cdr - (reduce + (fold (lambda (new cur-max) (match new (((? valid-version? version) . tail) @@ -243,16 +243,32 @@ (define (php-package? package) (eq? (package-build-system package) composer-build-system) (string-prefix? "php-" (package-name package)))) -(define* (latest-release package #:key (version #f)) - "Return an for the latest release of PACKAGE." +(define* (import-release package #:key (version #f)) + "Return an for VERSION or the latest release of PACKAGE." (let* ((php-name (guix-package->composer-name package)) (composer-package (composer-fetch php-name #:version version))) (if composer-package - (upstream-source - (package (composer-package-name composer-package)) - (version (composer-package-version composer-package)) - (urls (list (composer-source-url - (composer-package-source composer-package))))) + (let* ((guix-name (composer-package-name composer-package)) + (inputs + (append + (map (lambda (dep) + (upstream-input + (name php-name) + (downstream-name guix-name) + (type 'regular))) + (composer-package-require composer-package)) + (map (lambda (dep) + (upstream-input + (name php-name) + (downstream-name guix-name) + (type 'native))) + (composer-package-dev-require composer-package))))) + (upstream-source + (package guix-name) + (version (composer-package-version composer-package)) + (urls (list (composer-source-url + (composer-package-source composer-package)))) + (inputs inputs))) (begin (warning (G_ "failed to parse ~a~%") php-name) #f)))) @@ -262,7 +278,7 @@ (define %composer-updater (name 'composer) (description "Updater for Composer packages") (pred php-package?) - (import latest-release))) + (import import-release))) (define* (composer-recursive-import package-name #:optional version) (recursive-import package-name