From unknown Thu Jun 19 14:06:24 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#67906 <67906@debbugs.gnu.org> To: bug#67906 <67906@debbugs.gnu.org> Subject: Status: [PATCH] guix: import: composer: Implement recursive package refresh. Reply-To: bug#67906 <67906@debbugs.gnu.org> Date: Thu, 19 Jun 2025 21:06:24 +0000 retitle 67906 [PATCH] guix: import: composer: Implement recursive package r= efresh. reassign 67906 guix-patches submitter 67906 Nicolas Graves severity 67906 normal tag 67906 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 19 11:54:16 2023 Received: (at submit) by debbugs.gnu.org; 19 Dec 2023 16:54:16 +0000 Received: from localhost ([127.0.0.1]:37217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFdMF-0004Iz-Iw for submit@debbugs.gnu.org; Tue, 19 Dec 2023 11:54:15 -0500 Received: from lists.gnu.org ([2001:470:142::17]:50406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFdMD-0004Ik-RQ for submit@debbugs.gnu.org; Tue, 19 Dec 2023 11:54:14 -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 1rFdM5-0006Lg-Oh for guix-patches@gnu.org; Tue, 19 Dec 2023 11:54:05 -0500 Received: from 4.mo560.mail-out.ovh.net ([87.98.172.75]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFdLr-0003dC-Sc for guix-patches@gnu.org; Tue, 19 Dec 2023 11:54:05 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.148.20]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id B6BAC2C035 for ; Tue, 19 Dec 2023 16:53:47 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-mhcvk (unknown [10.108.9.175]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 6841F1FDB1; Tue, 19 Dec 2023 16:53:46 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-mhcvk with ESMTPSA id TpgBFZrKgWVOuAgAWtQG5g (envelope-from ); Tue, 19 Dec 2023 16:53:46 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S003e9008a7d-54ef-4d88-94f2-8b56df405b94, 0A183DEDD9F7D7733B4F13041BD52F66DC821FED) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves To: guix-patches@gnu.org Subject: [PATCH] guix: import: composer: Implement recursive package refresh. Date: Tue, 19 Dec 2023 17:53:28 +0100 Message-ID: <20231219165328.11135-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 14599262617711534813 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvddutddgleegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutdelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht Received-SPF: pass client-ip=87.98.172.75; envelope-from=ngraves@ngraves.fr; helo=4.mo560.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: ludo@gnu.org, ngraves@ngraves.fr 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.0 (/) * 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. --- 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 b23af1b91f..26229e3ad0 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,8 +243,8 @@ (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 the VERSION or latest release of PACKAGE." (let* ((php-name (guix-package->composer-name package)) (composer-package (composer-fetch php-name #:version version))) (match composer-package @@ -254,18 +254,34 @@ (define* (latest-release package #:key (version #f)) php-name) #f) (_ - (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))))))) (define %composer-updater (upstream-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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 05 21:49:39 2024 Received: (at control) by debbugs.gnu.org; 6 Apr 2024 01:49:39 +0000 Received: from localhost ([127.0.0.1]:37858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsvBb-0003pj-2X for submit@debbugs.gnu.org; Fri, 05 Apr 2024 21:49:39 -0400 Received: from 5.mo550.mail-out.ovh.net ([178.33.45.107]:56201) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsvBX-0003pN-IW for control@debbugs.gnu.org; Fri, 05 Apr 2024 21:49:38 -0400 Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.25.74]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4VBJF33r9Qz1NYK for ; Sat, 6 Apr 2024 01:49:27 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-mhxmf (unknown [10.110.96.185]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id F1ECC1FE11 for ; Sat, 6 Apr 2024 01:49:26 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-6684bf9d7b-mhxmf with ESMTPSA id RelCOSaqEGagIAoAwt25lQ (envelope-from ) for ; Sat, 06 Apr 2024 01:49:26 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G0026a62db50-3fd5-42dc-a37f-ad6c66819da7, 864EC9CA9318039CF6D4BAE14C4DDD6D93296F2D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves To: control@debbugs.gnu.org Subject: closing superseeded patches. Date: Sat, 06 Apr 2024 03:49:26 +0200 Message-ID: <87bk6n45w9.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 12260768510820475493 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeguddgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffufffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepueejleeileejfffhleetjedtleejheevudffleevgfdufeekhefgvddvveegveefnecukfhppeduvdejrddtrddtrddupdeltddruddutddrudejvddrfeegpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtoheptghonhhtrhholhesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control 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: -1.0 (-) close 67897 close 67898 close 67906 -- Best regards, Nicolas Graves From unknown Thu Jun 19 14:06:24 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 04 May 2024 11:24:05 +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