From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 iFN+BWRxQmbP2wAAe85BDQ:P1 (envelope-from ) for ; Mon, 13 May 2024 22:00:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id iFN+BWRxQmbP2wAAe85BDQ (envelope-from ) for ; Mon, 13 May 2024 22:00:36 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=SccUHag+; 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=1715630435; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=cORj4aNac/HP99TTYD00niXKoLctGftt1+SuUwOYPN8=; b=czP0w6wcs27z0dbh860Q2cQ+vfcHC0T+2geUb02Up0hPVNNn5NtmMXp/pN23mDLG6EJcD4 WJd84PFF47tH+sLTXb64HRbrNjuZsZMaHy8gzyLUX6OS69E+69/d3P80uhggWj5H2iCks4 uGhTpuPJOTwcBpP95uULL8FWCTgYqhA+AXE/OrPNgiVDYI8t/qAaaQ087NVlNU/teLwOBY ExxLEa4LHvW6W23kthR4DgK2+lI7o3ValB2mt0ZurEimSjyzIlzhfHhvQsdmA1NCd5Arvk sb/shS19bsUWik0rcDWhMb8rsqAPUngVpVjF74Przb1DPsaCHs88qeau31jACA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1715630435; a=rsa-sha256; cv=none; b=trCbMSZezRqVay5p24z0ON3jqzpfU8zBqqo7s/D4bkhAMUiNmYJKJ9YtM28/UGmtRS6b/q wjMZ1tEc+Y+ZwnAbUV4NNpe+Z8ogCam+CrWG4lHCE9rpYb9r5Key3yWjYPpsMkNalw/GTm tVDgpOAbvvRxzAvpF2e6nAaIdsk7UzWkX7QFiAs3qoPkY9HiMhw0AA1LcOUAvgiSdd0Yxo k/joK5jSgSsqAnfqEoequh7982E/OajIT95Q53Psj1GWERpQ+NHyi57qBsPr0eQ3VUuOb2 kprsc75EED5b13JXfuuXLqfhMKsjq+2xHfMAv6X4gaIBo5RGGmlj4SCh7NF2lg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=SccUHag+; 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 B7DE12511 for ; Mon, 13 May 2024 22:00:35 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6bqR-00033u-1i; Mon, 13 May 2024 16:00:23 -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 1s6bq6-00031D-R4 for guix-patches@gnu.org; Mon, 13 May 2024 16:00:02 -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 1s6bq5-00062V-Kr for guix-patches@gnu.org; Mon, 13 May 2024 16:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6bq6-00009A-86 for guix-patches@gnu.org; Mon, 13 May 2024 16:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70923] [PATCH 00/13] Add (guix import utils) procedures. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 20:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70923 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70923@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1715630400525 (code B ref -1); Mon, 13 May 2024 20:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 May 2024 20:00:00 +0000 Received: from localhost ([127.0.0.1]:34536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6bq3-00008P-M8 for submit@debbugs.gnu.org; Mon, 13 May 2024 15:59:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:49500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6bq0-00008I-Om for submit@debbugs.gnu.org; Mon, 13 May 2024 15:59:57 -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 1s6bpz-000300-JX for guix-patches@gnu.org; Mon, 13 May 2024 15:59:55 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1s6bpx-0005rF-Jl for guix-patches@gnu.org; Mon, 13 May 2024 15:59:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1715630385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=cORj4aNac/HP99TTYD00niXKoLctGftt1+SuUwOYPN8=; b=SccUHag+hT/7X1CUbVsbMruJgEw0GisjF3tPhCJuNo8yKbO32+GblD/KYW4F1QapdANHwE 3pfy7VciYTcWLDXRdIibt6c7QO2hk1C/QY2nVPcTe3/ClrzkDLAqEtgM0FcEqlatYGPo9O NFQSH03i/VG8Xtiu/JYSeKSbEKldlqmJJTpsX3ZfNfktvAdHWIsiLEN0QSGMdO82FqgBXC cF5pPIh2DBFeRG0naY7jreKEvgJeHZoJeBKxMjycEvGr3rw1WsAA6YpY/n1WQqud6tvCp+ hiNF1bqZMiWK/G8YhhPasitrN0UrSieJyYJmXVMud1kgByvfzdSmz0y1V8EkkQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 06d3a5f7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Mon, 13 May 2024 19:59:45 +0000 (UTC) Date: Mon, 13 May 2024 21:59:13 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_PBL=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001 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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via 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: -3.57 X-Spam-Score: -3.57 X-Migadu-Queue-Id: B7DE12511 X-Migadu-Scanner: mx11.migadu.com X-TUID: rE+L3N9WLNz8 Hello, All but one importers (cran) now use procedures from (guix import utils) to create the package inputs and arguments fields. I also made the cargo build-system compatible with the new style of inputs. [PATCH 02/13] and [PATCH 03/13] are based on commits from [bug#49531] which were merged into the core-updates branch in January: [1] and [2] respectively. The series is based on the master branch because I do not think emitting and parsing the new style of cargo inputs is a major change. I can prepare a patch series for core-updates based on [1] if needed though. For once I remove more lines of code than I add, yay! Cheers, Herman [1]: 49a85411b2af0e324e3b70839acea2720e855b32 [2]: 71ef0d2216890c29cb77c7b3e2af4ce3b629d7b8 Herman Rimm (10): build-system: cargo: Accept unlabeled #:cargo-inputs. tests: elm: Adjust to new-style package inputs. import: utils: Add 'maybe-upstream-inputs' procedure. import: pypi: Use 'maybe-list-field' procedure. import: elpa: Use maybe-propagated-inputs procedure. import: hackage: Use 'maybe-list-field' procedure. import: cran: Use 'maybe-list-field' procedure. import: cpan: Use 'maybe-upstream-inputs' procedure. import: egg: Use maybe-*inputs procedures. import: hexpm: Use (guix import utils) 'maybe-inputs' procedure. Sarah Morgensen (3): import: utils: Emit new-style package inputs. tests: go: Adjust to new-style package inputs. import: crate: Emit new-style package inputs. guix/build-system/cargo.scm | 12 +++- guix/import/cpan.scm | 22 ++----- guix/import/cran.scm | 35 +++++------ guix/import/crate.scm | 54 ++++++---------- guix/import/egg.scm | 38 +++--------- guix/import/elpa.scm | 9 +-- guix/import/hackage.scm | 38 ++++-------- guix/import/hexpm.scm | 20 ++---- guix/import/pypi.scm | 20 ++---- guix/import/utils.scm | 67 ++++++++++++-------- tests/crate.scm | 119 +++++++++++++++--------------------- tests/elm.scm | 4 +- tests/go.scm | 2 +- tests/hackage.scm | 13 ++-- 14 files changed, 182 insertions(+), 271 deletions(-) base-commit: 2793a79117d244b9e8fd48a8c3477f33f425210a -- 2.41.0