From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id AF9kBdjX62CtewAAgWs5BA (envelope-from ) for ; Mon, 12 Jul 2021 07:49:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 6E4sAdjX62AAEwAA1q6Kng (envelope-from ) for ; Mon, 12 Jul 2021 05:49:12 +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 D15E69945 for ; Mon, 12 Jul 2021 07:49:10 +0200 (CEST) Received: from localhost ([::1]:45364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2ooX-0004sy-PR for larch@yhetil.org; Mon, 12 Jul 2021 01:49:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2ooR-0004oh-0N for guix-patches@gnu.org; Mon, 12 Jul 2021 01:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53029) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2ooQ-0006YA-Pm for guix-patches@gnu.org; Mon, 12 Jul 2021 01:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m2ooQ-00041g-Io for guix-patches@gnu.org; Mon, 12 Jul 2021 01:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49531] [PATCH core-updates 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 05:49:02 +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.162606890115404 (code B ref 49531); Mon, 12 Jul 2021 05:49:02 +0000 Received: (at 49531) by debbugs.gnu.org; 12 Jul 2021 05:48:21 +0000 Received: from localhost ([127.0.0.1]:36338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2onl-00040N-A0 for submit@debbugs.gnu.org; Mon, 12 Jul 2021 01:48:21 -0400 Received: from out2.migadu.com ([188.165.223.204]:32868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2onh-000400-EX for 49531@debbugs.gnu.org; Mon, 12 Jul 2021 01:48:18 -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=1626068896; 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=b9O0cmC5jvCpQoYElX2tWw2LsV2v9tUpGR6f8fQ+y6o=; b=jnTURbU8+rFfFha0qUHqiLIH0/ME5zoW1m84xaUM+kA3qYnFr5ezB/OEX35sPi1YRnaJWN OdDlpfji6orc6mWwGW5JFvbim85qK/PMEur8JNGJ+hY/b/elYOoeSvFItooCLTp8G+0x0a WfOenl4AqUXTM8HEes16UcFPH3ZTGkc= Date: Sun, 11 Jul 2021 22:48:08 -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=1626068951; 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=b9O0cmC5jvCpQoYElX2tWw2LsV2v9tUpGR6f8fQ+y6o=; b=tjwRC8nW9T62o0E/sYFRRTFp4UV7R3VfhmfuW/R8yrp8HtCnDO8M1mN/iLDxVI6aeAyBsx Nfpy2tsKkv4I1qC7JDAAzpRn1pWAZLfJOza1zQaQGrRdygBqfFw2+k4XiB7tL0+v82BUao i/CtCCy6bi/564p1ce66q6bxynbVgeVt4LHc/gj1+kIKrMylfF8h+eSqP16264NqfE4MMe E+/MWqReKoRd3wdNmC1+iPfPP63qPOuksHbJ0HtXReF8LzO7ZhJ+bbYjA5wyzydTwtGNk8 dIjWm5yfDBFawe0gsaRaYwGmUPqNbJ/vT1u0atoV1wUvDzYszRj/iTXqy8fhqw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626068951; a=rsa-sha256; cv=none; b=XDx8Q3H1ERM39t/S5DAjj5eHfACGzcOj9vtde7FGN9q9nBSqe9MyDELm4wzEUiH/sd6tNW rQObvBbzm3oWGyMiWsxKmFAzHYx4ZSO1QN1GVP1//4PvWW9A14OBbCs8nlJ7oIYxzQkhHC uLaxnbqgB5eDMOPuFu0Uq8D5j3KUMQndngM5Xt8+ncIhqNyIfpKsoWixRguhcRUKMa4f0R wVboBfTJb/8X+sYjORZ/j9W3o2aALkOdmtVVvaB6nnXWbikOszU5DuFOErtyqvPZEzSs0N fcfErJS5I9ozlxQ6/1A2/wopsRokEht5LVXKhNNIPJJTWw1KdnmtwtqZD+qVCw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=jnTURbU8; 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=jnTURbU8; 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: D15E69945 X-Spam-Score: -2.90 X-Migadu-Scanner: scn1.migadu.com X-TUID: 03Ffd9Gkngcu * 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. --- 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..50b46aa871 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))))) (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))))) (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 + rust-leaf-alice + rust-leaf-bob))))) (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 + rust-intermediate-b + rust-leaf-alice + rust-leaf-bob))))) (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))))) (home-page "http://example.com") (synopsis "summary") (description "summary") -- 2.31.1