From patchwork Mon May 13 19:59:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 2548 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 0B45327BBE9; Mon, 13 May 2024 21:00:38 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 4AFD727BBE2 for ; Mon, 13 May 2024 21:00:35 +0100 (BST) 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 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 X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 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