From patchwork Mon Jul 12 14:41:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 31362 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 2B21D27BC83; Mon, 12 Jul 2021 15:42:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A216E27BC81 for ; Mon, 12 Jul 2021 15:42:11 +0100 (BST) Received: from localhost ([::1]:45420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2x8M-0000Dy-Lb for patchwork@mira.cbaines.net; Mon, 12 Jul 2021 10:42:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2x8E-00009V-BR for guix-patches@gnu.org; Mon, 12 Jul 2021 10:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55311) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2x8E-0008LN-3K for guix-patches@gnu.org; Mon, 12 Jul 2021 10:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m2x8D-00054B-Te for guix-patches@gnu.org; Mon, 12 Jul 2021 10:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49531] [PATCH core-updates v2 3/4] import: crate: Emit new-style package inputs. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Jul 2021 14:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49531 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49531@debbugs.gnu.org Received: via spool by 49531-submit@debbugs.gnu.org id=B49531.162610087219414 (code B ref 49531); Mon, 12 Jul 2021 14:42:01 +0000 Received: (at 49531) by debbugs.gnu.org; 12 Jul 2021 14:41:12 +0000 Received: from localhost ([127.0.0.1]:38624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2x7Q-000534-19 for submit@debbugs.gnu.org; Mon, 12 Jul 2021 10:41:12 -0400 Received: from out0.migadu.com ([94.23.1.103]:44451) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2x7M-00052t-Tn for 49531@debbugs.gnu.org; Mon, 12 Jul 2021 10:41:10 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1626100867; 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=HNKJNQEyGRwjOOWc2CMWCiJM7xoebcyBNrqP8TEAX7U=; b=T6m1tvQq2NZ4ue+N4XKgei/1fpY/Ts2wnB8GmjjvLX3TyYteIbCVk70ny++6LPKx7CI9zs TKWILWTl8enCnptBU1kPt2vEU0r4ah1QbrUpGo+t45KwoI5opnJADq5GQ+5hm744Z0UO3V 3Yd5Ac/qidtI6V9HQjbDaM0w6JkqC4U= Date: Mon, 12 Jul 2021 07:41:04 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches * guix/import/crate.scm (maybe-cargo-development-inputs) (maybe-cargo-inputs): Wrap PACKAGE-INPUTS in unquoted 'list'. * tests/crate.scm ("crate->guix-package") ("cargo-recursive-import") ("cargo-recursive-import-hoors-existing-packages"): Adjust accordingly. --- Looks like I missed the version in the test inputs. The tests passed before too though; it looks like the expected output (or at least the symbols in the expected output) needs to be quoted in some way, or else match just takes any value in that slot. guix/import/crate.scm | 5 +++-- tests/crate.scm | 30 +++++++++++------------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 287ffd2536..9c3bdfb9ab 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2021 Nicolas Goaziou +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -137,14 +138,14 @@ record or #f if it was not found." (() '()) ((package-inputs ...) - `(#:cargo-inputs ,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 ,package-inputs)))) + `(#:cargo-development-inputs (,'unquote (list ,@package-inputs)))))) (define (maybe-arguments arguments) (match arguments diff --git a/tests/crate.scm b/tests/crate.scm index b6c3a7ee2e..f09a3f6628 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -374,7 +375,7 @@ ('quasiquote (#:skip-build? #t #:cargo-inputs - (("rust-leaf-alice" ('unquote 'rust-leaf-alice-0.7)))))) + ('unquote (list rust-leaf-alice-0.7))))) (home-page "http://example.com") (synopsis "summary") (description "summary") @@ -494,8 +495,7 @@ (arguments ('quasiquote (#:skip-build? #t #:cargo-inputs - (("rust-leaf-bob" - ('unquote rust-leaf-bob-3)))))) + ('unquote (list rust-leaf-bob-3))))) (home-page "http://example.com") (synopsis "summary") (description "summary") @@ -517,12 +517,9 @@ (arguments ('quasiquote (#:skip-build? #t #:cargo-inputs - (("rust-intermediate-b" - ('unquote rust-intermediate-b-1)) - ("rust-leaf-alice" - ('unquote 'rust-leaf-alice-0.7)) - ("rust-leaf-bob" - ('unquote rust-leaf-bob-3)))))) + ('unquote (list rust-intermediate-b-1 + rust-leaf-alice-0.7 + rust-leaf-bob-3))))) (home-page "http://example.com") (synopsis "summary") (description "summary") @@ -543,14 +540,10 @@ (build-system cargo-build-system) (arguments ('quasiquote (#:cargo-inputs - (("rust-intermediate-a" - ('unquote rust-intermediate-a-1)) - ("rust-intermediate-b" - ('unquote rust-intermediate-b-1)) - ("rust-leaf-alice" - ('unquote 'rust-leaf-alice-0.7)) - ("rust-leaf-bob" - ('unquote rust-leaf-bob-3)))))) + ('unquote (list rust-intermediate-a-1 + rust-intermediate-b-1 + rust-leaf-alice-0.7 + rust-leaf-bob-3))))) (home-page "http://example.com") (synopsis "summary") (description "summary") @@ -651,8 +644,7 @@ (build-system cargo-build-system) (arguments ('quasiquote (#:cargo-inputs - (("rust-docopt" - ('unquote 'rust-docopt-0.8)))))) + ('unquote (list rust-docopt-0.8))))) (home-page "http://example.com") (synopsis "summary") (description "summary")