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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 57030 in the body.
You can then email your comments to 57030 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: rust-tracing-futures-0.2: Fix build phase.
Date: Sun, 07 Aug 2022 12:10:09 +0200

* 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(-)

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)
-- 
2.37.1

-- 
Best regards,
Nicolas Graves

Message #8 received at 57030 <at> debbugs.gnu.org (full text, mbox):

From: Maxime Devos <maximedevos <at> telenet.be>
To: Nicolas Graves <ngraves <at> ngraves.fr>, 57030 <at> debbugs.gnu.org
Subject: Re: [bug#57030] [PATCH] gnu: rust-tracing-futures-0.2: Fix build
 phase.
Date: Sun, 7 Aug 2022 12:16:08 +0200

[Message part 1 (text/plain, inline)]

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)

[OpenPGP_0x49E3EE22191725EE.asc (application/pgp-keys, attachment)]

[OpenPGP_signature (application/pgp-signature, attachment)]

Message #11 received at 57030 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 57030 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH] gnu: rust-tracing-futures-0.2: Fix build when used as an
 input.
Date: Sun, 07 Aug 2022 15:45:49 +0200

* 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")
-- 
2.37.1


<#secure method=pgpmime mode=sign>

-- 
Best regards,
Nicolas Graves

Message #14 received at 57030 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 57030 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH] gnu: rust-tracing-futures-0.2: Fix build phase.
Date: Sun, 07 Aug 2022 15:49:09 +0200

* 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

Message #17 received at 57030 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: Maxime Devos <maximedevos <at> telenet.be>, 57030 <at> debbugs.gnu.org
Subject: Re: [bug#57030] [PATCH] gnu: rust-tracing-futures-0.2: Fix build
 phase.
Date: Sun, 07 Aug 2022 15:56:04 +0200

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. 

-- 
Best regards,
Nicolas Graves

Message #20 received at 57030 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 57030 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH 7/9 v2] gnu: rust-syn-1: Update to 1.0.96.
Date: Sun, 07 Aug 2022 21:38:00 +0200

* gnu/packages/crates-io.scm (rust-syn-1): Update to 1.0.96.
---
 gnu/packages/crates-io.scm | 44 ++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 99c70d3ca0..11a317ab71 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60699,21 +60699,51 @@ (define-public rust-swc-1
 (define-public rust-syn-1
   (package
     (name "rust-syn")
-    (version "1.0.82")
+    (version "1.0.96")
     (source
      (origin
-       (method url-fetch)
-       (uri (crate-uri "syn" version))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dtolnay/syn")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "0ncx7gg5mvd16q5xf77hgk09nwmfq0ppsn0vgc9x9jv0pg85vbwd"))))
+        (base32
+         "1b2my32bcw01w556hc4xckafx1x85lz81shrcmmjqlml07hakwi9"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (delete-file-recursively "dev")
+           (delete-file-recursively "examples")
+           (delete-file-recursively "json")
+           (delete-file-recursively "codegen")
+           (delete-file-recursively "tests/crates")
+           (substitute* "Cargo.toml"
+             ((".*examples.*") "")
+             (("\"json\",") "")
+             (("\"dev\",") "")
+             (("\"tests/crates\",") ""))))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:cargo-test-flags
+       '( "--release""--all-features")
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-automod" ,rust-automod-1)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-insta" ,rust-insta-1)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-ref-cast" ,rust-ref-cast-1)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-reqwest" ,rust-reqwest-0.11)
+        ("rust-tar" ,rust-tar-0.4)
+        ("rust-termcolor" ,rust-termcolor-1)
+        ("rust-walkdir" ,rust-walkdir-2))
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-unicode-xid" ,rust-unicode-xid-0.2))))
+        ("rust-unicode-ident" ,rust-unicode-ident-1))))
+    (native-inputs (list pkg-config openssl))
     (home-page "https://github.com/dtolnay/syn")
     (synopsis "Parser for Rust source code")
     (description
--
2.37.1


<#secure method=pgpmime mode=sign>

--
Best regards,
Nicolas Graves

Message #25 received at 57030-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 57030-done <at> debbugs.gnu.org
Subject: [Nicolas Graves] Re: [PATCH 9/9] gnu: rust-tracing-attributes-0.1:
 Update to 0.1.20.
Date: Thu, 29 Sep 2022 15:17:04 +0200

-------------------- Start of forwarded message --------------------
From: Nicolas Graves <ngraves <at> ngraves.fr>
To: done-57040 <at> 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.