From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id CGioFJwRMGaPxwAA62LTzQ:P1 (envelope-from ) for ; Mon, 29 Apr 2024 23:31:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id CGioFJwRMGaPxwAA62LTzQ (envelope-from ) for ; Mon, 29 Apr 2024 23:31:08 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=H1r0LiKe; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714426268; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=YrABkmJyjx/v5bMOef0TQQEg7Di2/c5CGFCuPXm9L2c=; b=R5CpFhj3WcJQXqLhIOK8P53T580tgAU7+5UOzlQtGkCJdkEY1iQKgls6n/OjV9oOWK1uNb k1PnDpDLI8WKRF6C2gjW1EGfxYxJuIEVpLInNsg/hlZuajwJ6Njm2tLPF4eqoKNZm0D8Pd byDLX9w9orVK3/fnksroFty1uIC0GNMJXffckIfFkR0eIV1zBvrXuih5Pa+iH06PINFDCu JUnH7yb/81dYOJ9uATgz1mKZS8+XJ3qrXmEPu85PQzJdzZZCWxLCDSMPNY/E7rOenmV7Gu kXiTmbEoEBhotHUIbJJmayeX+OEAugmphnpE2U8ZXPQkSCe/S5RFlavGdQeGTQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714426268; a=rsa-sha256; cv=none; b=duEVvWRB9SSQO8d1LphhTVNJSESonzZ470sMg6S4nXyzd1MUIKzfDMAJMlQts6C6LlJYlP vi5+ysUexWOt/ZMxZYf8R77bC1pf9s14Kea46aXojAUmN0t9pQvlr93zrqD057IyzSdzyv 7sRKlH+oXPd0+RqgynMgCPFVaZSyEEKAFWQPlAFeawC4FXkx9sFf7ieXko8o/EBRjabXIP L7NnbU05gqfh0GdV2+GWt1z+oVa+142SHmTDzoGgsMnUwdvEcnTq58ypqCg7ZNz1B4Y69S aOjd9dSf8xkUcpqIwMuvNj8mdgpnJAtggQ5Z3Me158zLk2sGUFrZ9YP+Bh7OrQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=H1r0LiKe; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7024477F61 for ; Mon, 29 Apr 2024 23:31:07 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1YaG-00070m-Tx; Mon, 29 Apr 2024 17:30:48 -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 1s1YaB-00070J-2I for guix-patches@gnu.org; Mon, 29 Apr 2024 17:30:43 -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 1s1YaA-0003BR-PZ for guix-patches@gnu.org; Mon, 29 Apr 2024 17:30:42 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s1YaU-0003TZ-F0 for guix-patches@gnu.org; Mon, 29 Apr 2024 17:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70227] [PATCH 2/2] guix: import: composer: Implement recursive package refresh. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Apr 2024 21:31: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: Nicolas Graves Cc: 70227@debbugs.gnu.org Received: via spool by 70227-submit@debbugs.gnu.org id=B70227.171442621813345 (code B ref 70227); Mon, 29 Apr 2024 21:31:02 +0000 Received: (at 70227) by debbugs.gnu.org; 29 Apr 2024 21:30:18 +0000 Received: from localhost ([127.0.0.1]:58825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1YZl-0003TA-W0 for submit@debbugs.gnu.org; Mon, 29 Apr 2024 17:30:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50170) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1YZi-0003T0-Gz for 70227@debbugs.gnu.org; Mon, 29 Apr 2024 17:30:16 -0400 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 1s1YZH-0002mq-Bp; Mon, 29 Apr 2024 17:29:47 -0400 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=YrABkmJyjx/v5bMOef0TQQEg7Di2/c5CGFCuPXm9L2c=; b=H1r0LiKezLyn61UIi7Px p5iA7rn1ldR8QcBH+74oSpxeICVRKQlWR0H3VrKcpmdwhjyfYzwiKFlyxGER3/IG+XZWchf669Aax INEvUDBXcQp1noreu17h9CJUcozfflI7x5aowGhhVeRBEY6rma1FgM8Wnm99xWZ6tScg8N7aUrxoj Spc9kf0Pes1ukP2N1zoisofz5iO66iJ6qQkQxj49+WvHTxJPpwYmeroGa22YcWjzzD9+Z5AX17oTP hdvqGJZQZWVOtvvu6HXud0HSf7l1Q28bgT6DUlUBu47WKQZ1nSheRC0qhiiKqNPxI4Izr5HV216Xu WRptUaNfSvQcvw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <20240406020852.15996-2-ngraves@ngraves.fr> (Nicolas Graves's message of "Sat, 6 Apr 2024 04:08:51 +0200") References: <20240406020852.15996-1-ngraves@ngraves.fr> <20240406020852.15996-2-ngraves@ngraves.fr> Date: Mon, 29 Apr 2024 23:29:44 +0200 Message-ID: <87wmofzwl3.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-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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.09 X-Spam-Score: -4.09 X-Migadu-Queue-Id: 7024477F61 X-Migadu-Scanner: mx11.migadu.com X-TUID: o8oZZosmQ8S1 Hi! Nicolas Graves skribis: > * 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. Nice, glad to see this feature put to good use. :-) [...] > +(define* (import-release package #:key (version #f)) > + "Return an for VERSION or the latest release of PACK= AGE." > (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))) Shouldn=E2=80=99t it be: (upstream-input (name dep) (downstream-name (php-package-name dep)) (type =E2=80=A6)) ? As a slight improvement, since the =E2=80=98inputs=E2=80=99 field of is delayed (wrapped in a promise, so that its computation only happens when it=E2=80=99s needed), you could arrange to replace the =E2=80=98inputs= =E2=80=99 variable above like so: (define (dependency->input dependency type) (upstream-input =E2=80=A6)) (upstream-source ;; =E2=80=A6 (inputs (append (map (cut dependency->input <> 'regular) =E2=80=A6) (map (cut dependency->input <> 'native) =E2=80=A6)))) I hope this makes sense. Thanks! Ludo=E2=80=99.