From patchwork Tue Sep 26 10:31:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 54302 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 A203C27BBE9; Tue, 26 Sep 2023 11:33:36 +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=unavailable 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 6565E27BBE2 for ; Tue, 26 Sep 2023 11:33:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ql5N9-0002LC-AA; Tue, 26 Sep 2023 06:32:55 -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 1ql5N4-0002IM-D0 for guix-patches@gnu.org; Tue, 26 Sep 2023 06:32:50 -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 1ql5N4-0000oB-4k for guix-patches@gnu.org; Tue, 26 Sep 2023 06:32:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ql5NH-00007A-1A for guix-patches@gnu.org; Tue, 26 Sep 2023 06:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42338] [PATCH v3 4/7] guix: import: composer: Use memoization. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Sep 2023 10:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42338 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42338@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 42338-submit@debbugs.gnu.org id=B42338.1695724346335 (code B ref 42338); Tue, 26 Sep 2023 10:33:02 +0000 Received: (at 42338) by debbugs.gnu.org; 26 Sep 2023 10:32:26 +0000 Received: from localhost ([127.0.0.1]:47353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ql5Mf-00005I-Va for submit@debbugs.gnu.org; Tue, 26 Sep 2023 06:32:26 -0400 Received: from 4.mo576.mail-out.ovh.net ([46.105.42.102]:39685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ql5MX-0008W4-J6 for 42338@debbugs.gnu.org; Tue, 26 Sep 2023 06:32:19 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.1.239]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 6496F29B90 for <42338@debbugs.gnu.org>; Tue, 26 Sep 2023 10:32:03 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-kn9l4 (unknown [10.108.16.250]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 147301FEB9; Tue, 26 Sep 2023 10:32:02 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-kn9l4 with ESMTPSA id l3fBOSKzEmXEmQAAc8hNeQ (envelope-from ); Tue, 26 Sep 2023 10:32:02 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G004299ee593-ab13-4c2f-bf67-bdd233d952a8, 673A0E1412D75BE9E6E9083740E1979C5D801E24) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Tue, 26 Sep 2023 12:31:41 +0200 Message-ID: <7fa9b1098369b75b162944d5db9a6d646af115ad.1695724304.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <6abfbb4d4d57642fea6bae5835ff0d365de7e24a.1695724304.git.ngraves@ngraves.fr> References: <6abfbb4d4d57642fea6bae5835ff0d365de7e24a.1695724304.git.ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12908160960454255330 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvjedrtddtgddtudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpefggfefvefhgeeuteegkedtieeujeeileetffduuefgfeffleffgeevfeeftefftdenucffohhmrghinhepphgrtghkrghgihhsthdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepgedvfeefkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht 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 | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/guix/import/composer.scm b/guix/import/composer.scm index c152f402bb..177dc63092 100644 --- a/guix/import/composer.scm +++ b/guix/import/composer.scm @@ -27,6 +27,7 @@ (define-module (guix import composer) #:use-module (guix import json) #:use-module (guix import utils) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix memoization) #:use-module (guix packages) #:use-module (guix serialization) #:use-module (guix upstream) @@ -197,16 +198,18 @@ (define (make-php-sexp composer-package) ((license) license) (_ license))))))))) -(define* (composer->guix-package package-name #:optional version) - "Fetch the metadata for PACKAGE-NAME from packagist.org, and return the +(define composer->guix-package + (memoize + (lambda* (package-name #:key version #:allow-other-keys) + "Fetch the metadata for PACKAGE-NAME from packagist.org, and return the `package' s-expression corresponding to that package, or #f on failure." - (let ((package (composer-fetch package-name version))) - (and package - (let* ((package (json->composer-package package)) - (dependencies-names (composer-package-require package)) - (dev-dependencies-names (composer-package-dev-require package))) - (values (make-php-sexp package) - (append dependencies-names dev-dependencies-names)))))) + (let ((package (composer-fetch package-name version))) + (and package + (let* ((package (json->composer-package package)) + (dependencies-names (composer-package-require package)) + (dev-dependencies-names (composer-package-dev-require package))) + (values (make-php-sexp package) + (append dependencies-names dev-dependencies-names)))))))) (define (guix-name->composer-name name) "Given a guix package name, return the name of the package in Packagist." @@ -265,6 +268,7 @@ (define %composer-updater (import latest-release))) (define* (composer-recursive-import package-name #:optional version) - (recursive-import package-name '() + (recursive-import package-name + #:version version #:repo->guix-package composer->guix-package #:guix-name php-package-name))