diff mbox series

[bug#57030] gnu: rust-tracing-futures-0.2: Fix build phase.

Message ID 87v8r4tldq.fsf@ngraves.fr
State New
Headers
Series [bug#57030] gnu: rust-tracing-futures-0.2: Fix build phase. |

Commit Message

Nicolas Graves Aug. 7, 2022, 10:10 a.m. UTC 
* gnu/packages/crates-io.scm (rust-tracing-futures-0.2): Fix build phase.
---
 gnu/packages/crates-io.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Comments

Maxime Devos Aug. 7, 2022, 10:16 a.m. UTC | #1 
On 07-08-2022 12:10, Nicolas Graves via Guix-patches via wrote:
> +                 "0.1.23" ;; TODO replace by rust-tracing version
,(package-version rust-tracing-0.1)
Nicolas Graves Aug. 7, 2022, 1:56 p.m. UTC | #2 
On 2022-08-07 12:16, Maxime Devos wrote:

> ,(package-version rust-tracing-0.1)

Thanks!

I also figured out there was an issue when using it as an input for
other rust packages. It happens during the build phase so I've found no
other solution than gexps, it works well now. 

Sorry for both patches, the third is the resulting from the merge of
both first.
Nicolas Graves Sept. 29, 2022, 1:17 p.m. UTC | #3 
-------------------- Start of forwarded message --------------------
From: Nicolas Graves <ngraves@ngraves.fr>
To: done-57040@debbugs.gnu.org
Subject: Re: [PATCH 9/9] gnu: rust-tracing-attributes-0.1: Update to 0.1.20.
Date: Thu, 29 Sep 2022 14:59:29 +0200


This patches would require more work. If rust-syn is updated this way,
if should go in inputs and not in cargo-inputs for packages using it,
that makes everything more complicated.

I'm not going to prioritize this anytime soon. I prefer to close the
issue.

-------------------- End of forwarded message --------------------

--
Best regards,
Nicolas Graves
diff mbox series

Patch

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cfafce9aa3..a7a90df7ea 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66323,7 +66323,17 @@  (define-public rust-tracing-futures-0.2
          "0k4vd3jyqz9cx8rbwbp0p93qfp1w6rfk7sc6c1jh1ai18zqvcyxb"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#: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)
         ("rust-futures-task" ,rust-futures-task-0.3)
         ("rust-pin-project" ,rust-pin-project-0.4)