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

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

[Nicolas Graves via Guix-patches via]

* 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

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

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 174 bytes --]


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)

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#57030] [PATCH] gnu: rust-tracing-futures-0.2: Fix build when used as an input.

[Nicolas Graves via Guix-patches via]

* 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

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

[Nicolas Graves via Guix-patches via]

* 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

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

[Nicolas Graves via Guix-patches via]

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

[bug#57040] [PATCH] gnu: Update rust-tracing-attributes.

[Nicolas Graves via Guix-patches via]

This series of patches will update rust-tracing-attributes. It requires
#57030 to be applied, and is done in an effort to eventually close
#53995 properly. 

-- 
Best regards,
Nicolas Graves

[bug#57040] [PATCH 1/9] gnu: rust-bytemuck-1: Update to 1.11.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-bytemuck-1): Update to 1.11.0.
---
 gnu/packages/crates-io.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e9dcc5b808..65ca330d6a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8966,7 +8966,7 @@ (define-public rust-bytemuck-1.5
 (define-public rust-bytemuck-1
   (package
     (name "rust-bytemuck")
-    (version "1.4.0")
+    (version "1.11.0")
     (source
       (origin
         (method url-fetch)
@@ -8975,7 +8975,7 @@ (define-public rust-bytemuck-1
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "071043n73hwi55z9c55ga4v52v8a7ri56gqja8r98clkdyxns14j"))))
+          "0ddqr3zi5fqcaj49pdganrnjhlwzcr02v77j446icjp7cn47qdx5"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -8984,7 +8984,7 @@ (define-public rust-bytemuck-1
     (synopsis "Crate for mucking around with piles of bytes")
     (description
      "This package provides a crate for mucking around with piles of bytes.")
-    (license license:zlib)))
+    (license (list license:zlib license:asl2.0 license:expat))))
 
 (define-public rust-bytemuck-derive-1
   (package
-- 
2.37.1


<#secure method=pgpmime mode=sign>

-- 
Best regards,
Nicolas Graves

[bug#57040] [PATCH 2/9] gnu: rust-retain-mut-0.1: Update to 0.1.9.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-retain-mut-0.1): Update to 0.1.9.
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 65ca330d6a..51805b9361 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49309,7 +49309,7 @@ (define-public rust-result-1
 (define-public rust-retain-mut-0.1
   (package
     (name "rust-retain-mut")
-    (version "0.1.1")
+    (version "0.1.9")
     (source
      (origin
        (method url-fetch)
@@ -49317,7 +49317,7 @@ (define-public rust-retain-mut-0.1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0cgmm1q7sr31r9wk7syh53ipgqpl37jzsvahdhmwrsi6mmcdc1g0"))))
+         "1c0jfxzba0mcw8q4z7dnc4ypwzxgqkdggngb55hazvwvg3az32a3"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/upsuper/retain_mut")
     (synopsis "Mutable borrow for the retain predicate")
-- 
2.37.1


<#secure method=pgpmime mode=sign>

-- 
Best regards,
Nicolas Graves

[bug#57040] [PATCH 3/9] gnu: Add rust-roaring-0.9.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-roaring-0.9): New variable.
---
 gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 51805b9361..9442edcd4a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49679,6 +49679,34 @@ (define-public rust-rmp-serde-0.13
     (description "This crate provides Serde bindings for RMP.")
     (license license:expat)))
 
+(define-public rust-roaring-0.9
+  (package
+    (name "rust-roaring")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "roaring" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1xx5hl7vplvn7ljw8libpvs04j3dpdhg233yzrb9j09j9smrqlyx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bytemuck" ,rust-bytemuck-1)
+        ("rust-byteorder" ,rust-byteorder-1)
+        ("rust-retain-mut" ,rust-retain-mut-0.1))
+       #:cargo-development-inputs
+       (("rust-proptest" ,rust-proptest-1))))
+    (home-page "https://github.com/RoaringBitmap/roaring-rs")
+    (synopsis "Compressed bitmaps")
+    (description
+     "Bitsets, also called bitmaps, are binary arrays commonly used as fast
+data structures.  Roaring bitmaps are efficient compressed bitmaps.  This
+package provides a Rust library for Roaring bitmaps.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rocket-0.4
   (package
     (name "rust-rocket")
-- 
2.37.1


<#secure method=pgpmime mode=sign>

-- 
Best regards,
Nicolas Graves

[bug#57040] [PATCH 4/9] gnu: Add rust-unicode-ident-1.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-unicode-ident-1): New variable.
---
 gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9442edcd4a..820ee38f50 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68717,6 +68717,36 @@ (define-public rust-unicode-categories-0.1
 a member of a certain category of Unicode characters.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-unicode-ident-1
+  (package
+    (name "rust-unicode-ident")
+    (version "1.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "unicode-ident" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1bqswc96ws8l6k7xx56dg521a3l5imi3mhlcz7rsi6a92mxb7xf4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-fst" ,rust-fst-0.4)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-roaring" ,rust-roaring-0.9)
+        ("rust-ucd-trie" ,rust-ucd-trie-0.1)
+        ("rust-unicode-xid" ,rust-unicode-xid-0.2))))
+    (home-page "https://github.com/dtolnay/unicode-ident")
+    (synopsis "Determine Unicode XID related properties")
+    (description "This package allows to determine whether characters have the
+XID_Start or XID_Continue properties according to Unicode Standard Annex
+#31. It is a better optimized implementation of the package
+@code{rust-unicode-xid}.")
+    (license (list license:asl2.0 license:expat license:unicode))))
+
 (define-public rust-unicode-linebreak-0.1
   (package
     (name "rust-unicode-linebreak")
@@ -68828,8 +68858,10 @@ (define-public rust-unicode-xid-0.2
     (build-system cargo-build-system)
     (home-page "https://github.com/unicode-rs/unicode-xid")
     (synopsis "Determine Unicode XID related properties")
-    (description "Determine whether characters have the XID_Start
-or XID_Continue properties according to Unicode Standard Annex #31.")
+(description "This package allows to determine whether characters have the
+XID_Start or XID_Continue properties according to Unicode Standard Annex
+#31. It is an older and less optimized implementation than the package
+@code{rust-unicode-ident}.")
     (license (list license:asl2.0 license:expat))))
 
 (define-public rust-unicode-xid-0.1
-- 
2.37.1


<#secure method=pgpmime mode=sign>

-- 
Best regards,
Nicolas Graves

[bug#57040] [PATCH 5/9] gnu: rust-proc-macro2-1: Update to 1.0.43.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-proc-macro2-1): Update to 1.0.43.
---
 gnu/packages/crates-io.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 820ee38f50..259665528b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45375,7 +45375,7 @@ (define-public rust-proc-macro-nested-0.1
 (define-public rust-proc-macro2-1
   (package
     (name "rust-proc-macro2")
-    (version "1.0.32")
+    (version "1.0.43")
     (source
       (origin
         (method url-fetch)
@@ -45383,16 +45383,14 @@ (define-public rust-proc-macro2-1
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0hqbxlvhiaybakl1gai3mgps1dxsmxricxsr2rfdrh222z0qql5s"))))
+          "1avvpf4qki8mg2na60yr3afbsfl5p6vllac6516xgwy93g3a4b0a"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags '("--lib")
        #:cargo-inputs
-       (("rust-unicode-xid" ,rust-unicode-xid-0.2))
+       (("rust-unicode-ident" ,rust-unicode-ident-1))
        #:cargo-development-inputs
        (("rust-quote" ,rust-quote-1))))
-    (inputs
-     (list rust-unicode-xid-0.2))
     (home-page "https://github.com/alexcrichton/proc-macro2")
     (synopsis "Stable implementation of the upcoming new `proc_macro` API")
     (description "This package provides a stable implementation of the upcoming new
-- 
2.37.1


<#secure method=pgpmime mode=sign>

-- 
Best regards,
Nicolas Graves

[bug#57040] [PATCH 6/9] gnu: Remove rust-syn-test-suite-0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-syn-test-suite-0): Delete variable.
---
 gnu/packages/crates-io.scm | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 259665528b..99c70d3ca0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60696,24 +60696,6 @@ (define-public rust-swc-1
     (license (list license:expat
                    license:asl2.0))))
 
-(define-public rust-syn-test-suite-0
-  (package
-    (name "rust-syn-test-suite")
-    (version "0.0.0+test")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "syn-test-suite" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1d9ffrbgci1qjdcpvgrsg3sh24qdsdh66zcsvn5prrk05ycn3mm0"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/dtolnay/syn")
-    (synopsis "Test suite of the syn crate")
-    (description "This package provides the test suite of the syn crate.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-syn-1
   (package
     (name "rust-syn")
-- 
2.37.1


<#secure method=pgpmime mode=sign>

-- 
Best regards,
Nicolas Graves

[bug#57040] [PATCH 7/9] gnu: rust-syn-1: Update to 1.0.99.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-syn-1): Update to 1.0.99.
---
 gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 99c70d3ca0..f418b0581c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60699,21 +60699,42 @@ (define-public rust-swc-1
 (define-public rust-syn-1
   (package
     (name "rust-syn")
-    (version "1.0.82")
+    (version "1.0.99")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "syn" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0ncx7gg5mvd16q5xf77hgk09nwmfq0ppsn0vgc9x9jv0pg85vbwd"))))
+        (base32 "04xba78p559nl737llv7nqcwm723dp6ah5bbp0h5w1amqrpfznsq"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
+     (list
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'delete-internal-dependency
+            (lambda _
+              (substitute* "Cargo.toml"
+                ((".*syn-test-suite.*") "")
+                (("version = \"0\"") "")))))
+      #:cargo-test-flags '(list "--release" "--features" "test")
+      #: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))))
     (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

[bug#57040] [PATCH 8/9] gnu: rust-async-trait-0.1: Update to 0.1.57.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-async-trait-0.1): Update to 0.1.57.
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f418b0581c..3641eddeae 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5093,14 +5093,14 @@ (define-public rust-async-tls-0.10
 (define-public rust-async-trait-0.1
   (package
     (name "rust-async-trait")
-    (version "0.1.42")
+    (version "0.1.57")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "async-trait" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0gd13pqgw5m6l4bqwjkickq13c4v0jxzxs5i4dwmldrlgvklafld"))))
+        (base32 "0vw256zb104ni4lw0r5j3jdws54r9n01mvl8gs6pacmwp1348ikn"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.37.1


<#secure method=pgpmime mode=sign>

-- 
Best regards,
Nicolas Graves

[bug#57040] [PATCH 9/9] gnu: rust-tracing-attributes-0.1: Update to 0.1.20.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-tracing-attributes-0.1): Update to 0.1.20.
---
 gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3641eddeae..1fe95f180a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66289,7 +66289,7 @@ (define-public rust-tracing-0.1
 (define-public rust-tracing-attributes-0.1
   (package
     (name "rust-tracing-attributes")
-    (version "0.1.12")
+    (version "0.1.20")
     (source
      (origin
        (method url-fetch)
@@ -66297,19 +66297,39 @@ (define-public rust-tracing-attributes-0.1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0iwzcbcrkyn7bnhdnzp4lanw3md2dx15jr3nyi7881s1gvm81w23"))))
+         "0ars2k4b8s0fxdlxdw9176nykjdqihqi52dj7gkm6p2bbc3cwr9f"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
+     (list
+       #:phases
+       #~(modify-phases %standard-phases
+         (add-after 'patch-cargo-checksums 'patch-tests
+           (lambda _
+             (substitute* '("tests/support.rs"
+                            "tests/err.rs"
+                            "tests/async_fn.rs"
+                            "tests/ret.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"))
+               (("../../tracing-futures/tests/support.rs")
+                #$(file-append rust-tracing-futures-0.2
+                               "/share/cargo/src/tracing-futures-"
+                               (package-version rust-tracing-futures-0.2)
+                               "/tests/support.rs"))))))
+       #:cargo-inputs
+       `(("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))
        #:cargo-development-inputs
-       (("rust-async-trait" ,rust-async-trait-0.1)
+       `(("rust-async-trait" ,rust-async-trait-0.1)
         ("rust-tokio-test" ,rust-tokio-test-0.2)
         ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-futures" ,rust-tracing-futures-0.2)
         ("rust-tracing-core" ,rust-tracing-core-0.1)
-        ("rust-tracing-futures" ,rust-tracing-futures-0.2))))
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
     (home-page "https://tokio.rs")
     (synopsis "Automatically instrument functions")
     (description "This package provides procedural macro attributes for
-- 
2.37.1


<#secure method=pgpmime mode=sign>

-- 
Best regards,
Nicolas Graves

[bug#57040] [PATCH 9/9] gnu: rust-tracing-attributes-0.1: Update to 0.1.20.

[Nicolas Graves via Guix-patches via]

Regarding rust-syn: some things break when it is a development input, I'll rework on it.

-- 
Best regards,
Nicolas Graves

[bug#57030] [PATCH 7/9 v2] gnu: rust-syn-1: Update to 1.0.96.

[Nicolas Graves via Guix-patches via]

* 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

[bug#57040] [Nicolas Graves] [PATCH 7/9 v2] gnu: rust-syn-1: Update to 1.0.96.

[Nicolas Graves via Guix-patches via]

* 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

--
Best regards,
Nicolas Graves

bug#57040: [PATCH 9/9] gnu: rust-tracing-attributes-0.1: Update to 0.1.20.

[Nicolas Graves via Guix-patches via]

done trick  error

-- 
Best regards,
Nicolas Graves

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]

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