gnu: Add rust-tonic-0.10.

* gnu/packages/crates-web.scm (rust-tonic-0.10): New variable.
(rust-tonic-0.6): Inherit from rust-tonic-0.10.

Change-Id: I302475ac0af4eeecdd7908a5aa5054dcba35653b
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>

1 files changed, 94 insertions, 47 deletions

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index adaf6b648b..6650c26913 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -3666,63 +3666,110 @@ alike.  It's completely modular, and built directly for @code{async/await}.")
         ("rust-openssl" ,rust-openssl-0.10)
         ("rust-url" ,rust-url-1))))))
 
-(define-public rust-tonic-0.6
+(define-public rust-tonic-0.10
   (package
     (name "rust-tonic")
-    (version "0.6.2")
+    (version "0.10.2")
     (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "tonic" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "02jxiy0n2mw2c1fchykj3m18wp986685bji26px0z9qhkmjg827z"))))
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tonic" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03hx1b2810p4jmsphbql8cn3r22c9n1ar73bj8azf7761lx96q6m"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:tests? #f     ; unresolved import `crate::codec::compression`
-        #:cargo-inputs
-        (("rust-async-stream" ,rust-async-stream-0.3)
-         ("rust-async-trait" ,rust-async-trait-0.1)
-         ("rust-base64" ,rust-base64-0.13)
-         ("rust-bytes" ,rust-bytes-1)
-         ("rust-flate2" ,rust-flate2-1)
-         ("rust-futures-core" ,rust-futures-core-0.3)
-         ("rust-futures-util" ,rust-futures-util-0.3)
-         ("rust-h2" ,rust-h2-0.3)
-         ("rust-http" ,rust-http-0.2)
-         ("rust-http-body" ,rust-http-body-0.4)
-         ("rust-hyper" ,rust-hyper-0.14)
-         ("rust-hyper-timeout" ,rust-hyper-timeout-0.4)
-         ("rust-percent-encoding" ,rust-percent-encoding-2)
-         ("rust-pin-project" ,rust-pin-project-1)
-         ("rust-prost" ,rust-prost-0.9)
-         ("rust-prost-derive" ,rust-prost-derive-0.9)
-         ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.5)
-         ("rust-tokio" ,rust-tokio-1)
-         ("rust-tokio-rustls" ,rust-tokio-rustls-0.22)
-         ("rust-tokio-stream" ,rust-tokio-stream-0.1)
-         ("rust-tokio-util" ,rust-tokio-util-0.6)
-         ("rust-tower" ,rust-tower-0.4)
-         ("rust-tower-layer" ,rust-tower-layer-0.3)
-         ("rust-tower-service" ,rust-tower-service-0.3)
-         ("rust-tracing" ,rust-tracing-0.1)
-         ("rust-tracing-futures" ,rust-tracing-futures-0.2)
-         ("rust-webpki-roots" ,rust-webpki-roots-0.21))
-        #:cargo-development-inputs
-        (("rust-bencher" ,rust-bencher-0.1)
-         ("rust-quickcheck" ,rust-quickcheck-1)
-         ("rust-quickcheck-macros" ,rust-quickcheck-macros-1)
-         ("rust-rand" ,rust-rand-0.8)
-         ("rust-static-assertions" ,rust-static-assertions-1)
-         ("rust-tokio" ,rust-tokio-1)
-         ("rust-tower" ,rust-tower-0.4))))
+     `(#:cargo-inputs (("rust-async-stream" ,rust-async-stream-0.3)
+                       ("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-axum" ,rust-axum-0.6)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-flate2" ,rust-flate2-1)
+                       ("rust-h2" ,rust-h2-0.3)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-http-body" ,rust-http-body-0.4)
+                       ("rust-hyper" ,rust-hyper-0.14)
+                       ("rust-hyper-timeout" ,rust-hyper-timeout-0.4)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("rust-pin-project" ,rust-pin-project-1)
+                       ("rust-prost" ,rust-prost-0.12)
+                       ("rust-rustls" ,rust-rustls-0.21)
+                       ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6)
+                       ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-rustls" ,rust-tokio-rustls-0.24)
+                       ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+                       ("rust-tower" ,rust-tower-0.4)
+                       ("rust-tower-layer" ,rust-tower-layer-0.3)
+                       ("rust-tower-service" ,rust-tower-service-0.3)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-webpki-roots" ,rust-webpki-roots-0.25))
+       #:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher-0.1)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-quickcheck-macros" ,rust-quickcheck-macros-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tower" ,rust-tower-0.4))))
     (home-page "https://github.com/hyperium/tonic")
     (synopsis "gRPC over HTTP/2 implementation for Rust")
     (description
-      "This package provides a gRPC over HTTP/2 implementation focused on high
-performance, interoperability, and flexibility.")
+     "This package provides a @code{gRPC} over HTTP/2 implementation focused
+on high performance, interoperability, and flexibility.")
     (license license:expat)))
 
+(define-public rust-tonic-0.6
+  (package
+    (inherit rust-tonic-0.10)
+    (name "rust-tonic")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tonic" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02jxiy0n2mw2c1fchykj3m18wp986685bji26px0z9qhkmjg827z"))))
+    (arguments
+     `(#:tests? #f     ; unresolved import `crate::codec::compression`
+       #:cargo-inputs
+       (("rust-async-stream" ,rust-async-stream-0.3)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-base64" ,rust-base64-0.13)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-h2" ,rust-h2-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-http-body" ,rust-http-body-0.4)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-hyper-timeout" ,rust-hyper-timeout-0.4)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-pin-project" ,rust-pin-project-1)
+        ("rust-prost" ,rust-prost-0.9)
+        ("rust-prost-derive" ,rust-prost-derive-0.9)
+        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.5)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.22)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+        ("rust-tokio-util" ,rust-tokio-util-0.6)
+        ("rust-tower" ,rust-tower-0.4)
+        ("rust-tower-layer" ,rust-tower-layer-0.3)
+        ("rust-tower-service" ,rust-tower-service-0.3)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-futures" ,rust-tracing-futures-0.2)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.21))
+       #:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher-0.1)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-quickcheck-macros" ,rust-quickcheck-macros-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tower" ,rust-tower-0.4))))))
+
 (define-public rust-tonic-build-0.10
   (package
     (name "rust-tonic-build")