unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 57030@debbugs.gnu.org
Cc: ngraves@ngraves.fr
Subject: [bug#57030] [PATCH] gnu: rust-tracing-futures-0.2: Fix build phase.
Date: Sun, 07 Aug 2022 15:49:09 +0200	[thread overview]
Message-ID: <87pmhctb8q.fsf@ngraves.fr> (raw)
In-Reply-To: <87v8r4tldq.fsf@ngraves.fr>


* gnu/packages/crates-io.scm (rust-tracing-futures-0.2): Fix build phase.
---
 gnu/packages/crates-io.scm | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cfafce9aa3..04840039be 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66323,15 +66323,26 @@ (define-public rust-tracing-futures-0.2
          "0k4vd3jyqz9cx8rbwbp0p93qfp1w6rfk7sc6c1jh1ai18zqvcyxb"))))
     (build-system cargo-build-system)
     (arguments
-     `(#: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")
-- 
2.37.1


<#secure method=pgpmime mode=sign>

-- 
Best regards,
Nicolas Graves




  parent reply	other threads:[~2022-08-07 13:50 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-07 10:10 [bug#57030] [PATCH] gnu: rust-tracing-futures-0.2: Fix build phase Nicolas Graves via Guix-patches via
2022-08-07 10:16 ` Maxime Devos
2022-08-07 13:56   ` Nicolas Graves via Guix-patches via
2022-08-07 13:45 ` [bug#57030] [PATCH] gnu: rust-tracing-futures-0.2: Fix build when used as an input Nicolas Graves via Guix-patches via
2022-08-07 13:49 ` Nicolas Graves via Guix-patches via [this message]
2022-08-07 19:38 ` [bug#57030] [PATCH 7/9 v2] gnu: rust-syn-1: Update to 1.0.96 Nicolas Graves via Guix-patches via
2022-08-07 14:41   ` [bug#57040] [PATCH] gnu: Update rust-tracing-attributes Nicolas Graves via Guix-patches via
2022-08-07 14:44     ` [bug#57040] [PATCH 1/9] gnu: rust-bytemuck-1: Update to 1.11.0 Nicolas Graves via Guix-patches via
2022-08-07 14:44     ` [bug#57040] [PATCH 2/9] gnu: rust-retain-mut-0.1: Update to 0.1.9 Nicolas Graves via Guix-patches via
2022-08-07 14:45     ` [bug#57040] [PATCH 3/9] gnu: Add rust-roaring-0.9 Nicolas Graves via Guix-patches via
2022-08-07 14:45     ` [bug#57040] [PATCH 4/9] gnu: Add rust-unicode-ident-1 Nicolas Graves via Guix-patches via
2022-08-07 14:46     ` [bug#57040] [PATCH 5/9] gnu: rust-proc-macro2-1: Update to 1.0.43 Nicolas Graves via Guix-patches via
2022-08-07 14:47     ` [bug#57040] [PATCH 6/9] gnu: Remove rust-syn-test-suite-0 Nicolas Graves via Guix-patches via
2022-08-07 14:47     ` [bug#57040] [PATCH 7/9] gnu: rust-syn-1: Update to 1.0.99 Nicolas Graves via Guix-patches via
2022-08-07 14:48     ` [bug#57040] [PATCH 8/9] gnu: rust-async-trait-0.1: Update to 0.1.57 Nicolas Graves via Guix-patches via
2022-08-07 14:48     ` [bug#57040] [PATCH 9/9] gnu: rust-tracing-attributes-0.1: Update to 0.1.20 Nicolas Graves via Guix-patches via
2022-08-07 15:53       ` Nicolas Graves via Guix-patches via
     [not found]       ` <875yh61glq.fsf@ngraves.fr>
2022-09-29 13:02         ` bug#57040: " Nicolas Graves via Guix-patches via
2022-08-07 19:39     ` [bug#57040] [Nicolas Graves] [PATCH 7/9 v2] gnu: rust-syn-1: Update to 1.0.96 Nicolas Graves via Guix-patches via
2022-09-29 13:17 ` bug#57030: [Nicolas Graves] Re: [PATCH 9/9] gnu: rust-tracing-attributes-0.1: Update to 0.1.20 Nicolas Graves via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87pmhctb8q.fsf@ngraves.fr \
    --to=guix-patches@gnu.org \
    --cc=57030@debbugs.gnu.org \
    --cc=ngraves@ngraves.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).