From patchwork Sun Aug 7 13:45:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41333 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 A8FC227BBEB; Sun, 7 Aug 2022 14:46:13 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 3A04427BBEA for ; Sun, 7 Aug 2022 14:46:13 +0100 (BST) Received: from localhost ([::1]:48270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKgbc-0003Cg-Bn for patchwork@mira.cbaines.net; Sun, 07 Aug 2022 09:46:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKgbS-0003CW-NP for guix-patches@gnu.org; Sun, 07 Aug 2022 09:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46488) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oKgbR-0002cN-Pi for guix-patches@gnu.org; Sun, 07 Aug 2022 09:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oKgbR-0002Bq-KS for guix-patches@gnu.org; Sun, 07 Aug 2022 09:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57030] [PATCH] gnu: rust-tracing-futures-0.2: Fix build when used as an input. References: <87v8r4tldq.fsf@ngraves.fr> In-Reply-To: <87v8r4tldq.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Aug 2022 13:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57030@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 57030-submit@debbugs.gnu.org id=B57030.16598799608411 (code B ref 57030); Sun, 07 Aug 2022 13:46:01 +0000 Received: (at 57030) by debbugs.gnu.org; 7 Aug 2022 13:46:00 +0000 Received: from localhost ([127.0.0.1]:36237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKgbQ-0002Ba-1t for submit@debbugs.gnu.org; Sun, 07 Aug 2022 09:46:00 -0400 Received: from 13.mo584.mail-out.ovh.net ([178.33.251.8]:46853) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKgbK-0002BJ-Db for 57030@debbugs.gnu.org; Sun, 07 Aug 2022 09:45:58 -0400 Received: from player762.ha.ovh.net (unknown [10.109.146.163]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 341A223971 for <57030@debbugs.gnu.org>; Sun, 7 Aug 2022 13:45:51 +0000 (UTC) Received: from ngraves.fr (unknown [176.166.159.77]) (Authenticated sender: ngraves@ngraves.fr) by player762.ha.ovh.net (Postfix) with ESMTPSA id 672A12D4EFE7B; Sun, 7 Aug 2022 13:45:50 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-107S0018cc740ef-34a1-4d61-8673-5c83c8d2c537, AC1F97F36DD8A5CAA60687340F4EEE9223FA2898) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.166.159.77 Date: Sun, 07 Aug 2022 15:45:49 +0200 Message-ID: <87sfm8tbea.fsf@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 13983395371666891490 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdefiedgjeduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffiefgieduteethefggfeiteeguedvgffhkeffveeikeehvefgtdfgfefgfeegleenucffohhmrghinhepthhokhhiohdrrhhsnecukfhppedtrddtrddtrddtpddujeeirdduieeirdduheelrdejjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepphhlrgihvghrjeeivddrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeehjedtfedtseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeeg 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-tracing-futures-0.2): Fix build when used as an input. --- gnu/packages/crates-io.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a7a90df7ea..04840039be 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -66323,25 +66323,26 @@ (define-public rust-tracing-futures-0.2 "0k4vd3jyqz9cx8rbwbp0p93qfp1w6rfk7sc6c1jh1ai18zqvcyxb")))) (build-system cargo-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'patch-cargo-checksums 'patch-tests - (lambda _ - (substitute* '("tests/support.rs" "src/lib.rs") - (("../../tracing/tests/support/mod.rs") - (string-append - "../guix-vendor/rust-tracing-" - "0.1.23" ;; TODO replace by rust-tracing version - ".tar.gz/tests/support/mod.rs")))))) - #:cargo-inputs - (("rust-futures" ,rust-futures-0.3) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'patch-cargo-checksums 'patch-tests + (lambda _ + (substitute* '("tests/support.rs" "src/lib.rs") + (("../../tracing/tests/support/mod.rs") + #$(file-append rust-tracing-0.1 + "/share/cargo/src/tracing-" + (package-version rust-tracing-0.1) + "/tests/support/mod.rs")))))) + #:cargo-inputs + `(("rust-futures" ,rust-futures-0.3) ("rust-futures-task" ,rust-futures-task-0.3) ("rust-pin-project" ,rust-pin-project-0.4) ("rust-tokio" ,rust-tokio-0.1) ("rust-tokio-executor" ,rust-tokio-executor-0.1) ("rust-tracing" ,rust-tracing-0.1)) - #:cargo-development-inputs - (("rust-tokio" ,rust-tokio-0.1) + #:cargo-development-inputs + `(("rust-tokio" ,rust-tokio-0.1) ("rust-tokio-test" ,rust-tokio-test-0.2) ("rust-tracing-core" ,rust-tracing-core-0.1)))) (home-page "https://tokio.rs")