gnu: rust-reqwest: Move to (gnu packages crates-web).

* gnu/packages/crates-io.scm (rust-reqwest-0.11, rust-reqwest-0.10):
Move from here ...
* gnu/packages/crates-web.scm: ... to here.

Change-Id: I80f8ce9b35ff598033e34bc525d29dfddbbb5d07

5 files changed, 169 insertions, 165 deletions

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3162d2db7c..78df43ac7e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -52512,171 +52512,6 @@ Should not be used directly.")
      "For deriving the offsets of fields for types with a stable layout.")
     (license license:zlib)))
 
-(define-public rust-reqwest-0.11
-  (package
-    (name "rust-reqwest")
-    (version "0.11.23")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "reqwest" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0hgvzb7r46656r9vqhl5qk1kbr2xzjb91yr2cb321160ka6sxc9p"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-test-flags
-       '("--release" "--"
-         ;; These tests go to the network
-         "--skip=test_badssl_modern"
-         "--skip=test_badssl_self_signed"
-         "--skip=connect_timeout"
-         "--skip=test_allowed_methods"
-         "--skip=test_tls_info"
-         "--skip=connect_many_timeout")
-       #:cargo-inputs
-       (("rust-async-compression" ,rust-async-compression-0.4)
-        ("rust-base64" ,rust-base64-0.21)
-        ("rust-bytes" ,rust-bytes-1)
-        ("rust-cookie" ,rust-cookie-0.16)
-        ("rust-cookie-store" ,rust-cookie-store-0.16)
-        ("rust-encoding-rs" ,rust-encoding-rs-0.8)
-        ("rust-futures-channel" ,rust-futures-channel-0.3)
-        ("rust-futures-core" ,rust-futures-core-0.3)
-        ("rust-futures-util" ,rust-futures-util-0.3)
-        ("rust-h2" ,rust-h2-0.3)
-        ("rust-h3" ,rust-h3-0.0.3)
-        ("rust-h3-quinn" ,rust-h3-quinn-0.0.4)
-        ("rust-http" ,rust-http-0.2)
-        ("rust-http-body" ,rust-http-body-0.4)
-        ("rust-hyper" ,rust-hyper-0.14)
-        ("rust-hyper-rustls" ,rust-hyper-rustls-0.24)
-        ("rust-hyper-tls" ,rust-hyper-tls-0.5)
-        ("rust-ipnet" ,rust-ipnet-2)
-        ("rust-js-sys" ,rust-js-sys-0.3)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-mime" ,rust-mime-0.3)
-        ("rust-mime-guess" ,rust-mime-guess-2)
-        ("rust-native-tls" ,rust-native-tls-0.2)
-        ("rust-once-cell" ,rust-once-cell-1)
-        ("rust-percent-encoding" ,rust-percent-encoding-2)
-        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
-        ("rust-quinn" ,rust-quinn-0.10)
-        ("rust-rustls" ,rust-rustls-0.21)
-        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6)
-        ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)
-        ("rust-system-configuration" ,rust-system-configuration-0.5)
-        ("rust-tokio" ,rust-tokio-1)
-        ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3)
-        ("rust-tokio-rustls" ,rust-tokio-rustls-0.24)
-        ("rust-tokio-socks" ,rust-tokio-socks-0.5)
-        ("rust-tokio-util" ,rust-tokio-util-0.7)
-        ("rust-tower-service" ,rust-tower-service-0.3)
-        ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.23)
-        ("rust-url" ,rust-url-2)
-        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
-        ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
-        ("rust-wasm-streams" ,rust-wasm-streams-0.3)
-        ("rust-web-sys" ,rust-web-sys-0.3)
-        ("rust-webpki-roots" ,rust-webpki-roots-0.25)
-        ("rust-winreg" ,rust-winreg-0.50))
-       #:cargo-development-inputs
-       (("rust-brotli" ,rust-brotli-3)
-        ("rust-doc-comment" ,rust-doc-comment-0.3)
-        ("rust-env-logger" ,rust-env-logger-0.8)
-        ("rust-hyper" ,rust-hyper-0.14)
-        ("rust-libflate" ,rust-libflate-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-tokio" ,rust-tokio-1)
-        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
-        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
-    (inputs
-     (list openssl))
-    (native-inputs
-     (list pkg-config))
-    (home-page "https://github.com/seanmonstar/reqwest")
-    (synopsis "High level HTTP client library")
-    (description "This package provides a high level HTTP client library.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-reqwest-0.10
-  (package
-    (inherit rust-reqwest-0.11)
-    (name "rust-reqwest")
-    (version "0.10.10")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "reqwest" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0z7l46m1mjnvncscaq61zq6qmazrmb33vwjcnfrxpi0liqdgh607"))))
-    (arguments
-     `(#:cargo-test-flags '("--release" "--"
-                            ;; These tests require internet access.
-                            "--skip=test_badssl_modern"
-                            "--skip=test_badssl_self_signed"
-                            ;; XXX: Not sure why these fail.
-                            "--skip=test_allowed_methods"
-                            "--skip=connect_timeout")
-       #:cargo-inputs
-       (("rust-async-compression" ,rust-async-compression-0.3)
-        ("rust-base64" ,rust-base64-0.13)
-        ("rust-bytes" ,rust-bytes-0.5)
-        ("rust-cookie" ,rust-cookie-0.14)
-        ("rust-cookie-store" ,rust-cookie-store-0.12)
-        ("rust-encoding-rs" ,rust-encoding-rs-0.8)
-        ("rust-futures-core" ,rust-futures-core-0.3)
-        ("rust-futures-util" ,rust-futures-util-0.3)
-        ("rust-http" ,rust-http-0.2)
-        ("rust-http-body" ,rust-http-body-0.3)
-        ("rust-hyper" ,rust-hyper-0.13)
-        ("rust-hyper-rustls" ,rust-hyper-rustls-0.21)
-        ("rust-hyper-tls" ,rust-hyper-tls-0.4)
-        ("rust-ipnet" ,rust-ipnet-2)
-        ("rust-js-sys" ,rust-js-sys-0.3)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-mime" ,rust-mime-0.3)
-        ("rust-mime-guess" ,rust-mime-guess-2)
-        ("rust-native-tls" ,rust-native-tls-0.2)
-        ("rust-percent-encoding" ,rust-percent-encoding-2)
-        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
-        ("rust-rustls" ,rust-rustls-0.18)
-        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.4)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)
-        ("rust-time" ,rust-time-0.2)
-        ("rust-tokio" ,rust-tokio-0.2)
-        ("rust-tokio-rustls" ,rust-tokio-rustls-0.14)
-        ("rust-tokio-socks" ,rust-tokio-socks-0.3)
-        ("rust-tokio-tls" ,rust-tokio-tls-0.3)
-        ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.19)
-        ("rust-url" ,rust-url-2)
-        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
-        ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
-        ("rust-web-sys" ,rust-web-sys-0.3)
-        ("rust-webpki-roots" ,rust-webpki-roots-0.20)
-        ("rust-winreg" ,rust-winreg-0.7))
-       #:cargo-development-inputs
-       (("rust-brotli" ,rust-brotli-3)
-        ("rust-doc-comment" ,rust-doc-comment-0.3)
-        ("rust-env-logger" ,rust-env-logger-0.7)
-        ("rust-hyper" ,rust-hyper-0.13)
-        ("rust-libflate" ,rust-libflate-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-tokio" ,rust-tokio-0.2)
-        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list openssl))))
-
 (define-public rust-resolv-conf-0.7
   (package
     (name "rust-resolv-conf")
diff --git a/gnu/packages/crates-vcs.scm b/gnu/packages/crates-vcs.scm
index b4767301e5..6a3ff50edb 100644
--- a/gnu/packages/crates-vcs.scm
+++ b/gnu/packages/crates-vcs.scm
@@ -33,6 +33,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages crates-crypto)
   #:use-module (gnu packages crates-io)
+  #:use-module (gnu packages crates-web)
   #:use-module (gnu packages crates-windows)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages llvm)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 94e7622da9..15c665695b 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -33,6 +33,7 @@
   #:use-module (guix gexp)
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages crates-apple)
   #:use-module (gnu packages crates-crypto)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-gtk)
@@ -2782,6 +2783,171 @@ applications written in Rust.  Its API is inspired by the popular
 @code{express} framework for JavaScript.")
     (license license:expat)))
 
+(define-public rust-reqwest-0.11
+  (package
+    (name "rust-reqwest")
+    (version "0.11.23")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "reqwest" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hgvzb7r46656r9vqhl5qk1kbr2xzjb91yr2cb321160ka6sxc9p"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         ;; These tests go to the network
+         "--skip=test_badssl_modern"
+         "--skip=test_badssl_self_signed"
+         "--skip=connect_timeout"
+         "--skip=test_allowed_methods"
+         "--skip=test_tls_info"
+         "--skip=connect_many_timeout")
+       #:cargo-inputs
+       (("rust-async-compression" ,rust-async-compression-0.4)
+        ("rust-base64" ,rust-base64-0.21)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-cookie" ,rust-cookie-0.16)
+        ("rust-cookie-store" ,rust-cookie-store-0.16)
+        ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+        ("rust-futures-channel" ,rust-futures-channel-0.3)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-h2" ,rust-h2-0.3)
+        ("rust-h3" ,rust-h3-0.0.3)
+        ("rust-h3-quinn" ,rust-h3-quinn-0.0.4)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-http-body" ,rust-http-body-0.4)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-hyper-rustls" ,rust-hyper-rustls-0.24)
+        ("rust-hyper-tls" ,rust-hyper-tls-0.5)
+        ("rust-ipnet" ,rust-ipnet-2)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-mime" ,rust-mime-0.3)
+        ("rust-mime-guess" ,rust-mime-guess-2)
+        ("rust-native-tls" ,rust-native-tls-0.2)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-quinn" ,rust-quinn-0.10)
+        ("rust-rustls" ,rust-rustls-0.21)
+        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6)
+        ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)
+        ("rust-system-configuration" ,rust-system-configuration-0.5)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.24)
+        ("rust-tokio-socks" ,rust-tokio-socks-0.5)
+        ("rust-tokio-util" ,rust-tokio-util-0.7)
+        ("rust-tower-service" ,rust-tower-service-0.3)
+        ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.23)
+        ("rust-url" ,rust-url-2)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
+        ("rust-wasm-streams" ,rust-wasm-streams-0.3)
+        ("rust-web-sys" ,rust-web-sys-0.3)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.25)
+        ("rust-winreg" ,rust-winreg-0.50))
+       #:cargo-development-inputs
+       (("rust-brotli" ,rust-brotli-3)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-env-logger" ,rust-env-logger-0.8)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-libflate" ,rust-libflate-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (inputs
+     (list openssl))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://github.com/seanmonstar/reqwest")
+    (synopsis "High level HTTP client library")
+    (description "This package provides a high level HTTP client library.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-reqwest-0.10
+  (package
+    (inherit rust-reqwest-0.11)
+    (name "rust-reqwest")
+    (version "0.10.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "reqwest" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0z7l46m1mjnvncscaq61zq6qmazrmb33vwjcnfrxpi0liqdgh607"))))
+    (arguments
+     `(#:cargo-test-flags '("--release" "--"
+                            ;; These tests require internet access.
+                            "--skip=test_badssl_modern"
+                            "--skip=test_badssl_self_signed"
+                            ;; XXX: Not sure why these fail.
+                            "--skip=test_allowed_methods"
+                            "--skip=connect_timeout")
+       #:cargo-inputs
+       (("rust-async-compression" ,rust-async-compression-0.3)
+        ("rust-base64" ,rust-base64-0.13)
+        ("rust-bytes" ,rust-bytes-0.5)
+        ("rust-cookie" ,rust-cookie-0.14)
+        ("rust-cookie-store" ,rust-cookie-store-0.12)
+        ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-http" ,rust-http-0.2)
+        ("rust-http-body" ,rust-http-body-0.3)
+        ("rust-hyper" ,rust-hyper-0.13)
+        ("rust-hyper-rustls" ,rust-hyper-rustls-0.21)
+        ("rust-hyper-tls" ,rust-hyper-tls-0.4)
+        ("rust-ipnet" ,rust-ipnet-2)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-mime" ,rust-mime-0.3)
+        ("rust-mime-guess" ,rust-mime-guess-2)
+        ("rust-native-tls" ,rust-native-tls-0.2)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-rustls" ,rust-rustls-0.18)
+        ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)
+        ("rust-time" ,rust-time-0.2)
+        ("rust-tokio" ,rust-tokio-0.2)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.14)
+        ("rust-tokio-socks" ,rust-tokio-socks-0.3)
+        ("rust-tokio-tls" ,rust-tokio-tls-0.3)
+        ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.19)
+        ("rust-url" ,rust-url-2)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
+        ("rust-web-sys" ,rust-web-sys-0.3)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.20)
+        ("rust-winreg" ,rust-winreg-0.7))
+       #:cargo-development-inputs
+       (("rust-brotli" ,rust-brotli-3)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-env-logger" ,rust-env-logger-0.7)
+        ("rust-hyper" ,rust-hyper-0.13)
+        ("rust-libflate" ,rust-libflate-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-tokio" ,rust-tokio-0.2)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list openssl))))
+
 (define-public rust-rocket-0.4
   (package
     (name "rust-rocket")
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 735e34f7a9..1822380ac8 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -50,6 +50,7 @@
   #:use-module (gnu packages crates-crypto)
   #:use-module (gnu packages crates-graphics)
   #:use-module (gnu packages crates-io)
+  #:use-module (gnu packages crates-web)
   #:use-module (gnu packages crates-windows)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages documentation)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 49eb3a0fb7..8bcce241e1 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -123,6 +123,7 @@
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-gtk)
   #:use-module (gnu packages crates-tls)
+  #:use-module (gnu packages crates-web)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages databases)