From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id OMeCFMVU7GAGYgEAgWs5BA (envelope-from ) for ; Mon, 12 Jul 2021 16:42:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id eAMuEMVU7GBEBgAAB5/wlQ (envelope-from ) for ; Mon, 12 Jul 2021 14:42:13 +0000 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 D2E8412723 for ; Mon, 12 Jul 2021 16:42:12 +0200 (CEST) Received: from localhost ([::1]:45420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2x8N-0000Dy-R7 for larch@yhetil.org; Mon, 12 Jul 2021 10:42:11 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches From: Sarah Morgensen via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626100933; 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=HNKJNQEyGRwjOOWc2CMWCiJM7xoebcyBNrqP8TEAX7U=; b=Yy2fSRhYD/Oy/fNkbMcEITUw44NUNq5ONNd5HzMLs8lagwW9Af+87domEKOicv2s7SjFSX 3v/N5QQ7/Xb8XWC9p1WWhkfqP6V5/FBiuwYI395PgjeMlaa3i4sOQjMONXC7voTAwcK1bF izIXYGBS6WRKcg2McdCmcSwZOWmTOXSVKCZvhYFXu4Kvywb5eYui6yZUXPJzm+M1VpxxDs BBIIe2kdcoccT9j60hICgZ6yTmU2yIUzjCR/eXs9A2o6GIBxcaOshwKlv2BckDWxkiRvnU yUov3gE8Mg6JINX9aECSaYtzvSeoO/RqzpNDW1owkOmT82mnbKqR55LR9qzd7Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626100933; a=rsa-sha256; cv=none; b=eqlQHZHSHrJvUuDC8udagBuZ0W7dvJQ3QgILa67ABTAyjAI9RXJ2e188Osqb78tjprrbNr MLUN43PlNRdehA6qHbA8uQAei7aBwn7zCGo6wXUg82szvNZmiV/SNzKAEBeYsADstr7SA2 ED3+JTbY7l8EGK89PDwRfy4OXQ+mVpE9M6oeP5MAyuh/102fjtA5b5MyJ+q2Aq/jRZTshX Mwd6mF6vgVc/bFkiJyFogIbvEpeZY08/TRpbN7qU4dHRQBSl7GQeUHliQaRr+Y8UUxCsNI x/OQJznuIJL7W8MWNAOeBvNkw7R48jDZ9ENbWWhOp8tBehsYFcUQlFQLMxdLFA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=T6m1tvQq; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.90 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=T6m1tvQq; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: D2E8412723 X-Spam-Score: -2.90 X-Migadu-Scanner: scn0.migadu.com X-TUID: knuMMMxgkTyp * 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") -- 2.31.1