From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 2EdUMZjE2GZ7wQAAe85BDQ:P1 (envelope-from ) for ; Wed, 04 Sep 2024 20:35:37 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 2EdUMZjE2GZ7wQAAe85BDQ (envelope-from ) for ; Wed, 04 Sep 2024 22:35:36 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=TKGonazq; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=Y3MgRbWS; 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=1725482136; 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-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=QiC3UDVHbx9fWiQfqberKhSIpxhkzzL5SMAviswQB74=; b=nv9QJBEnSGKukitWRUd9Fy8X2qrYqNHTkInzKAXa1STzGvyz/QVGnmfdbGvyWrJPyE7gUq afujDzgay8WFfeEYrsvP0VbNGf354hPi0SkelN/T4A1fcw7YzJuIbtEAeoj6ednDFBVl4m NpI/AaZzI7Y8BYqeFjBAiectgHWV/JD5pC1rPqOROv6WZFzN/rkmRpG2e+SH1+jkFSKloR uOEXs2lVjGb8w5PFINfNMhLNQhwJ5t2Vy5Gskh2Gkr1+3SDnwO3gWETWalkrUkm8EA/DoE 7nVl+KBTx9J3EtNQYRHsV+8285T8kRBGnufUUCMvOAHAPLHqdfbMPdR9B748lw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725482136; a=rsa-sha256; cv=none; b=iWw+rfH8cXKKW53q69DloZohgq/U3shm2ybprJ7RoVP+ztOL4L1+MTaKcWlTvZHRswdSSM 2Wmk/WnYRqEiWCHn2bGTBTN3FHBFa+bCj8wD6HA9ymGHPb+YhXBuTYNi7K+CHu6medzk3V FRNd5Mbu1QXksWzt/uIvG3Guj/FcwmaHi3WVscpjUnOniUX16/fFpVCsGBNjrHDdX4Ss6k PyrDFYxSz+H7UJ1o18H5wrVcNXTPoz00kJV5vOJP6igyrxoJKOVSaKw49o/34hZPg1rS7L jIi4L6EKli7f8EVgTfMyFU4Wg+YkPLRZlHEjwmsnWPhHKgq002KD2stgBlhbAA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=TKGonazq; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=Y3MgRbWS; 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 21A727244B for ; Wed, 4 Sep 2024 22:35:35 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1slwia-000390-9i; Wed, 04 Sep 2024 16:35:08 -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 1slwiR-00037O-JX for guix-patches@gnu.org; Wed, 04 Sep 2024 16:34:59 -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 1slwiR-0002EX-7j for guix-patches@gnu.org; Wed, 04 Sep 2024 16:34:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=QiC3UDVHbx9fWiQfqberKhSIpxhkzzL5SMAviswQB74=; b=TKGonazqmEUaqdHZbDlRc3PYkOULdrrYy2jXDMG8wPKBzgPJJK6ig+4c6MDW0t0wZJLHp+1O5ZdaEcjVUUG5OFha1iB4B+tn1IuqdQJqCz31r+g/kAgCoB8KY7WhQ8RQwvaUd6vlWSXUJiEeuYi4O+gvHaf0RKtbv1J7tFYieIpuRpPic4ibIMlOuUtIRhxkk0ug2Xu7DhAjeFklis7NwmzXwIV6RCgbWH84xtSYtkElNS8faO3R1hfXKQ9Xua4lFAjiBH/4xBNe8ibxK8/p7yVn0/qn41GdA6cTLc5nwuohGdcGUu1x1zD5Mg9pAoKI/cNZB7nOuXFm8Sqs/9aXBg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1slwjT-0005Lr-8q for guix-patches@gnu.org; Wed, 04 Sep 2024 16:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70923] [PATCH v2 04/12] import: crate: Use (guix import utils) procedures. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Sep 2024 20:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70923 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70923@debbugs.gnu.org Received: via spool by 70923-submit@debbugs.gnu.org id=B70923.172548211120393 (code B ref 70923); Wed, 04 Sep 2024 20:36:03 +0000 Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:11 +0000 Received: from localhost ([127.0.0.1]:35460 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slwic-0005Ij-M2 for submit@debbugs.gnu.org; Wed, 04 Sep 2024 16:35:11 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39573 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slwiY-0005Gz-IP for 70923@debbugs.gnu.org; Wed, 04 Sep 2024 16:35:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1725482030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QiC3UDVHbx9fWiQfqberKhSIpxhkzzL5SMAviswQB74=; b=Y3MgRbWSaLNyBGyfG8lFumWYch0qPPA4m5x57KhjJp63p2p1j9OemB65D/ahGj8OQrOwg2 zubm8VpPSOwBV68Djix2dWvDkb/ZqZgfWagfR+xPgEfeP9aHtyp7Qn0LSLCny5ZzuRTaD8 bvwP8EYLPTodIm6WT0PiH7489WxifccxR6bmUCBQGYsm6djMhr0yyxl2zgBK11ifbXQveH 5KE4yDNszpF1nyCWvm3XdV1UzcBiF4FR2GyACkA1rGt/4t+0LmxSV97vO0xF+F+0SY54W4 OCijVqqYlMgeGbclvRvaH4UPtmbQTq5Idb4HAqrRB0BrcaC40DxDbwYEGCb3CQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id a9133544 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70923@debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:50 +0000 (UTC) Date: Wed, 4 Sep 2024 22:32:58 +0200 Message-ID: <20240904203309.23715-4-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240904203309.23715-1-herman@rimm.ee> References: <20240904203309.23715-1-herman@rimm.ee> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Queue-Id: 21A727244B X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.98 X-Spam-Score: -6.98 X-TUID: Ad6kY661rHze * guix/import/crate.scm (maybe-cargo-inputs, maybe-cargo-development-inputs, maybe-arguments): Delete procedures. (make-crate-sexp): Add 'unwrap' procedure, use with maybe-packages-field and fix indentation. * tests/crate.scm: Replace quasiquotes with list procedures. --- guix/import/crate.scm | 53 +++++++++--------------- tests/crate.scm | 94 +++++++++++++++++++++---------------------- 2 files changed, 66 insertions(+), 81 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 263c2a8b16..e451ebee68 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2023 Simon Tournier ;;; Copyright © 2023, 2024 Efraim Flashner ;;; Copyright © 2023, 2024 David Elsing +;;; Copyright © 2024 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -159,27 +160,6 @@ (define (make-input input version) (input (make-input input #f))) names)) -(define (maybe-cargo-inputs package-names) - (match (package-names->package-inputs package-names) - (() - '()) - ((package-inputs ...) - `(#:cargo-inputs (,'unquote (list ,@package-inputs)))))) - -(define (maybe-cargo-development-inputs package-names) - (match (package-names->package-inputs package-names) - (() - '()) - ((package-inputs ...) - `(#:cargo-development-inputs (,'unquote (list ,@package-inputs)))))) - -(define (maybe-arguments arguments) - (match arguments - (() - '()) - ((args ...) - `((arguments (,'quasiquote ,args)))))) - (define (version->semver-prefix version) "Return the version up to and including the first non-zero part" (first @@ -203,8 +183,14 @@ (define (format-inputs inputs) (let* ((port (http-fetch (crate-uri name version))) (guix-name (crate-name->package-name name)) - (cargo-inputs (format-inputs cargo-inputs)) - (cargo-development-inputs (format-inputs cargo-development-inputs)) + (unwrap (match-lambda + ((lst) lst) + (() '()))) + (cargo-inputs (maybe-packages-field '#:cargo-inputs + (format-inputs cargo-inputs))) + (cargo-development-inputs + (maybe-packages-field '#:cargo-development-inputs + (format-inputs cargo-development-inputs))) (description (beautify-description description)) (pkg `(package (name ,guix-name) @@ -223,12 +209,12 @@ (define (format-inputs inputs) `((properties '((crate-version-yanked? . #t)))) '()) (build-system cargo-build-system) - ,@(maybe-arguments (append (if build? - '() - '(#:skip-build? #t)) - (maybe-cargo-inputs cargo-inputs) - (maybe-cargo-development-inputs - cargo-development-inputs))) + ,@(maybe-list-field 'arguments + (append (if build? + '() + '(#:skip-build? #t)) + (unwrap cargo-inputs) + (unwrap cargo-development-inputs))) (home-page ,home-page) (synopsis ,(beautify-synopsis synopsis)) (description ,(if (string-prefix? "This" description) @@ -240,11 +226,10 @@ (define (format-inputs inputs) (#f #f) ((license) license) (_ `(list ,@license))))))) - (close-port port) - (package->definition pkg - (if yanked? - (string-append version "-yanked") - (version->semver-prefix version))))) + (close-port port) + (package->definition pkg (if yanked? + (string-append version "-yanked") + (version->semver-prefix version))))) (define (string->license string) (filter-map (lambda (license) diff --git a/tests/crate.scm b/tests/crate.scm index 63643c2728..95c93712a9 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2023 Efraim Flashner ;;; Copyright © 2023 David Elsing +;;; Copyright © 2024 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -498,10 +499,10 @@ (define have-guile-semver? (? string? hash))))) (build-system 'cargo-build-system) (arguments - ('quasiquote - (#:skip-build? #t + (list + #:skip-build? #t #:cargo-inputs - ('unquote (list rust-leaf-alice-0.7))))) + (list rust-leaf-alice-0.7))) (home-page "http://example.com") (synopsis "summary") (description "This package provides summary.") @@ -590,7 +591,7 @@ (define have-guile-semver? (? string? hash))))) (build-system cargo-build-system) (arguments - ('quasiquote (#:skip-build? #t))) + (list #:skip-build? #t)) (home-page "http://example.com") (synopsis "summary") (description "This package provides summary.") @@ -609,7 +610,7 @@ (define-public 'rust-leaf-alice-0.7 (base32 (? string? hash))))) (build-system cargo-build-system) - (arguments ('quasiquote (#:skip-build? #t))) + (arguments (list #:skip-build? #t)) (home-page "http://example.com") (synopsis "summary") (description "This package provides summary.") @@ -628,7 +629,7 @@ (define-public 'rust-leaf-bob-3 (base32 (? string? hash))))) (build-system cargo-build-system) - (arguments ('quasiquote (#:skip-build? #t))) + (arguments (list #:skip-build? #t)) (home-page "http://example.com") (synopsis "summary") (description "This package provides summary.") @@ -648,9 +649,9 @@ (define-public 'rust-intermediate-b-1 (? string? hash))))) (build-system cargo-build-system) (arguments - ('quasiquote (#:skip-build? #t - #:cargo-inputs - ('unquote (list rust-leaf-bob-3))))) + (list #:skip-build? #t + #:cargo-inputs + (list rust-leaf-bob-3))) (home-page "http://example.com") (synopsis "summary") (description "This package provides summary.") @@ -670,11 +671,11 @@ (define-public 'rust-intermediate-a-1 (? string? hash))))) (build-system cargo-build-system) (arguments - ('quasiquote (#:skip-build? #t - #:cargo-inputs - ('unquote (list rust-intermediate-b-1 - rust-leaf-alice-0.7 - rust-leaf-bob-3))))) + (list #:skip-build? #t + #:cargo-inputs + (list rust-intermediate-b-1 + rust-leaf-alice-0.7 + rust-leaf-bob-3))) (home-page "http://example.com") (synopsis "summary") (description "This package provides summary.") @@ -694,13 +695,13 @@ (define-public 'rust-root-1 (? string? hash))))) (build-system cargo-build-system) (arguments - ('quasiquote (#:cargo-inputs - ('unquote (list rust-intermediate-a-1 - rust-intermediate-b-1 - rust-leaf-alice-0.7 - rust-leaf-bob-3)) - #:cargo-development-inputs - ('unquote (list rust-intermediate-c-1))))) + (list #:cargo-inputs + (list rust-intermediate-a-1 + rust-intermediate-b-1 + rust-leaf-alice-0.7 + rust-leaf-bob-3) + #:cargo-development-inputs + ((list rust-intermediate-c-1)))) (home-page "http://example.com") (synopsis "summary") (description "This package provides summary.") @@ -727,8 +728,8 @@ (define-public 'rust-root-1 (? string? hash))))) (build-system cargo-build-system) (arguments - ('quasiquote (#:cargo-development-inputs - ('unquote (list rust-leaf-alice-0.7))))) + (list #:cargo-development-inputs + (list rust-leaf-alice-0.7))) (home-page "http://example.com") (synopsis "summary") (description "This package provides summary.") @@ -784,9 +785,8 @@ (define-public 'rust-intermediate-b-1 (? string? hash))))) (build-system cargo-build-system) (arguments - ('quasiquote (#:cargo-inputs - (("rust-leaf-bob" - ('unquote rust-leaf-bob-3)))))) + (list #:cargo-inputs + (list rust-leaf-bob-3))) (home-page "http://example.com") (synopsis "summary") (description "This package provides summary.") @@ -806,10 +806,10 @@ (define-public 'rust-intermediate-a-1 (? string? hash))))) (build-system cargo-build-system) (arguments - ('quasiquote (#:cargo-inputs - ('unquote (list rust-intermediate-b-1 - rust-leaf-alice-0.7 - rust-leaf-bob-3))))) + (list #:cargo-inputs + (list rust-intermediate-b-1 + rust-leaf-alice-0.7 + rust-leaf-bob-3))) (home-page "http://example.com") (synopsis "summary") (description "This package provides summary.") @@ -829,13 +829,13 @@ (define-public 'rust-root-1 (? string? hash))))) (build-system cargo-build-system) (arguments - ('quasiquote (#:cargo-inputs - ('unquote (list rust-intermediate-a-1 - rust-intermediate-b-1 - rust-leaf-alice-0.7 - rust-leaf-bob-3)) - #:cargo-development-inputs - ('unquote (list rust-intermediate-c-1))))) + (list #:cargo-inputs + (list rust-intermediate-a-1 + rust-intermediate-b-1 + rust-leaf-alice-0.7 + rust-leaf-bob-3) + #:cargo-development-inputs + (list rust-intermediate-c-1))) (home-page "http://example.com") (synopsis "summary") (description "This package provides summary.") @@ -945,11 +945,11 @@ (define rust-leaf-bob-3.0.2-yanked (? string? hash))))) (build-system cargo-build-system) (arguments - ('quasiquote (#:cargo-inputs - ('unquote (list rust-leaf-bob-3)) - #:cargo-development-inputs - ('unquote (list rust-leaf-bob-3.0.2-yanked - rust-leaf-bob-4.0.0-yanked))))) + (list #:cargo-inputs + (list rust-leaf-bob-3) + #:cargo-development-inputs + (list rust-leaf-bob-3.0.2-yanked + rust-leaf-bob-4.0.0-yanked))) (home-page "http://example.com") (synopsis "summary") (description "This package provides summary.") @@ -1073,11 +1073,11 @@ (define-public 'rust-bar-1 (? string? hash))))) (build-system cargo-build-system) (arguments - ('quasiquote (#:cargo-inputs - ('unquote (list rust-leaf-bob-3)) - #:cargo-development-inputs - ('unquote (list rust-leaf-bob-3.0.2-yanked - rust-leaf-bob-4.0.0-yanked))))) + (list #:cargo-inputs + (list rust-leaf-bob-3) + #:cargo-development-inputs + (list rust-leaf-bob-3.0.2-yanked + rust-leaf-bob-4.0.0-yanked))) (home-page "http://example.com") (synopsis "summary") (description "This package provides summary.") -- 2.45.2