From df4e25920fea6e0d70332d19aab1b449e0fb2fe8 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Mon, 12 Aug 2019 04:13:48 -0500
Subject: 42 crates upstreamed

---
 gn/packages/crates-io.scm | 933 ++--------------------------------------------
 1 file changed, 35 insertions(+), 898 deletions(-)

(limited to 'gn/packages/crates-io.scm')

diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index abc69d9..9e2774f 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -260,28 +260,6 @@
       "This package provides a simple interface for querying atty")
     (license license:expat)))
 
-(define-public rust-autocfg ; guix upstreamable
-  (package
-    (name "rust-autocfg")
-    (version "0.1.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "autocfg" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0asl6fnc35yk5l2rxwhp25v128jgm45dp754h9z8x51b6n90w4r2"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/cuviper/autocfg")
-    (synopsis "Automatic cfg for Rust compiler features")
-    (description "Rust library for build scripts to automatically configure
-code based on compiler support.  Code snippets are dynamically tested to see
-if the @code{rustc} will accept them, rather than hard-coding specific version
-support.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-automod
   (package
     (name "rust-automod")
@@ -503,28 +481,6 @@ support.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-bencher ; guix upstreamable
-  (package
-    (name "rust-bencher")
-    (version "0.1.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "bencher" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1x8p2xblgqssay8cdykp5pkfc0np0jk5bs5cx4f5av097aav9zbx"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/bluss/bencher/")
-    (synopsis "Port of the libtest benchmark runner to Rust stable")
-    (description "This package provides a port of the libtest (unstable Rust)
-benchmark runner to Rust stable releases.  Supports running benchmarks and
-filtering based on the name.  Benchmark execution works exactly the same way
-and no more (caveat: black_box is still missing!).")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-bincode
   (package
     (name "rust-bincode")
@@ -625,26 +581,6 @@ and no more (caveat: black_box is still missing!).")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-bitflags ; guix upstreamable
-  (package
-    (name "rust-bitflags")
-    (version "1.1.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "bitflags" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1zc1qb1hwsnl2d8rhzicsv9kqd5b2hwbrscrcfw5as4sfr35659x"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/bitflags/bitflags")
-    (synopsis "Macro to generate structures which behave like bitflags")
-    (description "This package provides a macro to generate structures which
-behave like a set of bitflags.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-blobby
   (package
     (name "rust-blobby")
@@ -845,27 +781,6 @@ behave like a set of bitflags.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-cfg-if ; guix upstreamable
-  (package
-    (name "rust-cfg-if")
-    (version "0.1.9")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "cfg-if" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0csygklgz3ybpr0670rkip49zh76m43ar3k7xgypkzbzrwycx1ml"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/alexcrichton/cfg-if")
-    (synopsis "Define an item depending on parameters")
-    (description "This package provides a macro to ergonomically define an item
-depending on a large number of #[cfg] parameters.  Structured like an
-@code{if-else} chain, the first matching branch is the item that gets emitted.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-chrono
   (package
     (name "rust-chrono")
@@ -1716,45 +1631,6 @@ depending on a large number of #[cfg] parameters.  Structured like an
       "System-level helper functions for the dirs and directories crates.")
     (license #f)))
 
-(define-public rust-discard ; guix upstreamable
-  (package
-    (name "rust-discard")
-    (version "1.0.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "discard" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1h67ni5bxvg95s91wgicily4ix7lcw7cq0a5gy9njrybaibhyb91"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/Pauan/rust-discard")
-    (synopsis "Allow for intentionally leaking memory")
-    (description "There are situations where you need to intentionally leak some
-memory but not other memory.  This package provides a discard trait which allows
-for intentionally leaking memory")
-    (license license:expat)))
-
-(define-public rust-doc-comment ; guix upstreamable
-  (package
-    (name "rust-doc-comment")
-    (version "0.3.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "doc-comment" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "15rsqxgarfpb1yim9sbp9yfgj7p2dq6v51c6bq1a62paii9ylgcj"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/GuillaumeGomez/doc-comment")
-    (synopsis "Macro to generate doc comments")
-    (description "This package provides a way to generate doc comments
-from macros.")
-    (license license:expat)))
-
 (define-public rust-docopt
   (package
     (name "rust-docopt")
@@ -1781,26 +1657,6 @@ from macros.")
     (license (list license:unlicense
                    license:expat))))
 
-(define-public rust-dtoa ; guix upstreamable
-  (package
-    (name "rust-dtoa")
-    (version "0.4.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "dtoa" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0phbm7i0dpn44gzi07683zxaicjap5064w62pidci4fhhciv8mza"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/dtolnay/dtoa")
-    (synopsis "Fast functions for printing floating-point primitives")
-    (description "This crate provides fast functions for printing
-floating-point primitives to an @code{io::Write}.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-either
   (package
     (name "rust-either")
@@ -2023,28 +1879,6 @@ floating-point primitives to an @code{io::Write}.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-fallible-iterator ; guix upstreamable
-  (package
-    (name "rust-fallible-iterator")
-    (version "0.2.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "fallible-iterator" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1xq759lsr8gqss7hva42azn3whgrbrs2sd9xpn92c5ickxm1fhs4"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/sfackler/rust-fallible-iterator")
-    (synopsis "Fallible iterator traits")
-    (description "If the @code{std} or @code{alloc} features are enabled, this
-crate provides implementations for @code{Box}, @code{Vec}, @code{BTreeMap}, and
-@code{BTreeSet}.  If the @code{std} feature is enabled, this crate additionally
-provides implementations for @code{HashMap} and @code{HashSet}.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-findshlibs
   (package
     (name "rust-findshlibs")
@@ -2098,46 +1932,6 @@ provides implementations for @code{HashMap} and @code{HashSet}.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-fnv ; guix upstreamable
-  (package
-    (name "rust-fnv")
-    (version "1.0.6")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "fnv" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1ww56bi1r5b8id3ns9j3qxbi7w5h005rzhiryy0zi9h97raqbb9g"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/servo/rust-fnv")
-    (synopsis "implementation of the Fowler-Noll-Vo hash function")
-    (description "The @code{fnv} hash function is a custom @code{Hasher}
-implementation that is more efficient for smaller hash keys.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-fs-extra ; guix upstreamable
-  (package
-    (name "rust-fs-extra")
-    (version "1.1.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "fs_extra" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0x6675wdhsx277k1k1235jwcv38naf20d8kwrk948ds26hh4lajz"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/webdesus/fs_extra")
-    (synopsis "Extra filesystem methods")
-    (description "Expanding opportunities standard library @code{std::fs} and
-@code{std::io}.  Recursively copy folders with recept information about
-process and much more.")
-    (license license:expat)))
-
 (define-public rust-fst
   (package
     (name "rust-fst")
@@ -2243,26 +2037,6 @@ process and much more.")
 pseudorandom number generator")
     (license license:bsd-3)))
 
-(define-public rust-futures ; guix upstreamable
-  (package
-    (name "rust-futures")
-    (version "0.1.28")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "futures" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0saq8ffjw1pwf1pzhw3kq1z7dfq6wpd8x93dnni6vbkc799kkp25"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/rust-lang-nursery/futures-rs")
-    (synopsis "Implementation of zero-cost futures in Rust")
-    (description "An implementation of @code{futures} and @code{streams}
-featuring zero allocations, composability, and iterator-like interfaces.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-futures-channel-preview
   (package
     (name "rust-futures-channel-preview")
@@ -2784,26 +2558,6 @@ featuring zero allocations, composability, and iterator-like interfaces.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-hex ; guix upstreamable
-  (package
-    (name "rust-hex")
-    (version "0.3.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "hex" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0xsdcjiik5j750j67zk42qdnmm4ahirk3gmkmcqgq7qls2jjcl40"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/KokaKiwi/rust-hex")
-    (synopsis "Encode and decode data to/from hexadecimals")
-    (description "This crate allows for encoding and decoding data into/from
-hexadecimal representation.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-hex-literal
   (package
     (name "rust-hex-literal")
@@ -3152,26 +2906,6 @@ hexadecimal representation.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-itoa ; guix upstreamable
-  (package
-    (name "rust-itoa")
-    (version "0.4.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "itoa" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0zvg2d9qv3avhf3d8ggglh6fdyw8kkwqg3r4622ly5yhxnvnc4jh"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/dtolnay/itoa")
-    (synopsis "Fast functions for printing integer primitives")
-    (description "This crate provides fast functions for printing integer
-primitives to an @code{io::Write}.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-jemalloc-sys
   (package
     (name "rust-jemalloc-sys")
@@ -3228,26 +2962,6 @@ primitives to an @code{io::Write}.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-json ; guix upstreamable
-  (package
-    (name "rust-json")
-    (version "0.11.14")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "json" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1hj8c6xj5c2aqqszi8naaflmcdbya1i9byyjrq4iybxjb4q91mq1"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/maciejhirsz/json-rust")
-    (synopsis "JSON implementation in Rust")
-    (description "This crate provides a JSON implementation in Rust, reducing
-friction with idiomatic Rust structs to ease interopability.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-lazy-static
   (package
     (name "rust-lazy-static")
@@ -3601,64 +3315,6 @@ friction with idiomatic Rust structs to ease interopability.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-maplit ; guix upstreamable
-  (package
-    (name "rust-maplit")
-    (version "1.0.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "maplit" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0hsczmvd6zkqgzqdjp5hfyg7f339n68w83n4pxvnsszrzssbdjq8"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/bluss/maplit")
-    (synopsis "Collection of Map macros")
-    (description "This crate provides a collection of @code{literal} macros for
-@code{HashMap}, @code{HashSet}, @code{BTreeMap}, and @code{BTreeSet.}")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-matches ; guix upstreamable
-  (package
-    (name "rust-matches")
-    (version "0.1.8")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "matches" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "020axl4q7rk9vz90phs7f8jas4imxal9y9kxl4z4v7a6719mrz3z"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/SimonSapin/rust-std-candidates")
-    (synopsis "Macro to evaluate whether an expression matches a pattern.")
-    (description "This package provides a macro to evaluate, as a boolean,
-whether an expression matches a pattern.")
-    (license license:expat)))
-
-(define-public rust-md5 ; guix upstreamable
-  (package
-    (name "rust-md5")
-    (version "0.6.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "md5" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "17b2xm4h4cvxsdjsf3kdrzqv2za60kak961xzi5kmw6g6djcssvy"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/stainless-steel/md5")
-    (synopsis "MD5 hash function in Rust")
-    (description "The package provides the MD5 hash function.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-memchr
   (package
     (name "rust-memchr")
@@ -4255,48 +3911,6 @@ implementation (which is unstable / requires nightly).")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-peeking-take-while ; guix upstreamable
-  (package
-    (name "rust-peeking-take-while")
-    (version "0.1.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "peeking_take_while" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "16bhqr6rdyrp12zv381cxaaqqd0pwysvm1q8h2ygihvypvfprc8r"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/fitzgen/peeking_take_while")
-    (synopsis "Provides the peeking_take_while iterator adaptor method")
-    (description
-      "Like @code{Iterator::take_while}, but calls the predicate on a peeked
-value.  This allows you to use @code{Iterator::by_ref} and
-@code{Iterator::take_while} together, and still get the first value for which
-the @code{take_while} predicate returned false after dropping the @code{by_ref}.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-percent-encoding ; guix upstreamable
-  (package
-    (name "rust-percent-encoding")
-    (version "2.0.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "percent-encoding" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0m6rkp3iy11la04p6z3492rns6n693pvmx585dvfmzzlzak2hkxs"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/servo/rust-url/")
-    (synopsis "Percent encoding and decoding")
-    (description "This crate provides percent encoding and decoding.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-pest
   (package
     (name "rust-pest")
@@ -4399,25 +4013,6 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}.
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-pin-utils ; guix upstreamable
-  (package
-    (name "rust-pin-utils")
-    (version "0.1.0-alpha.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "pin-utils" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "11xmyx00n4m37d546by2rxb8ryxs12v55cc172i3yak1rqccd52q"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/rust-lang-nursery/pin-utils")
-    (synopsis "Utilities for pinning")
-    (description "This crate provides utilities for pinning values on the stack.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-pkg-config
   (package
     (name "rust-pkg-config")
@@ -4446,98 +4041,39 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}.
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-plain ; guix upstreamable
+(define-public rust-proc-macro-nested ; guix upstreamable
   (package
-    (name "rust-plain")
-    (version "0.2.3")
+    (name "rust-proc-macro-nested")
+    (version "0.1.3")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "plain" version))
+        (uri (crate-uri "proc-macro-nested" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "19n1xbxb4wa7w891268bzf6cbwq4qvdb86bik1z129qb0xnnnndl"))))
+          "0bmlksm8vl44wkwihmwr7jsjznhbg0n7aibcw1cs2jgjcp86x6in"))))
     (build-system cargo-build-system)
-    (home-page "https://github.com/randomites/plain")
-    (synopsis "Rust library that allows reinterpreting data safely")
-    (description "This package provides a small Rust library that allows users
- to reinterpret data of certain types safely.")
+    (home-page "https://github.com/dtolnay/proc-macro-hack")
+    (synopsis "Support for nested proc-macro-hack invocations")
+    (description "This crate provides support for nested proc-macro-hack
+invocations.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-pocket-resources ; guix upstreamable
+(define-public rust-proptest
   (package
-    (name "rust-pocket-resources")
-    (version "0.3.2")
+    (name "rust-proptest")
+    (version "0.9.4")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "pocket-resources" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "proptest" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "1n2i5vmi8fdbw89wm5nz1ws1z9f1qax911p6ksg4scmdg23z6df1"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/tomaka/pocket-resources")
-    (synopsis "Include resources in your applications")
-    (description "This crate allows you to include resources in your
-applications.")
-    (license license:expat)))
-
-(define-public rust-ppv-lite86 ; guix upstreamable
-  (package
-    (name "rust-ppv-lite86")
-    (version "0.2.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "ppv-lite86" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "06snnv338w341nicfqba2jgln5dsla72ndkgrw7h1dfdb3vgkjz3"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/cryptocorrosion/cryptocorrosion")
-    (synopsis "Implementation of the crypto-simd API for x86")
-    (description "This crate provides an implementation of the crypto-simd API
-for x86.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-proc-macro-nested ; guix upstreamable
-  (package
-    (name "rust-proc-macro-nested")
-    (version "0.1.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "proc-macro-nested" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0bmlksm8vl44wkwihmwr7jsjznhbg0n7aibcw1cs2jgjcp86x6in"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/dtolnay/proc-macro-hack")
-    (synopsis "Support for nested proc-macro-hack invocations")
-    (description "This crate provides support for nested proc-macro-hack
-invocations.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-proptest
-  (package
-    (name "rust-proptest")
-    (version "0.9.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "proptest" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "17sjg8isas4qk85807c4panih9k0lwa4k1mbajhciw5c5q17w56g"))))
+          (base32
+            "17sjg8isas4qk85807c4panih9k0lwa4k1mbajhciw5c5q17w56g"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
@@ -4656,26 +4192,6 @@ invocations.")
       "a collection of approximate quantile algorithms")
     (license license:expat)))
 
-(define-public rust-quick-error ; guix upstreamable
-  (package
-    (name "rust-quick-error")
-    (version "1.2.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "quick-error" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1w6kgwwv7p7zr0yyg5rb315lkk24bimywklwx7fsvsbwi10bjx4j"))))
-    (build-system cargo-build-system)
-    (home-page "http://github.com/tailhook/quick-error")
-    (synopsis "Macro which makes error types pleasant to write")
-    (description "This crate provides a macro which makes error types pleasant
-to write.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-quickcheck
   (package
     (name "rust-quickcheck")
@@ -5674,26 +5190,6 @@ system calls.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rustc-std-workspace-core ; guix upstreamable
-  (package
-    (name "rust-rustc-std-workspace-core")
-    (version "1.0.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "rustc-std-workspace-core" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1309xhwyai9xpz128xrfjqkmnkvgjwddznmj7brbd8i8f58zamhr"))))
-    (build-system cargo-build-system)
-    (home-page "https://crates.io/crates/rustc-std-workspace-core")
-    (synopsis "Explicitly empty crate for rust-lang/rust integration")
-    (description "This crate provides an explicitly empty crate for
-rust-lang/rust integration.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-rustc-test
   (package
     (name "rust-rustc-test")
@@ -5805,50 +5301,6 @@ rust-lang/rust integration.")
     (license (list license:unlicense
                    license:expat))))
 
-(define-public rust-scoped-tls ; guix upstreamable
-  (package
-    (name "rust-scoped-tls")
-    (version "1.0.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "scoped-tls" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1hj8lifzvivdb1z02lfnzkshpvk85nkgzxsy2hc0zky9wf894spa"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/alexcrichton/scoped-tls")
-    (synopsis "Rust library providing the old standard library's scoped_thread_local")
-    (description "This crate provides a library implementation of the standard
-library's old @code{scoped_thread_local!} macro for providing scoped access to
-@dfn{thread local storage} (TLS) so any type can be stored into TLS.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-scopeguard ; guix upstreamable
-  (package
-    (name "rust-scopeguard")
-    (version "1.0.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "scopeguard" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "03aay84r1f6w87ckbpj6cc4rnsxkxcfs13n5ynxjia0qkgjiabml"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/bluss/scopeguard")
-    (synopsis "Scope guard which will run a closure even out of scope")
-    (description "This package provides a RAII scope guard that will run a
-given closure when it goes out of scope, even if the code between panics
-(assuming unwinding panic).  Defines the macros @code{defer!},
-@code{defer_on_unwind!}, @code{defer_on_success!} as shorthands for guards
-with one of the implemented strategies.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-scopeguard-0.3
   (package
     (inherit rust-scopeguard)
@@ -5999,25 +5451,6 @@ function with proven statistical guarantees.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-semver-parser ; guix upstreamable
-  (package
-    (name "rust-semver-parser")
-    (version "0.9.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "semver-parser" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1ahqhvgpzhcsd28id7xnrjv4419i9yyalhm7d7zi430qx0hi2vml"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/steveklabnik/semver-parser")
-    (synopsis "Parsing of the semver spec")
-    (description "This package provides for parsing of the semver spec.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-semver-parser-0.7
   (package
     (inherit rust-semver-parser)
@@ -6027,11 +5460,10 @@ function with proven statistical guarantees.")
       (origin
         (method url-fetch)
         (uri (crate-uri "semver-parser" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq"))))))
+         (base32
+          "18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq"))))))
 
 (define-public rust-serde
   (package
@@ -6369,45 +5801,6 @@ function with proven statistical guarantees.")
       "Minimal implementation of SHA1 for Rust.")
     (license license:bsd-3)))
 
-(define-public rust-shlex ; guix upstreamable
-  (package
-    (name "rust-shlex")
-    (version "0.1.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "shlex" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1lmv6san7g8dv6jdfp14m7bdczq9ss7j7bgsfqyqjc3jnjfippvz"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/comex/rust-shlex")
-    (synopsis "Split a string into shell words, like Python's shlex")
-    (description "This crate provides a method to split a string into shell
-words, like Python's shlex.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-slab ; guix upstreamable
-  (package
-    (name "rust-slab")
-    (version "0.4.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "slab" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1y59xsa27jk84sxzswjk60xcjf8b4fm5960jwpznrrcmasyva4f1"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/carllerche/slab")
-    (synopsis "Pre-allocated storage for a uniform data type")
-    (description "This create provides a pre-allocated storage for a uniform
-data type.")
-    (license license:expat)))
-
 (define-public rust-sleef-sys
   (package
     (name "rust-sleef-sys")
@@ -6464,26 +5857,6 @@ data type.")
                    license:mpl2.0
                    license:expat))))
 
-(define-public rust-spin ; guix upstreamable
-  (package
-    (name "rust-spin")
-    (version "0.5.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "spin" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0m9clchsj0rf13bggsgvbv9haiy0f6rhvnvkpvkk8720a5pkydj4"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/mvdnes/spin-rs.git")
-    (synopsis "Synchronization primitives based on spinning")
-    (description "This crate provides synchronization primitives based on
-spinning.  They may contain data, are usable without @code{std},and static
-initializers are available.")
-    (license license:expat)))
-
 (define-public rust-stacker
   (package
     (name "rust-stacker")
@@ -6625,26 +5998,6 @@ initializers are available.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-stdweb-internal-runtime ; guix upstreamable
-  (package
-    (name "rust-stdweb-internal-runtime")
-    (version "0.1.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "stdweb-internal-runtime" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1nhpyra7glbwcpakhpj5a3d7h7kx1ynif473nzshmk226m91f8ym"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/koute/stdweb")
-    (synopsis "Internal runtime for the @code{stdweb} crate")
-    (description "This crate provides internal runtime for the @code{stdweb}
-crate.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-stdweb-internal-test-macro
   (package
     (name "rust-stdweb-internal-test-macro")
@@ -6721,26 +6074,6 @@ crate.")
     (license (list license:unlicense
                    license:expat))))
 
-(define-public rust-strsim ; guix upstreamable
-  (package
-    (name "rust-strsim")
-    (version "0.9.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "strsim" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1xphwhf86yxxmcpvm4mikj8ls41f6nf7gqyjm98b74mfk81h6b03"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/dguo/strsim-rs")
-    (synopsis "Rust implementations of string similarity metrics")
-    (description "This crate includes implementations of string similarity
-metrics.  It includes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro,
-and Jaro-Winkler.")
-    (license license:expat)))
-
 (define-public rust-strsim-0.8
   (package
     (inherit rust-strsim)
@@ -6874,25 +6207,6 @@ and Jaro-Winkler.")
       "Helper methods and macros for custom derives")
     (license license:expat)))
 
-(define-public rust-synstructure-test-traits ; guix upstreamable
-  (package
-    (name "rust-synstructure-test-traits")
-    (version "0.1.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "synstructure_test_traits" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1b3fs2b9kc1gy9dilaxqjbdl4z0mlrbbxjzkprdx953rif1c3q66"))))
-    (build-system cargo-build-system)
-    (home-page "https://crates.io/crates/synstructure_test_traits")
-    (synopsis "Helper test traits for synstructure doctests")
-    (description
-     "This package provides helper test traits for synstructure doctests.")
-    (license license:expat)))
-
 (define-public rust-tempdir
   (package
     (name "rust-tempdir")
@@ -7671,28 +6985,6 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-typenum ; guix upstreamable
-  (package
-    (name "rust-typenum")
-    (version "1.10.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "typenum" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0sc1jirllfhdi52z1xv9yqzxzpk6v7vadd13n7wvs1wnjipn6bb1"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/paholg/typenum")
-    (synopsis "Rust library for type-level numbers evaluated at compile time")
-    (description "Typenum is a Rust library for type-level numbers evaluated at
-compile time.  It currently supports bits, unsigned integers, and signed
-integers.  It also provides a type-level array of type-level numbers, but its
-implementation is incomplete.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-ucd-trie
   (package
     (name "rust-ucd-trie")
@@ -7719,26 +7011,6 @@ implementation is incomplete.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-ucd-util ; guix upstreamable
-  (package
-    (name "rust-ucd-util")
-    (version "0.1.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "ucd-util" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0x088q5z0m09a2jqcfgsnq955y8syn1mgn35cl78qinkxm4kp6zs"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/BurntSushi/ucd-generate")
-    (synopsis "library for working with the Unicode character database")
-    (description "This package provides a small utility library for working
-with the Unicode character database.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-unicode-normalization
   (package
     (name "rust-unicode-normalization")
@@ -7793,46 +7065,6 @@ with the Unicode character database.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-unicode-width ; guix upstreamable
-  (package
-    (name "rust-unicode-width")
-    (version "0.1.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "unicode-width" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "09k5lipygardwy0660jhls08fsgknrazzivmn804gps53hiqc8w8"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/unicode-rs/unicode-width")
-    (synopsis "Determine displayed width according to Unicode rules")
-    (description "This crate allows you to determine displayed width of
-@code{char} and @code{str} types according to Unicode Standard Annex #11 rules.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-unindent ; guix upstreamable
-  (package
-    (name "rust-unindent")
-    (version "0.1.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "unindent" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1x21ilf78aqcq9xzb9b7i628wm10rhk0jp0chlv06rkc690l8jw3"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/dtolnay/indoc")
-    (synopsis "Remove a column of leading whitespace from a string")
-    (description "This crate allows you to remove a column of leading
-whitespace from a string.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-url
   (package
     (name "rust-url")
@@ -8165,26 +7397,6 @@ whitespace from a string.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-wasm-bindgen-shared ; guix upstreamable
-  (package
-    (name "rust-wasm-bindgen-shared")
-    (version "0.2.48")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "wasm-bindgen-shared" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "08rnfhjyk0f6liv8n4rdsvhx7r02glkhcbj2lp9lcbkbfpad9hnr"))))
-    (build-system cargo-build-system)
-    (home-page "https://rustwasm.github.io/wasm-bindgen/")
-    (synopsis "Shared support between wasm-bindgen and wasm-bindgen cli")
-    (description "This package provides shared support between
-@code{wasm-bindgen} and @code{wasm-bindgen} cli, an internal dependency.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-wasm-bindgen-test
   (package
     (name "rust-wasm-bindgen-test")
@@ -8275,56 +7487,6 @@ whitespace from a string.")
       "This package provides a Rust equivalent of Unix command \"which\".  Locate installed execuable in cross platforms.")
     (license license:expat)))
 
-(define-public rust-winapi
-  (package
-    (name "rust-winapi")
-    (version "0.3.7")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winapi" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0w7pbhcl087lkggxdflfp2i92rq89ahsfdkjkv44fgmiy9m3h3pi"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-winapi-i686-pc-windows-gnu"
-          ,rust-winapi-i686-pc-windows-gnu)
-         ("rust-winapi-x86-64-pc-windows-gnu"
-          ,rust-winapi-x86-64-pc-windows-gnu))))
-    (home-page
-      "https://github.com/retep998/winapi-rs")
-    (synopsis
-      "Raw FFI bindings for all of Windows API.")
-    (description
-      "Raw FFI bindings for all of Windows API.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-winapi-i686-pc-windows-gnu ; guix upstreamable?
-  (package
-    (name "rust-winapi-i686-pc-windows-gnu")
-    (version "0.4.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winapi-i686-pc-windows-gnu" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1dmpa6mvcvzz16zg6d5vrfy4bxgg541wxrcip7cnshi06v38ffxc"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/retep998/winapi-rs")
-    (synopsis "Import libraries for the i686-pc-windows-gnu target")
-    (description "This crate provides import libraries for the
-i686-pc-windows-gnu target.  Please don't use this crate directly, depend on
-@code{winapi} instead.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-winapi-util
   (package
     (name "rust-winapi-util")
@@ -8333,44 +7495,21 @@ i686-pc-windows-gnu target.  Please don't use this crate directly, depend on
       (origin
         (method url-fetch)
         (uri (crate-uri "winapi-util" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "1j839dc6y8vszvrsb7yk0qvs0w6asnahxzbyans37vnsw6vbls3i"))))
+         (base32
+          "1j839dc6y8vszvrsb7yk0qvs0w6asnahxzbyans37vnsw6vbls3i"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs (("rust-winapi" ,rust-winapi))))
-    (home-page
-      "https://github.com/BurntSushi/winapi-util")
-    (synopsis
-      "A dumping ground for high level safe wrappers over winapi.")
+     `(#:cargo-inputs (("rust-winapi" ,rust-winapi))))
+    (home-page "https://github.com/BurntSushi/winapi-util")
+    (synopsis "Dumping ground for high level safe wrappers over winapi")
     (description
-      "This package provides a dumping ground for high level safe wrappers over winapi.")
+     "This package provides a dumping ground for high level safe wrappers over
+winapi.")
     (license (list license:unlicense
                    license:expat))))
 
-(define-public rust-winapi-x86-64-pc-windows-gnu ; guix upstreamable?
-  (package
-    (name "rust-winapi-x86-64-pc-windows-gnu")
-    (version "0.4.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winapi-x86_64-pc-windows-gnu" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0gqq64czqb64kskjryj8isp62m2sgvx25yyj3kpc2myh85w24bki"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/retep998/winapi-rs")
-    (synopsis "Import libraries for the x86_64-pc-windows-gnu target")
-    (description "This package provides import libraries for the
-x86_64-pc-windows-gnu target.  Please don't use this crate directly, depend on
-@code{winapi} instead.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-wincolor
   (package
     (name "rust-wincolor")
@@ -8379,18 +7518,16 @@ x86_64-pc-windows-gnu target.  Please don't use this crate directly, depend on
       (origin
         (method url-fetch)
         (uri (crate-uri "wincolor" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "1fp9sxq63kw3vjjcjrl3f7px082pplzxcr3qza2n2pa6mq0xj7jn"))))
+         (base32
+          "1fp9sxq63kw3vjjcjrl3f7px082pplzxcr3qza2n2pa6mq0xj7jn"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-winapi" ,rust-winapi)
-         ("rust-winapi-util" ,rust-winapi-util))))
-    (home-page
-      "https://github.com/BurntSushi/termcolor/tree/master/wincolor")
+     `(#:cargo-inputs
+       (("rust-winapi" ,rust-winapi)
+        ("rust-winapi-util" ,rust-winapi-util))))
+    (home-page "https://github.com/BurntSushi/termcolor/tree/master/wincolor")
     (synopsis
       "A simple Windows specific API for controlling text color in a Windows console.")
     (description
-- 
cgit v1.2.3


From c95495b1abfd6d0ed610a27e925c3cb6d5776dbf Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Tue, 13 Aug 2019 05:23:04 -0500
Subject: gn: Clean up some crates

---
 gn/packages/crates-io.scm | 240 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 200 insertions(+), 40 deletions(-)

(limited to 'gn/packages/crates-io.scm')

diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index 9e2774f..4da9217 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -545,7 +545,17 @@
         #:cargo-development-inputs
         (("rust-clap" ,rust-clap)
          ("rust-diff" ,rust-diff)
-         ("rust-shlex" ,rust-shlex))))
+         ("rust-shlex" ,rust-shlex))
+        #:phases
+        (modify-phases %standard-phases
+          (add-after 'unpack 'set-environmental-variable
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((clang (assoc-ref inputs "libclang")))
+                (setenv "LIBCLANG_PATH"
+                        (string-append clang "/lib")))
+              #t)))))
+    (inputs
+     `(("libclang" ,(@ (gnu packages llvm) clang))))
     (home-page
       "https://rust-lang.github.io/rust-bindgen/")
     (synopsis
@@ -772,7 +782,17 @@
       `(#:cargo-inputs
         (("rust-nom" ,rust-nom))
         #:cargo-development-inputs
-        (("rust-clang-sys" ,rust-clang-sys))))
+        (("rust-clang-sys" ,rust-clang-sys))
+        #:phases
+        (modify-phases %standard-phases
+          (add-after 'unpack 'set-environmental-variable
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((clang (assoc-ref inputs "libclang")))
+                (setenv "LIBCLANG_PATH"
+                        (string-append clang "/lib")))
+              #t)))))
+    (inputs
+     `(("libclang" ,(@ (gnu packages llvm) clang))))
     (home-page
       "https://github.com/jethrogb/rust-cexpr")
     (synopsis "A C expression parser and evaluator")
@@ -2382,9 +2402,18 @@ pseudorandom number generator")
          ("rust-serde-derive" ,rust-serde-derive)
          ("rust-tempdir" ,rust-tempdir)
          ("rust-thread-id" ,rust-thread-id)
-         ("rust-time" ,rust-time))))
-    ;(inputs
-    ; `(("libgit" ,(@ (gnu packages version-control) libgit2))))
+         ("rust-time" ,rust-time))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'find-openssl
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((openssl (assoc-ref inputs "openssl")))
+               (setenv "OPENSSL_DIR" openssl))
+             (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
+             #t)))))
+    (inputs
+     `(("libgit" ,(@ (gnu packages version-control) libgit2))
+       ("openssl" ,(@ (gnu packages tls) openssl))))
     (home-page
       "https://github.com/rust-lang/git2-rs")
     (synopsis
@@ -2906,6 +2935,44 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-jemalloc-ctl
+  (package
+    (name "rust-jemalloc-ctl")
+    (version "0.3.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "jemalloc-ctl" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1dx4mik2ww5ic4qqv5zx9dxq6pbkclxnxa9bscg4z4njkpzsa0n5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-jemalloc-sys" ,rust-jemalloc-sys)
+        ("rust-libc" ,rust-libc)
+        ("rust-paste" ,rust-paste))
+       #:cargo-development-inputs
+       (("rust-jemallocator" ,rust-jemallocator))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'override-jemalloc
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((jemalloc (assoc-ref inputs "jemalloc")))
+               (setenv "JEMALLOC_OVERRIDE"
+                       (string-append jemalloc "/lib/libjemalloc_pic.a")))
+             #t)))))
+    (inputs
+     `(("jemalloc" ,(@ (gnu packages jemalloc) jemalloc))))
+    (home-page "https://github.com/gnzlbg/jemallocator")
+    (synopsis
+      "A safe wrapper over jemalloc's control and introspection APIs")
+    (description
+      "This package provides a safe wrapper over jemalloc's control and introspection APIs")
+    (license #f)))
+
 (define-public rust-jemalloc-sys
   (package
     (name "rust-jemalloc-sys")
@@ -2914,22 +2981,34 @@ pseudorandom number generator")
       (origin
         (method url-fetch)
         (uri (crate-uri "jemalloc-sys" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0ify9vlql01qhfxlj7d4p9jvcp90mj2h69nkbq7slccvbhzryfqd"))))
+         (base32
+          "0ify9vlql01qhfxlj7d4p9jvcp90mj2h69nkbq7slccvbhzryfqd"))
+        ;(modules '((guix build utils)))
+        ;(snippet
+        ; '(begin
+        ;    ;; unbundle jemalloc source
+        ;    (delete-file-recursively "jemalloc") #t))
+        ))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-libc" ,rust-libc)
-         ("rust-cc" ,rust-cc)
-         ("rust-fs-extra" ,rust-fs-extra))))
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc)
+        ("rust-cc" ,rust-cc)
+        ("rust-fs-extra" ,rust-fs-extra))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'override-jemalloc
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((jemalloc (assoc-ref inputs "jemalloc")))
+               (delete-file-recursively "jemalloc")
+               (setenv "JEMALLOC_OVERRIDE"
+                       (string-append jemalloc "/lib/libjemalloc_pic.a")))
+             #t)))))
     (inputs
-     `(("jemalloc" ,(@ (gnu packages jemalloc) jemalloc))
-       ("rust-cc" ,rust-cc)))
-    (home-page
-      "https://github.com/gnzlbg/jemallocator")
+     `(("jemalloc" ,(@ (gnu packages jemalloc) jemalloc))))
+    (home-page "https://github.com/gnzlbg/jemallocator")
     (synopsis "Rust FFI bindings to jemalloc")
     (description "Rust FFI bindings to jemalloc")
     (license (list license:asl2.0
@@ -2954,7 +3033,17 @@ pseudorandom number generator")
        (("rust-jemalloc-sys" ,rust-jemalloc-sys)
         ("rust-libc" ,rust-libc))
        #:cargo-development-inputs
-       (("rust-paste" ,rust-paste))))
+       (("rust-paste" ,rust-paste))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'override-jemalloc
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((jemalloc (assoc-ref inputs "jemalloc")))
+               (setenv "JEMALLOC_OVERRIDE"
+                       (string-append jemalloc "/lib/libjemalloc_pic.a")))
+             #t)))))
+    (inputs
+     `(("jemalloc" ,(@ (gnu packages jemalloc) jemalloc))))
     (home-page "https://github.com/gnzlbg/jemallocator")
     (synopsis "A Rust allocator backed by jemalloc")
     (description
@@ -3084,8 +3173,14 @@ pseudorandom number generator")
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc"))))
+         (base32
+          "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc"))
+        ;(modules '((guix build utils)))
+        ;(snippet
+        ; '(begin
+        ;    ;; unbundle jemalloc source
+        ;    (delete-file-recursively "libgit2") #t))
+        ))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
@@ -3095,9 +3190,22 @@ pseudorandom number generator")
          ("rust-openssl-sys" ,rust-openssl-sys))
         #:cargo-development-inputs
         (("rust-cc" ,rust-cc)
-         ("rust-pkg-config" ,rust-pkg-config))))
-    ;(inputs
-    ; `(("libgit" ,(@ (gnu packages version-control) libgit2))))
+         ("rust-pkg-config" ,rust-pkg-config))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'find-openssl
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((openssl (assoc-ref inputs "openssl")))
+               (setenv "OPENSSL_DIR" openssl))
+             (delete-file-recursively "libgit2")
+             (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
+             (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
+             #t)))))
+    (inputs
+     `(("libgit" ,(@ (gnu packages version-control) libgit2))
+       ("openssl" ,(@ (gnu packages tls) openssl))
+       ("pkg-config" ,(@ (gnu packages pkg-config) pkg-config))
+       ("zlib" ,(@ (gnu packages compression) zlib))))
     (home-page
       "https://github.com/rust-lang/git2-rs")
     (synopsis
@@ -3144,8 +3252,14 @@ pseudorandom number generator")
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "17dz3xxy5bc73sr52maa6wdqmw1a0ymznrgfzlxid2rng101yshj"))))
+         (base32
+          "17dz3xxy5bc73sr52maa6wdqmw1a0ymznrgfzlxid2rng101yshj"))
+        ;(modules '((guix build utils)))
+        ;(snippet
+        ; '(begin
+        ;    ;; unbundle jemalloc source
+        ;    (delete-file-recursively "libssh2") #t))
+        ))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
@@ -3155,9 +3269,21 @@ pseudorandom number generator")
          ("rust-vcpkg" ,rust-vcpkg))
         #:cargo-development-inputs
         (("rust-cc" ,rust-cc)
-         ("rust-pkg-config" ,rust-pkg-config))))
-    ;(inputs
-    ; `(("libssh2" ,(@ (gnu packages ssh) libssh2))))
+         ("rust-pkg-config" ,rust-pkg-config))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'find-openssl
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((openssl (assoc-ref inputs "openssl")))
+               (setenv "OPENSSL_DIR" openssl))
+             (delete-file-recursively "libssh2")
+             (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
+             #t)))))
+    (inputs
+     `(("libssh2" ,(@ (gnu packages ssh) libssh2))
+       ("openssl" ,(@ (gnu packages tls) openssl))
+       ("pkg-config" ,(@ (gnu packages pkg-config) pkg-config))
+       ("zlib" ,(@ (gnu packages compression) zlib))))
     (home-page
       "https://github.com/alexcrichton/ssh2-rs")
     (synopsis
@@ -3167,7 +3293,6 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
-;; TODO: Unbundle zlib
 (define-public rust-libz-sys
   (package
     (name "rust-libz-sys")
@@ -3179,7 +3304,13 @@ pseudorandom number generator")
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1gjycyl2283525abks98bhxa4r259m617xfm5z52p3p3c8ry9d9f"))))
+          "1gjycyl2283525abks98bhxa4r259m617xfm5z52p3p3c8ry9d9f"))
+        ;(modules '((guix build utils)))
+        ;(snippet
+        ; '(begin
+        ;    ;; unbundle jemalloc source
+        ;    (delete-file-recursively "src/zlib") #t))
+        ))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -3187,7 +3318,16 @@ pseudorandom number generator")
        #:cargo-development-inputs
        (("rust-cc" ,rust-cc)
         ("rust-pkg-config" ,rust-pkg-config)
-        ("rust-vcpkg" ,rust-vcpkg))))
+        ("rust-vcpkg" ,rust-vcpkg))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'delete-vendored-zlib
+           (lambda _
+             (delete-file-recursively "src/zlib")
+             #t)))))
+    (inputs
+     `(("pkg-config" ,(@ (gnu packages pkg-config) pkg-config))
+       ("zlib" ,(@ (gnu packages compression) zlib))))
     (home-page "https://github.com/alexcrichton/libz-sys")
     (synopsis "Bindings to the system libz library (also known as zlib).")
     (description
@@ -3646,7 +3786,16 @@ implementation (which is unstable / requires nightly).")
          ("rust-openssl-sys" ,rust-openssl-sys))
         #:cargo-development-inputs
         (("rust-hex" ,rust-hex)
-         ("rust-tempdir" ,rust-tempdir))))
+         ("rust-tempdir" ,rust-tempdir))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'find-openssl
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((openssl (assoc-ref inputs "openssl")))
+               (setenv "OPENSSL_DIR" openssl))
+             #t)))))
+    (inputs
+     `(("openssl" ,(@ (gnu packages tls) openssl))))
     (home-page
       "https://github.com/sfackler/rust-openssl")
     (synopsis "OpenSSL bindings")
@@ -3693,14 +3842,25 @@ implementation (which is unstable / requires nightly).")
             "1f05kxx8mai9ac16x1lk0404bymghbbj7vcbqrfwqfr52w131fmm"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-libc" ,rust-libc))
-        #:cargo-development-inputs
-        (("rust-autocfg" ,rust-autocfg)
-         ("rust-cc" ,rust-cc)
-         ("rust-openssl-src" ,rust-openssl-src)
-         ("rust-pkg-config" ,rust-pkg-config)
-         ("rust-vcpkg" ,rust-vcpkg))))
+     `(#:cargo-inputs
+       (("rust-autocfg" ,rust-autocfg)
+        ("rust-libc" ,rust-libc))
+       #:cargo-development-inputs
+       (("rust-autocfg" ,rust-autocfg)
+        ("rust-cc" ,rust-cc)
+        ("rust-openssl-src" ,rust-openssl-src)
+        ("rust-pkg-config" ,rust-pkg-config)
+        ("rust-vcpkg" ,rust-vcpkg))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'find-openssl
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((openssl (assoc-ref inputs "openssl")))
+               (setenv "OPENSSL_DIR" openssl))
+             #t)))))
+    (inputs
+     `(("openssl" ,(@ (gnu packages tls) openssl))
+       ("pkg-config" ,(@ (gnu packages pkg-config) pkg-config))))
     (home-page
       "https://github.com/sfackler/rust-openssl")
     (synopsis "FFI bindings to OpenSSL")
-- 
cgit v1.2.3


From 5315ff52dda035e5e969d992f4ee943ca884f4c8 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Fri, 23 Aug 2019 05:12:54 -0500
Subject: gn: Update some crates

---
 gn/packages/crates-io.scm | 136 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 108 insertions(+), 28 deletions(-)

(limited to 'gn/packages/crates-io.scm')

diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index 4da9217..4c7aed5 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -50,7 +50,7 @@
 (define-public rust-afl
   (package
     (name "rust-afl")
-    (version "0.4.3")
+    (version "0.4.4")
     (source
       (origin
         (method url-fetch)
@@ -58,7 +58,7 @@
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0g2chc18ji7qxi0d03n2ai140qdcww958v5si6rcjnnhmri1vyfb"))))
+          "14k6hnwzqn7rrs0hs87vcfqj4334k9wff38d15378frlxpviaard"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -79,7 +79,7 @@
 (define-public rust-aho-corasick
   (package
     (name "rust-aho-corasick")
-    (version "0.7.4")
+    (version "0.7.6")
     (source
       (origin
         (method url-fetch)
@@ -87,7 +87,7 @@
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "10p2yl9fz7a4zwc4kj4zpk0wcz64n4m5l0ng6zsa6zkxrcfamdrn"))))
+          "0b8dh20fhdc59dhhnfi89n2bi80a8zbagzd5c122hf1vv2amxysq"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -95,7 +95,7 @@
        #:cargo-development-inputs
        (("rust-doc-comment" ,rust-doc-comment))))
     (home-page "https://github.com/BurntSushi/aho-corasick")
-    (synopsis "Fast multiple substring searching.")
+    (synopsis "Fast multiple substring searching")
     (description
       "Fast multiple substring searching.")
     (license (list license:unlicense
@@ -355,7 +355,7 @@
 (define-public rust-backtrace
   (package
     (name "rust-backtrace")
-    (version "0.3.33")
+    (version "0.3.35")
     (source
       (origin
         (method url-fetch)
@@ -364,7 +364,7 @@
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1iiinw3c494lz8xb823ccl9zwifka9zsg44734wsd3xgr6dngyw8"))))
+            "0mfwbb6832rh1za304w8x37bvs9fjbybpmmz0iksqfzsaf108w8k"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
@@ -420,7 +420,7 @@
         #:cargo-development-inputs
         (("rust-cc" ,rust-cc))))
     (home-page
-      "https://github.com/alexcrichton/backtrace-rs")
+      "https://github.com/rust-lang/backtrace-rs")
     (synopsis
       "Bindings to the libbacktrace gcc library")
     (description
@@ -473,7 +473,7 @@
         (("rust-criterion" ,rust-criterion)
          ("rust-rand" ,rust-rand))))
     (home-page
-      "https://github.com/alicemaz/rust-base64")
+      "https://github.com/marshallpierce/rust-base64")
     (synopsis
       "encodes and decodes base64 as bytes or utf8")
     (description
@@ -503,7 +503,7 @@
         #:cargo-development-inputs
         (("rust-serde-bytes" ,rust-serde-bytes)
          ("rust-serde-derive" ,rust-serde-derive))))
-    (home-page "https://github.com/TyOverby/bincode")
+    (home-page "https://github.com/servo/bincode")
     (synopsis
       "A binary serialization / deserialization strategy that uses Serde for transforming structs into bytes and vice versa!")
     (description
@@ -513,7 +513,7 @@
 (define-public rust-bindgen
   (package
     (name "rust-bindgen")
-    (version "0.50.0")
+    (version "0.51.0")
     (source
       (origin
         (method url-fetch)
@@ -522,7 +522,7 @@
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1k4n1d002vrfn1mlpww3ib7f275yn4rpxfwkqpr9bym27zg17ab5"))))
+            "1l4sifn771v83q8wafyvmsrphjni8i8wvgdlddd09v35f3fhq9qq"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
@@ -639,7 +639,7 @@
          ("rust-quickcheck" ,rust-quickcheck))))
     (home-page "https://github.com/fitzgen/bumpalo")
     (synopsis
-      "A fast bump allocation arena for Rust.")
+      "Fast bump allocation arena for Rust")
     (description
       "This package provides a fast bump allocation arena for Rust.")
     (license (list license:asl2.0
@@ -695,7 +695,7 @@
          ("rust-serde" ,rust-serde))
         #:cargo-development-inputs
         (("rust-serde-test" ,rust-serde-test))))
-    (home-page "https://github.com/carllerche/bytes")
+    (home-page "https://github.com/tokio-rs/bytes")
     (synopsis
       "Types and traits for working with bytes")
     (description
@@ -723,7 +723,7 @@
          ("rust-ppv-lite86" ,rust-ppv-lite86)
          ("rust-stream-cipher" ,rust-stream-cipher))
         #:cargo-development-inputs
-        (("rust-hex-literal" ,rust-hex-literal))))
+        (("rust-hex-literal" ,rust-hex-literal-0.1))))
     (home-page
       "https://github.com/cryptocorrosion/cryptocorrosion")
     (synopsis "The ChaCha family of stream ciphers")
@@ -856,7 +856,7 @@
          ("rust-serde" ,rust-serde)
          ("rust-serde-derive" ,rust-serde-derive))))
     (home-page
-      "http://github.com/sagiegurari/ci_info")
+      "https://github.com/sagiegurari/ci_info")
     (synopsis
       "Provides current CI environment information.")
     (description
@@ -983,7 +983,7 @@
       `(#:cargo-development-inputs
         (("rust-term" ,rust-term))))
     (home-page
-      "https://github.com/rust-lang-nursery/rust-clippy")
+      "https://github.com/rust-lang/rust-clippy")
     (synopsis
       "A bunch of helpful lints to avoid common pitfalls in Rust.")
     (description
@@ -1151,7 +1151,7 @@
         (("rust-wasm-bindgen-test"
           ,rust-wasm-bindgen-test))))
     (home-page
-      "https://github.com/rust-lang-nursery/stdsimd")
+      "https://github.com/rust-lang/stdarch")
     (synopsis
       "`core::arch` - Rust's core library architecture-specific intrinsics.")
     (description
@@ -1778,7 +1778,7 @@
       `(#:cargo-inputs
         (("rust-indexmap" ,rust-indexmap))))
     (home-page
-      "http://github.com/sagiegurari/envmnt")
+      "https://github.com/sagiegurari/envmnt")
     (synopsis
       "Environment variables utility functions.")
     (description
@@ -2078,7 +2078,7 @@ pseudorandom number generator")
          ("rust-futures-sink-preview"
           ,rust-futures-sink-preview))))
     (home-page
-      "https://rust-lang-nursery.github.io/futures-rs")
+      "https://rust-lang-nursery.github.io/futures-rs/")
     (synopsis
       "Channels for asynchronous communication using futures-rs.")
     (description
@@ -2130,7 +2130,7 @@ pseudorandom number generator")
           ,rust-futures-util-preview)
          ("rust-num-cpus" ,rust-num-cpus))))
     (home-page
-      "https://rust-lang-nursery.github.io/futures-rs")
+      "https://rust-lang-nursery.github.io/futures-rs/")
     (synopsis
       "Executors for asynchronous tasks based on the futures-rs library.")
     (description
@@ -2151,7 +2151,7 @@ pseudorandom number generator")
          (base32
           "0fhvwhdb8ywjjbfng0ra1r8yyc9yzpyxg9sv3spb3f7w0lk40bh8"))))
     (build-system cargo-build-system)
-    (home-page "https://rust-lang-nursery.github.io/futures-rs")
+    (home-page "https://rust-lang-nursery.github.io/futures-rs/")
     (synopsis "Async read and write traits for the futures library")
     (description "This crate provides the @code{AsyncRead} and
 @code{AsyncWrite} traits for the @code{futures-rs} library.")
@@ -2181,7 +2181,7 @@ pseudorandom number generator")
          ("rust-quote" ,rust-quote)
          ("rust-syn" ,rust-syn))))
     (home-page
-      "https://rust-lang-nursery.github.io/futures-rs")
+      "https://rust-lang-nursery.github.io/futures-rs/")
     (synopsis
       "The `select!` macro for waiting on multiple different `Future`s at once and handling the first one to complete.")
     (description
@@ -2208,7 +2208,7 @@ pseudorandom number generator")
         (("rust-futures-core-preview"
           ,rust-futures-core-preview))))
     (home-page
-      "https://rust-lang-nursery.github.io/futures-rs")
+      "https://rust-lang-nursery.github.io/futures-rs/")
     (synopsis
       "The asynchronous `Sink` trait for the futures-rs library.")
     (description
@@ -2252,7 +2252,7 @@ pseudorandom number generator")
          ("rust-slab" ,rust-slab)
          ("rust-tokio-io" ,rust-tokio-io))))
     (home-page
-      "https://rust-lang-nursery.github.io/futures-rs")
+      "https://rust-lang-nursery.github.io/futures-rs/")
     (synopsis
       "Common utilities and extension traits for the futures-rs library.")
     (description
@@ -2310,7 +2310,7 @@ pseudorandom number generator")
         (("rust-bincode" ,rust-bincode)
          ("rust-serde-json" ,rust-serde-json))))
     (home-page
-      "https://github.com/fizyk20/generic-array.git")
+      "https://github.com/fizyk20/generic-array")
     (synopsis
       "Generic types implementing functionality of arrays")
     (description
@@ -2337,7 +2337,7 @@ pseudorandom number generator")
         #:cargo-development-inputs
         (("rust-log" ,rust-log))))
     (home-page
-      "https://github.com/rust-lang/getopts")
+      "https://github.com/rust-lang-nursery/getopts")
     (synopsis "getopts-like option parsing.")
     (description "getopts-like option parsing.")
     (license (list license:asl2.0
@@ -2485,7 +2485,7 @@ pseudorandom number generator")
     (arguments
       `(#:cargo-development-inputs
         (("rust-tempdir" ,rust-tempdir))))
-    (home-page "https://github.com/rust-lang/glob")
+    (home-page "https://github.com/rust-lang-nursery/glob")
     (synopsis
       "Support for matching file paths against Unix shell style patterns.")
     (description
@@ -2613,6 +2613,24 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-hex-literal-0.1
+  (package
+    (inherit rust-hex-literal)
+    (name "rust-hex-literal")
+    (version "0.1.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "hex-literal" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0ffnn5g9q5xhdmzj2ic5hk9y18kyqflbmqcssqcya9gixs5r5hnx"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-hex-literal-impl" ,rust-hex-literal-impl-0.1)
+        ("rust-proc-macro-hack" ,rust-proc-macro-hack))))))
+
 (define-public rust-hex-literal-impl
   (package
     (name "rust-hex-literal-impl")
@@ -2638,6 +2656,23 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-hex-literal-impl-0.1
+  (package
+    (inherit rust-hex-literal-impl)
+    (name "rust-hex-literal-impl")
+    (version "0.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "hex-literal-impl" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1nnxqhyn9l998ma04ip79bmpqv1as6003s03g26ynhrr471p022j"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.4))))))
+
 (define-public rust-humantime
   (package
     (name "rust-humantime")
@@ -4291,6 +4326,28 @@ invocations.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-proc-macro-hack-0.4
+  (package
+    (inherit rust-proc-macro-hack)
+    (name "rust-proc-macro-hack")
+    (version "0.4.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "proc-macro-hack" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0fxn3qfhw76c518dfal2qqjwj5dbf0a1f7z0r5c4wd0igygg4fs6"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-proc-macro-hack-impl" ,rust-proc-macro-hack-impl))
+        #:cargo-development-inputs
+        (("rust-demo-hack" ,rust-demo-hack)
+         ("rust-demo-hack-impl" ,rust-demo-hack-impl))))))
+
 (define-public rust-pulldown-cmark
   (package
     (name "rust-pulldown-cmark")
@@ -7695,6 +7752,29 @@ winapi.")
     (license (list license:unlicense
                    license:expat))))
 
+(define-public rust-xdg
+  (package
+    (name "rust-xdg")
+    (version "2.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "xdg" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0mws8a0fr3cqk5nh7aq9lmkmhzghvasqy4mhw6nnza06l4d6i2fh"))))
+    (build-system cargo-build-system)
+    (home-page
+      "https://github.com/whitequark/rust-xdg")
+    (synopsis
+      "A library for storing and retrieving files according to XDG Base Directory specification")
+    (description
+      "This package provides a library for storing and retrieving files according to XDG Base Directory specification")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-yaml-rust
   (package
     (name "rust-yaml-rust")
-- 
cgit v1.2.3


From 9c8482386107d551b3823f3e4af1fb8c67b706fa Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Sun, 25 Aug 2019 02:48:45 -0500
Subject: gn: remove some upstreamed crates

---
 gn/packages/crates-io.scm | 78 -----------------------------------------------
 1 file changed, 78 deletions(-)

(limited to 'gn/packages/crates-io.scm')

diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index 4c7aed5..c7a0136 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -3171,32 +3171,6 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-libc
-  (package
-    (name "rust-libc")
-    (version "0.2.60")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "libc" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1sxmlcyb39v8awlq5ndaiiq2vja3mc4vf97nxz3qjy007xiq0knl"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-rustc-std-workspace-core"
-         ,rust-rustc-std-workspace-core))))
-    (home-page "https://github.com/rust-lang/libc")
-    (synopsis
-     "Raw FFI bindings to platform libraries like libc.")
-    (description
-     "Raw FFI bindings to platform libraries like libc.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-libgit2-sys
   (package
     (name "rust-libgit2-sys")
@@ -3716,32 +3690,6 @@ implementation (which is unstable / requires nightly).")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-num-integer
-  (package
-    (name "rust-num-integer")
-    (version "0.1.41")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "num-integer" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "02dwjjpfbi16c71fq689s4sw3ih52cvfzr5z5gs6qpr5z0g58pmq"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-num-traits" ,rust-num-traits))
-        #:cargo-development-inputs
-        (("rust-autocfg" ,rust-autocfg))))
-    (home-page
-      "https://github.com/rust-num/num-integer")
-    (synopsis "Integer traits and functions")
-    (description "Integer traits and functions")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-num-iter
   (package
     (name "rust-num-iter")
@@ -3771,32 +3719,6 @@ implementation (which is unstable / requires nightly).")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-num-traits
-  (package
-    (name "rust-num-traits")
-    (version "0.2.8")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "num-traits" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0clvrm34rrqc8p6gq5ps5fcgws3kgq5knh7nlqxf2ayarwks9abb"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-autocfg" ,rust-autocfg))))
-    (home-page
-      "https://github.com/rust-num/num-traits")
-    (synopsis
-      "Numeric traits for generic mathematics")
-    (description
-      "Numeric traits for generic mathematics")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-openssl
   (package
     (name "rust-openssl")
-- 
cgit v1.2.3


From 23919f27753db2c2258f4fed035be70e502428ff Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Mon, 26 Aug 2019 04:37:44 -0500
Subject: gn: rust-qtlreaper: Update to 0.1.4.

* gn/packages/genenetwork.scm (rust-qtlreaper): Update to 0.1.4.
[arguments]: Add rust-ndarray to cargo-inputs.
* gn/packages/crates-io.scm: Add many new crates.
---
 gn/packages/crates-io.scm   | 8282 ++++++++++++++++++++++++++++++++-----------
 gn/packages/genenetwork.scm |    9 +-
 2 files changed, 6302 insertions(+), 1989 deletions(-)

(limited to 'gn/packages/crates-io.scm')

diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index c7a0136..098e279 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -9,6 +9,32 @@
 
 ;; Please keep these packages sorted alphabetically
 
+(define-public rust-accelerate-src
+  (package
+    (name "rust-accelerate-src")
+    (version "0.3.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "accelerate-src" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "17fiqyq7f9k41pbsyrvk9pxyx9z6fw399wq036cvwkbmb14xcpj1"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-development-inputs
+        (("rust-libc" ,rust-libc))))
+    (home-page
+      "https://github.com/blas-lapack-rs/accelerate-src")
+    (synopsis
+      "The package provides a source of BLAS and LAPACK via the Accelerate framework.")
+    (description
+      "The package provides a source of BLAS and LAPACK via the Accelerate framework.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-addr2line
   (package
     (name "rust-addr2line")
@@ -47,6 +73,30 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-adler32
+  (package
+    (name "rust-adler32")
+    (version "1.0.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "adler32" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0p7fxlnks9l7p7rwfqi7aqgnk2bps5zc0rjiw00mdw19nnbjjlky"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-rand" ,rust-rand-0.4))))
+    (home-page "https://github.com/remram44/adler32-rs")
+    (synopsis
+      "It is an implementation of the Adler32 rolling hash algorithm in the Rust programming language.")
+    (description
+      "It is an implementation of the Adler32 rolling hash algorithm in the Rust programming language.")
+    (license (list license:bsd-3
+                   license:zlib))))
+
 (define-public rust-afl
   (package
     (name "rust-afl")
@@ -101,6 +151,31 @@
     (license (list license:unlicense
                    license:expat))))
 
+(define-public rust-aho-corasick-0.6
+  (package
+    (inherit rust-aho-corasick)
+    (name "rust-aho-corasick")
+    (version "0.6.10")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "aho-corasick" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "19f8v503ibvlyr824g5ynicrh1lsmp2i0zmpszr8lqay0qw3vkl1"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-memchr" ,rust-memchr))
+       #:cargo-development-inputs
+       (("rust-csv" ,rust-csv)
+        ("rust-docopt" ,rust-docopt)
+        ("rust-memmap" ,rust-memmap)
+        ("rust-quickcheck" ,rust-quickcheck)
+        ("rust-rand" ,rust-rand-0.5)
+        ("rust-serde" ,rust-serde)
+        ("rust-serde-derive" ,rust-serde-derive))))))
+
 (define-public rust-ansi-term
   (package
     (name "rust-ansi-term")
@@ -147,6 +222,27 @@
       `(#:cargo-inputs
         (("rust-winapi" ,rust-winapi))))))
 
+(define-public rust-antidote
+  (package
+    (name "rust-antidote")
+    (version "1.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "antidote" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "19g2sw2qa2ibnh4x7j1snk46593jgx6y7rnvva496ynq61af5z9l"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/sfackler/rust-antidote")
+    (synopsis
+      "Poison-free versions of the Rust standard library Mutex and RwLock types.")
+    (description
+      "Poison-free versions of the Rust standard library Mutex and RwLock types.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-arrayvec
   (package
     (name "rust-arrayvec")
@@ -591,6 +687,48 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-blas-src
+  (package
+    (name "rust-blas-src")
+    (version "0.3.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "blas-src" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0cxln7bgwxbknaf3qbv4hscy9k53msax14x0szvvp680km3z9zs6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-accelerate-src" ,rust-accelerate-src)
+        ("rust-intel-mkl-src" ,rust-intel-mkl-src)
+        ("rust-netlib-src" ,rust-netlib-src)
+        ("rust-openblas-src" ,rust-openblas-src))))
+    (home-page
+      "https://github.com/blas-lapack-rs/blas-src")
+    (synopsis
+      "The package provides a BLAS source of choice.")
+    (description
+      "The package provides a BLAS source of choice.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-blas-src-0.2
+  (package
+    (inherit rust-blas-src)
+    (name "rust-blas-src")
+    (version "0.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "blas-src" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0l9c1gjhld3ajalak1ipklxfjvwqyy3l7xl019spdbqlrk8r9f57"))))))
+
 (define-public rust-blobby
   (package
     (name "rust-blobby")
@@ -619,6 +757,34 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-bodyparser
+  (package
+    (name "rust-bodyparser")
+    (version "0.8.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "bodyparser" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0c1gynj9l7wv3mjrzr5jifmy0pjdwachfqz09aygdmmab3xan8zh"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-iron" ,rust-iron)
+         ("rust-persistent" ,rust-persistent)
+         ("rust-plugin" ,rust-plugin)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-json" ,rust-serde-json))
+        #:cargo-development-inputs
+        (("rust-serde-derive" ,rust-serde-derive))))
+    (home-page "https://github.com/iron/body-parser")
+    (synopsis "Body parsing middleware for Iron.")
+    (description "Body parsing middleware for Iron.")
+    (license license:expat)))
+
 (define-public rust-bumpalo
   (package
     (name "rust-bumpalo")
@@ -732,6 +898,31 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-cblas-sys
+  (package
+    (name "rust-cblas-sys")
+    (version "0.1.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "cblas-sys" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0rgsn3klhhh09d8qf3b87zl4rwk93l2g0qzh9hhb0lff5kcfrzmn"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs (("rust-libc" ,rust-libc))))
+    (home-page
+      "https://github.com/blas-lapack-rs/cblas-sys")
+    (synopsis
+      "The package provides bindings to CBLAS (C).")
+    (description
+      "The package provides bindings to CBLAS (C).")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-cc
   (package
     (name "rust-cc")
@@ -1132,6 +1323,70 @@
       "This crate provides a number of conversion traits with more specific semantics than those provided by 'as' or 'From'/'Into'.")
     (license license:expat)))
 
+(define-public rust-cookie
+  (package
+    (name "rust-cookie")
+    (version "0.12.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "cookie" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1mdvqixahcywvqp0y8k2skkgbpfhsp0w73l9mz93dcrx1gq091l8"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-time" ,rust-time)
+         ("rust-base64" ,rust-base64)
+         ("rust-ring" ,rust-ring)
+         ("rust-url" ,rust-url))))
+    (home-page
+      "https://github.com/alexcrichton/cookie-rs")
+    (synopsis "Crate for parsing HTTP cookie headers and managing a cookie jar. Supports signed and private (encrypted + signed) jars.")
+    (description "Crate for parsing HTTP cookie headers and managing a cookie jar. Supports signed and private (encrypted + signed) jars.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-cookie-store
+  (package
+    (name "rust-cookie-store")
+    (version "0.8.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "cookie_store" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0204vzqszkjs5j4bqf8rrzrjj9c6f1zdydsid8ndkc7h7bx1v90l"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-cookie" ,rust-cookie)
+         ("rust-idna" ,rust-idna)
+         ("rust-log" ,rust-log)
+         ("rust-publicsuffix" ,rust-publicsuffix)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-json" ,rust-serde-json)
+         ("rust-time" ,rust-time)
+         ("rust-try-from" ,rust-try-from)
+         ("rust-url" ,rust-url))
+        #:cargo-development-inputs
+        (("rust-env-logger" ,rust-env-logger)
+         ("rust-pretty-assertions" ,rust-pretty-assertions))))
+    (home-page
+      "https://github.com/pfernie/cookie_store")
+    (synopsis
+      "Implementation of Cookie storage and retrieval per [RFC6265](http://tools.ietf.org/html/rfc6265)")
+    (description
+      "Implementation of Cookie storage and retrieval per [RFC6265](http://tools.ietf.org/html/rfc6265)")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-core-arch
   (package
     (name "rust-core-arch")
@@ -1159,6 +1414,56 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-core-foundation
+  (package
+    (name "rust-core-foundation")
+    (version "0.6.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "core-foundation" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0va97wf49c8dzm9c8pgyk1jn7z21rl0bj1syf2zz5m2z2hzy1f95"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-chrono" ,rust-chrono)
+         ("rust-core-foundation-sys"
+          ,rust-core-foundation-sys)
+         ("rust-libc" ,rust-libc)
+         ("rust-uuid" ,rust-uuid))))
+    (home-page
+      "https://github.com/servo/core-foundation-rs")
+    (synopsis
+      "Bindings to Core Foundation for macOS")
+    (description
+      "Bindings to Core Foundation for macOS")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-core-foundation-sys
+  (package
+    (name "rust-core-foundation-sys")
+    (version "0.6.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "core-foundation-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0fzsw1j9g1x598yhwklg59l15hwzc0pyvs01w9fg2kin4598mjp7"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/servo/core-foundation-rs")
+    (synopsis "Bindings to Core Foundation for OS X")
+    (description
+      "Bindings to Core Foundation for OS X")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-cpp-demangle
   (package
     (name "rust-cpp-demangle")
@@ -1167,11 +1472,10 @@
       (origin
         (method url-fetch)
         (uri (crate-uri "cpp_demangle" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0a4hqsfc0sfdwy7pcr0rc1fjp2j47fxbkqfc2lfrbi4zlm5hq36k"))))
+         (base32
+          "0a4hqsfc0sfdwy7pcr0rc1fjp2j47fxbkqfc2lfrbi4zlm5hq36k"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
@@ -1221,6 +1525,34 @@
       "Library for retrieving and interacting with the crates.io index")
     (license license:asl2.0)))
 
+(define-public rust-crc32fast
+  (package
+    (name "rust-crc32fast")
+    (version "1.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "crc32fast" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1c9dhkvf3brrzzplcijaywxi2w8wv5578i0ryhcm7x8dmzi5s4ms"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if))
+       #:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher)
+        ("rust-quickcheck" ,rust-quickcheck-0.6)
+        ("rust-rand" ,rust-rand-0.4))))
+    (home-page "https://github.com/srijs/rust-crc32fast")
+    (synopsis
+      "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation")
+    (description
+      "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-criterion
   (package
     (name "rust-criterion")
@@ -1270,6 +1602,38 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-crossbeam
+  (package
+    (name "rust-crossbeam")
+    (version "0.7.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "crossbeam" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0g5jysq5x4gndc1v5sq9n3f1m97k7qihwdpigw6ar6knj14qm09d"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-cfg-if" ,rust-cfg-if)
+         ("rust-crossbeam-channel"
+          ,rust-crossbeam-channel)
+         ("rust-crossbeam-deque" ,rust-crossbeam-deque)
+         ("rust-crossbeam-epoch" ,rust-crossbeam-epoch)
+         ("rust-crossbeam-queue" ,rust-crossbeam-queue)
+         ("rust-crossbeam-utils" ,rust-crossbeam-utils))
+        #:cargo-development-inputs
+        (("rust-rand" ,rust-rand-0.6))))
+    (home-page
+      "https://github.com/crossbeam-rs/crossbeam")
+    (synopsis "Tools for concurrent programming")
+    (description "Tools for concurrent programming")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-crossbeam-deque
   (package
     (name "rust-crossbeam-deque")
@@ -1467,32 +1831,142 @@
       `(#:cargo-inputs
         (("rust-cfg-if" ,rust-cfg-if))))))
 
-(define-public rust-custom-derive
+(define-public rust-csv
   (package
-    (name "rust-custom-derive")
-    (version "0.1.7")
+    (name "rust-csv")
+    (version "1.1.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "custom_derive" version))
+        (uri (crate-uri "csv" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1f81bavw1wnykwh21hh4yyzigs6zl6f6pkk9p3car8kq95yfb2pg"))))
+            "0zgq18xam24rbggm3ybmrygipa0mrr7rscf9r8hmi9vkzp6rql9p"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-development-inputs
-        (("rust-rustc-serialize" ,rust-rustc-serialize))))
+      `(#:cargo-inputs
+        (("rust-bstr" ,rust-bstr)
+         ("rust-csv-core" ,rust-csv-core)
+         ("rust-itoa" ,rust-itoa)
+         ("rust-ryu" ,rust-ryu)
+         ("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-serde" ,rust-serde))))
     (home-page
-      "https://github.com/DanielKeep/rust-custom-derive/tree/custom_derive-master")
+      "https://github.com/BurntSushi/rust-csv")
     (synopsis
-      "(Note: superseded by `macro-attr`) This crate provides a macro that enables the use of custom derive attributes.")
+      "Fast CSV parsing with support for serde.")
+    (description
+      "Fast CSV parsing with support for serde.")
+    (license (list license:unlicense
+                   license:expat))))
+
+(define-public rust-ct-logs
+  (package
+    (name "rust-ct-logs")
+    (version "0.6.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "ct-logs" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "04wiwiv4ghni3x2vni3z711mlz0ndqvh04vmdkbw3nr7zbsqcdjd"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs (("rust-sct" ,rust-sct))))
+    (home-page "https://github.com/ctz/ct-logs")
+    (synopsis
+      "Google's list of Certificate Transparency logs for use with sct crate")
+    (description
+      "Google's list of Certificate Transparency logs for use with sct crate")
+    (license (list license:asl2.0
+                   license:isc
+                   license:expat))))
+
+(define-public rust-custom-derive
+  (package
+    (name "rust-custom-derive")
+    (version "0.1.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "custom_derive" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1f81bavw1wnykwh21hh4yyzigs6zl6f6pkk9p3car8kq95yfb2pg"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-development-inputs
+        (("rust-rustc-serialize" ,rust-rustc-serialize))))
+    (home-page
+      "https://github.com/DanielKeep/rust-custom-derive/tree/custom_derive-master")
+    (synopsis
+      "(Note: superseded by `macro-attr`) This crate provides a macro that enables the use of custom derive attributes.")
     (description
       "(Note: superseded by `macro-attr`) This crate provides a macro that enables the use of custom derive attributes.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-data-encoding
+  (package
+    (name "rust-data-encoding")
+    (version "2.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "data-encoding" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "15xd6afhsjl08285piwczrafmckpp8i29padj8v12xhahshprx7l"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/ia0/data-encoding")
+    (synopsis
+      "This library provides the following common encodings")
+    (description
+      "This library provides the following common encodings")
+    (license license:expat)))
+
+(define-public rust-defmac
+  (package
+    (name "rust-defmac")
+    (version "0.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "defmac" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "01ff3jdmcc5waffkwllndnx5hsn414r7x1rq4ib73n7awsyzxkxv"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/bluss/defmac")
+    (synopsis "A macro to define lambda-like macros inline.")
+    (description "A macro to define lambda-like macros inline.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-defmac-0.1
+  (package
+    (inherit rust-defmac)
+    (name "rust-defmac")
+    (version "0.1.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "defmac" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "17giv0n0n1r64z0dahfvkjy3ys517jxyhs8sd9lmgvcljpjyryxa"))))))
+
 (define-public rust-demo-hack
   (package
     (name "rust-demo-hack")
@@ -1730,6 +2204,61 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-encoding-rs
+  (package
+    (name "rust-encoding-rs")
+    (version "0.8.17")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "encoding_rs" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1v902qqnbd37vdq4rjvp6k05wmghrasfdcjy30gp1xpjg5f7hma1"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-cfg-if" ,rust-cfg-if)
+         ("rust-packed-simd" ,rust-packed-simd)
+         ("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-bincode" ,rust-bincode)
+         ("rust-serde-derive" ,rust-serde-derive)
+         ("rust-serde-json" ,rust-serde-json))))
+    (home-page "https://docs.rs/encoding_rs/")
+    (synopsis
+      "A Gecko-oriented implementation of the Encoding Standard")
+    (description
+      "This package provides a Gecko-oriented implementation of the Encoding Standard")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-enum-as-inner
+  (package
+    (name "rust-enum-as-inner")
+    (version "0.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "enum-as-inner" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0zg3h7k3g1z7a9ayqy63sk302d4dg5g2h274ddv80mj4jxn2cn1x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2)
+        ("rust-quote" ,rust-quote)
+        ("rust-syn" ,rust-syn))))
+    (home-page "https://github.com/bluejekyll/enum-as-inner")
+    (synopsis "A deriving proc-macro for generating functions to automatically give access to the inner members of enum.")
+    (description "A deriving proc-macro for generating functions to automatically give access to the inner members of enum.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-env-logger
   (package
     (name "rust-env-logger")
@@ -1760,6 +2289,38 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-env-logger-0.5
+  (package
+    (inherit rust-env-logger)
+    (name "rust-env-logger")
+    (version "0.5.13")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "env_logger" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0f0c4i4c65jh8lci0afl5yg74ac0lbnpxcp81chj114zwg9a9c0m"))))))
+
+(define-public rust-env-logger-0.4
+  (package
+    (inherit rust-env-logger)
+    (name "rust-env-logger")
+    (version "0.4.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "env_logger" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0nydz2lidsvx9gs0v2zcz68rzqx8in7fzmiprgsrhqh17vkj3prx"))))
+   (arguments
+    `(#:cargo-inputs
+      (("rust-log" ,rust-log)
+       ("rust-regex" ,rust-regex-0.2))))))
+
 (define-public rust-envmnt
   (package
     (name "rust-envmnt")
@@ -1899,6 +2460,37 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-filetime
+  (package
+    (name "rust-filetime")
+    (version "0.2.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "filetime" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0sflihq2l77xjrza7yjalnxsc7dxzg25rhzcfbd9vmyfah5kimvb"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-cfg-if" ,rust-cfg-if)
+         ("rust-libc" ,rust-libc)
+         ("rust-redox-syscall" ,rust-redox-syscall)
+         ("rust-winapi" ,rust-winapi))
+        #:cargo-development-inputs
+        (("rust-tempdir" ,rust-tempdir))))
+    (home-page
+      "https://github.com/alexcrichton/filetime")
+    (synopsis
+      "Platform-agnostic accessors of timestamps in File metadata")
+    (description
+      "Platform-agnostic accessors of timestamps in File metadata")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-findshlibs
   (package
     (name "rust-findshlibs")
@@ -1926,95 +2518,282 @@
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-float-ord
+(define-public rust-fixedbitset
   (package
-    (name "rust-float-ord")
-    (version "0.2.0")
+    (name "rust-fixedbitset")
+    (version "0.1.9")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "float-ord" version))
+        (uri (crate-uri "fixedbitset" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0kin50365sr3spnbscq43lksymybi99ai9rkqdw90m6vixhlibbv"))))
+            "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/bluss/fixedbitset")
+    (synopsis "FixedBitSet is a simple bitset collection")
+    (description "FixedBitSet is a simple bitset collection")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-flame
+  (package
+    (name "rust-flame")
+    (version "0.2.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "flame" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0c5bmhyimzxch3pmh0w3z9n57saasgix4bmbbksr9vp1c5j71hhz"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-development-inputs
-        (("rust-rand" ,rust-rand))))
-    (home-page
-      "https://github.com/notriddle/rust-float-ord")
-    (synopsis
-      "A total ordering for floating-point numbers")
+     `(#:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static)
+        ("rust-thread-id" ,rust-thread-id)
+        ("rust-serde" ,rust-serde)
+        ("rust-serde-derive" ,rust-serde-derive)
+        ("rust-serde-json" ,rust-serde-json))))
+    (home-page "https://github.com/TyOverby/flame")
+    (synopsis "A cool flamegraph library for rust")
     (description
-      "This package provides a total ordering for floating-point numbers")
+     "Flamegraphs are a great way to view profiling information.  At a glance, they give you information about how much time your program spends in critical sections of your code giving you some much-needed insight into where optimizations may be needed.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-fst
+(define-public rust-flamer
   (package
-    (name "rust-fst")
-    (version "0.3.5")
+    (name "rust-flamer")
+    (version "0.4.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "fst" version))
+        (uri (crate-uri "flamer" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1avszq3fn4ix7p6wjfdkli6fjyxccks1qhzja92a6kpxakd35drn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-flame" ,rust-flame)
+        ("rust-quote" ,rust-quote)
+        ("rust-syn" ,rust-syn))))
+    (home-page "https://github.com/llogiq/flamer")
+    (synopsis "A proc macro to insert appropriate flame::start_guard(_) calls (for use with flame)")
+    (description
+      "A proc macro to insert appropriate flame::start_guard(_) calls (for use with flame)")
+    (license license:asl2.0)))
+
+(define-public rust-flate2
+  (package
+    (name "rust-flate2")
+    (version "1.0.11")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "flate2" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1mpby7wa5mkpgjiilam94a2l9mxx9wpgs3nw2nr1a0czzwsb8zwj"))))
+            "10j6bpgpipywmrsxxmp1q48qd9vp1c4fs64y2hv02r48cfxgznia"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-byteorder" ,rust-byteorder)
-         ("rust-memmap" ,rust-memmap))
+        (("rust-crc32fast" ,rust-crc32fast)
+         ("rust-futures" ,rust-futures)
+         ("rust-libc" ,rust-libc)
+         ("rust-libz-sys" ,rust-libz-sys)
+         ("rust-miniz-sys" ,rust-miniz-sys)
+         ("rust-miniz-oxide" ,rust-miniz-oxide)
+         ("rust-miniz-oxide" ,rust-miniz-oxide)
+         ("rust-tokio-io" ,rust-tokio-io))
         #:cargo-development-inputs
-        (("rust-fnv" ,rust-fnv)
-         ("rust-fst-levenshtein" ,rust-fst-levenshtein)
-         ("rust-fst-regex" ,rust-fst-regex)
-         ("rust-lazy-static" ,rust-lazy-static)
+        (("rust-futures" ,rust-futures)
          ("rust-quickcheck" ,rust-quickcheck)
-         ("rust-rand" ,rust-rand))))
-    (home-page "https://github.com/BurntSushi/fst")
+         ("rust-rand" ,rust-rand)
+         ("rust-tokio-io" ,rust-tokio-io)
+         ("rust-tokio-tcp" ,rust-tokio-tcp)
+         ("rust-tokio-threadpool" ,rust-tokio-threadpool))))
+    (home-page
+      "https://github.com/alexcrichton/flate2-rs")
     (synopsis
-      "Use finite state transducers to compactly represents sets or maps of many strings (> 1 billion is possible).")
+      "Bindings to miniz.c for DEFLATE compression and decompression exposed as
+      Reader/Writer streams. Contains bindings for zlib, deflate, and gzip-based
+      streams.")
     (description
-      "Use finite state transducers to compactly represents sets or maps of many strings (> 1 billion is possible). ")
-    (license (list license:unlicense
+      "Bindings to miniz.c for DEFLATE compression and decompression exposed as
+      Reader/Writer streams.  Contains bindings for zlib, deflate, and gzip-based
+      streams.")
+    (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-fst-levenshtein
+(define-public rust-float-ord
   (package
-    (name "rust-fst-levenshtein")
-    (version "0.2.1")
+    (name "rust-float-ord")
+    (version "0.2.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "fst-levenshtein" version))
+        (uri (crate-uri "float-ord" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1s5ml10442bbnpmilmwjh4pfixsj6837rg68vjzg63i3djd4524y"))))
+            "0kin50365sr3spnbscq43lksymybi99ai9rkqdw90m6vixhlibbv"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-fst" ,rust-fst)
-         ("rust-utf8-ranges" ,rust-utf8-ranges))))
-    (home-page "https://github.com/BurntSushi/fst")
+      `(#:cargo-development-inputs
+        (("rust-rand" ,rust-rand))))
+    (home-page
+      "https://github.com/notriddle/rust-float-ord")
     (synopsis
-      "Search finite state transducers with fuzzy queries using Levenshtein automata.")
+      "A total ordering for floating-point numbers")
     (description
-      "Search finite state transducers with fuzzy queries using Levenshtein automata.")
-    (license (list license:unlicense
+      "This package provides a total ordering for floating-point numbers")
+    (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-fst-regex
+(define-public rust-foreign-types
   (package
-    (name "rust-fst-regex")
-    (version "0.2.2")
+    (name "rust-foreign-types")
+    (version "0.4.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "foreign-types" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0ca4i38yrf9iy5k47lr1ylb3rvcbn36d81k5pr5kzf6kmj6p111n"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-foreign-types-macros" ,rust-foreign-types-macros)
+         ("rust-foreign-types-shared" ,rust-foreign-types-shared))))
+    (home-page
+      "https://github.com/sfackler/foreign-types")
+    (synopsis
+      "A framework for Rust wrappers over C APIs.")
+    (description
+      "A framework for Rust wrappers over C APIs.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-foreign-types-macros
+  (package
+    (name "rust-foreign-types-macros")
+    (version "0.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "foreign-types-macros" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "16yjigjcsklcwy2ad32l24k1nwm9n3bsnyhxc3z9whjbsrj60qk6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2)
+        ("rust-quote" ,rust-quote)
+        ("rust-syn" ,rust-syn))))
+    (home-page "https://github.com/sfackler/foreign-types")
+    (synopsis "An internal crate used by foreign-types")
+    (description
+      "An internal crate used by foreign-types.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-foreign-types-shared
+  (package
+    (name "rust-foreign-types-shared")
+    (version "0.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "foreign-types-shared" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0kanxlif1vp0ffh2r9l610jqbkmb3183yqykxq1z5w1vay2rn7y6"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/sfackler/foreign-types")
+    (synopsis "An internal crate used by foreign-types")
+    (description
+     "An internal crate used by foreign-types.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-fst
+  (package
+    (name "rust-fst")
+    (version "0.3.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "fst" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1mpby7wa5mkpgjiilam94a2l9mxx9wpgs3nw2nr1a0czzwsb8zwj"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-byteorder" ,rust-byteorder)
+         ("rust-memmap" ,rust-memmap))
+        #:cargo-development-inputs
+        (("rust-fnv" ,rust-fnv)
+         ("rust-fst-levenshtein" ,rust-fst-levenshtein)
+         ("rust-fst-regex" ,rust-fst-regex)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-quickcheck" ,rust-quickcheck)
+         ("rust-rand" ,rust-rand))))
+    (home-page "https://github.com/BurntSushi/fst")
+    (synopsis
+      "Use finite state transducers to compactly represents sets or maps of many strings (> 1 billion is possible).")
+    (description
+      "Use finite state transducers to compactly represents sets or maps of many strings (> 1 billion is possible). ")
+    (license (list license:unlicense
+                   license:expat))))
+
+(define-public rust-fst-levenshtein
+  (package
+    (name "rust-fst-levenshtein")
+    (version "0.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "fst-levenshtein" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1s5ml10442bbnpmilmwjh4pfixsj6837rg68vjzg63i3djd4524y"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-fst" ,rust-fst)
+         ("rust-utf8-ranges" ,rust-utf8-ranges))))
+    (home-page "https://github.com/BurntSushi/fst")
+    (synopsis
+      "Search finite state transducers with fuzzy queries using Levenshtein automata.")
+    (description
+      "Search finite state transducers with fuzzy queries using Levenshtein automata.")
+    (license (list license:unlicense
+                   license:expat))))
+
+(define-public rust-fst-regex
+  (package
+    (name "rust-fst-regex")
+    (version "0.2.2")
     (source
       (origin
         (method url-fetch)
@@ -2057,6 +2836,46 @@
 pseudorandom number generator")
     (license license:bsd-3)))
 
+(define-public rust-fuchsia-zircon
+  (package
+    (name "rust-fuchsia-zircon")
+    (version "0.3.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "fuchsia-zircon" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "10jxc5ks1x06gpd0xg51kcjrxr35nj6qhx2zlc5n7bmskv3675rf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags)
+        ("rust-fuchsia-zircon-sys" ,rust-fuchsia-zircon-sys))))
+    (home-page "https://fuchsia.googlesource.com/garnet/")
+    (synopsis "Rust bindings for the Zircon kernel")
+    (description "Rust bindings for the Zircon kernel.")
+    (license license:bsd-3)))
+
+(define-public rust-fuchsia-zircon-sys
+  (package
+    (name "rust-fuchsia-zircon-sys")
+    (version "0.3.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "fuchsia-zircon-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "19zp2085qsyq2bh1gvcxq1lb8w6v6jj9kbdkhpdjrl95fypakjix"))))
+    (build-system cargo-build-system)
+    (home-page "https://fuchsia.googlesource.com/garnet/")
+    (synopsis "Low-level Rust bindings for the Zircon kernel")
+    (description "Low-level Rust bindings for the Zircon kernel.")
+    (license license:bsd-3)))
+
 (define-public rust-futures-channel-preview
   (package
     (name "rust-futures-channel-preview")
@@ -2106,6 +2925,33 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-futures-cpupool
+  (package
+    (name "rust-futures-cpupool")
+    (version "0.1.8")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "futures-cpupool" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1r32456gpblzfvnkf60545v8acqk7gh5zhyhi1jn669k9gicv45b"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-futures" ,rust-futures)
+         ("rust-num-cpus" ,rust-num-cpus))))
+    (home-page
+      "https://github.com/alexcrichton/futures-rs")
+    (synopsis
+      "An implementation of thread pools which hand out futures to the results of the computation on the threads themselves.")
+    (description
+      "An implementation of thread pools which hand out futures to the results of the computation on the threads themselves.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-futures-executor-preview
   (package
     (name "rust-futures-executor-preview")
@@ -2158,6 +3004,43 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-futures-preview
+  (package
+    (name "rust-futures-preview")
+    (version "0.3.0-alpha.18")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "futures-preview" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1dg4qijba037xqykminifxpnjasabcjx9pwa3ww8wcmj9w6gka7g"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-futures-channel-preview"
+          ,rust-futures-channel-preview)
+         ("rust-futures-core-preview"
+          ,rust-futures-core-preview)
+         ("rust-futures-executor-preview"
+          ,rust-futures-executor-preview)
+         ("rust-futures-io-preview"
+          ,rust-futures-io-preview)
+         ("rust-futures-sink-preview"
+          ,rust-futures-sink-preview)
+         ("rust-futures-util-preview"
+          ,rust-futures-util-preview))))
+    (home-page
+      "https://rust-lang-nursery.github.io/futures-rs")
+    (synopsis
+      "An implementation of futures and streams featuring zero allocations, composability, and iterator-like interfaces.")
+    (description
+      "An implementation of futures and streams featuring zero allocations, composability, and iterator-like interfaces.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-futures-select-macro-preview
   (package
     (name "rust-futures-select-macro-preview")
@@ -2216,6 +3099,35 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-futures-timer
+  (package
+    (name "rust-futures-timer")
+    (version "0.3.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "futures-timer" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0l35r7nm8p43j0adkhybnwxzbjiqy0b00kgccjy3l513m9abb7lg"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-futures-preview" ,rust-futures-preview)
+         ("rust-pin-utils" ,rust-pin-utils))
+        #:cargo-development-inputs
+        (("rust-runtime" ,rust-runtime))))
+    (home-page
+      "https://github.com/alexcrichton/futures-timer")
+    (synopsis
+      "Timeouts and intervals for futures.")
+    (description
+      "Timeouts and intervals for futures.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-futures-util-preview
   (package
     (name "rust-futures-util-preview")
@@ -2537,6 +3449,52 @@ pseudorandom number generator")
       "An impish, cross-platform, ELF, Mach-o, and PE binary parsing and loading crate")
     (license license:expat)))
 
+(define-public rust-h2
+  (package
+    (name "rust-h2")
+    (version "0.1.26")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "h2" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0qn457y8xh03p7c7cpk76r22gqpyqxc58g5022j3iya7d0j4rcx5"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-byteorder" ,rust-byteorder)
+         ("rust-bytes" ,rust-bytes)
+         ("rust-fnv" ,rust-fnv)
+         ("rust-futures" ,rust-futures)
+         ("rust-http" ,rust-http)
+         ("rust-indexmap" ,rust-indexmap)
+         ("rust-log" ,rust-log)
+         ("rust-slab" ,rust-slab)
+         ("rust-string" ,rust-string)
+         ("rust-tokio-io" ,rust-tokio-io))
+        #:cargo-development-inputs
+        (("rust-env-logger" ,rust-env-logger)
+         ("rust-hex" ,rust-hex)
+         ("rust-quickcheck" ,rust-quickcheck)
+         ("rust-rand" ,rust-rand)
+         ("rust-rustls" ,rust-rustls)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-json" ,rust-serde-json)
+         ("rust-tokio" ,rust-tokio)
+         ("rust-tokio-rustls" ,rust-tokio-rustls)
+         ("rust-walkdir" ,rust-walkdir)
+         ("rust-webpki" ,rust-webpki)
+         ("rust-webpki-roots" ,rust-webpki-roots))))
+    (home-page "https://github.com/hyperium/h2")
+    (synopsis
+      "A Tokio aware, HTTP/2.0 client & server implementation for Rust.")
+    (description
+      "A Tokio aware, HTTP/2.0 client & server implementation for Rust.")
+    (license license:expat)))
+
 (define-public rust-heapsize
   (package
     (name "rust-heapsize")
@@ -2561,6 +3519,29 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-heapsize-plugin
+  (package
+    (name "rust-heapsize-plugin")
+    (version "0.1.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "heapsize_plugin" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1i72isf699q9jl167g2kg4xd6h3cd05rc79zaph58aqjy0g0m9y9"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-development-inputs (("rust-heapsize" ,rust-heapsize))))
+    (home-page "https://github.com/servo/heapsize")
+    (synopsis
+      "Automatically generating infrastructure for measuring the total runtime size of an object on the heap")
+    (description
+      "Automatically generating infrastructure for measuring the total runtime size of an object on the heap")
+    (license license:mpl2.0)))
+
 (define-public rust-heck
   (package
     (name "rust-heck")
@@ -2673,28 +3654,143 @@ pseudorandom number generator")
      `(#:cargo-inputs
        (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.4))))))
 
-(define-public rust-humantime
+(define-public rust-hostname
   (package
-    (name "rust-humantime")
-    (version "1.2.0")
+    (name "rust-hostname")
+    (version "0.1.5")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "humantime" version))
+        (uri (crate-uri "hostname" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "057ilhy6vc9iqhhby5ymh45m051pgxwq2z437gwkbnqhw7rfb9rw"))))
+            "0kprf862qaa7lwdms6aw7f3275h0j2rwhs9nz5784pm8hdmb9ki1"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-quick-error" ,rust-quick-error))
-        #:cargo-development-inputs
-        (("rust-chrono" ,rust-chrono)
-         ("rust-rand" ,rust-rand-0.4)
-         ("rust-time" ,rust-time))))
-    (home-page
+        (("rust-libc" ,rust-libc)
+         ("rust-winutil" ,rust-winutil))))
+    (home-page "https://github.com/fengcen/hostname")
+    (synopsis
+      "Get hostname. Compatible with windows and linux, redox.")
+    (description
+      "Get hostname.  Compatible with windows and linux, redox.")
+    (license license:expat)))
+
+(define-public rust-http
+  (package
+    (name "rust-http")
+    (version "0.1.18")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "http" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1r5nlliz3340dqn1fanr4f13lxfqiwp9r1mhgw8lkr1rz5bcnarp"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-bytes" ,rust-bytes)
+         ("rust-fnv" ,rust-fnv)
+         ("rust-itoa" ,rust-itoa))
+        #:cargo-development-inputs
+        (("rust-doc-comment" ,rust-doc-comment)
+         ("rust-indexmap" ,rust-indexmap)
+         ("rust-quickcheck" ,rust-quickcheck)
+         ("rust-rand" ,rust-rand-0.4)
+         ("rust-seahash" ,rust-seahash)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-json" ,rust-serde-json))))
+    (home-page
+      "https://github.com/hyperium/http")
+    (synopsis
+      "A general purpose library of common HTTP types")
+    (description
+      "A general purpose library of common HTTP types")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-http-body
+  (package
+    (name "rust-http-body")
+    (version "0.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "http-body" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0b99404k4mw6a92hvyr0qwzkqv4f866ykg0x7913limjq5cwhhb7"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-bytes" ,rust-bytes)
+         ("rust-futures" ,rust-futures)
+         ("rust-http" ,rust-http)
+         ("rust-tokio-buf" ,rust-tokio-buf))))
+    (home-page
+      "https://github.com/hyperium/http-body")
+    (synopsis
+      "Trait representing an asynchronous, streaming, HTTP request or response body.")
+    (description
+      "Trait representing an asynchronous, streaming, HTTP request or response body.")
+    (license license:expat)))
+
+(define-public rust-httparse
+  (package
+    (name "rust-httparse")
+    (version "1.3.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "httparse" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1yf23ldnjwfkkhkca7f4w15mky9961gjz28dlwyybhphc7l9l5yd"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-development-inputs
+        (("rust-pico-sys" ,rust-pico-sys))))
+    (home-page
+      "https://github.com/seanmonstar/httparse")
+    (synopsis
+      "A push parser for the HTTP 1.x protocol.")
+    (description
+      "A push parser for the HTTP 1.x protocol.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-humantime
+  (package
+    (name "rust-humantime")
+    (version "1.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "humantime" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "057ilhy6vc9iqhhby5ymh45m051pgxwq2z437gwkbnqhw7rfb9rw"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-quick-error" ,rust-quick-error))
+        #:cargo-development-inputs
+        (("rust-chrono" ,rust-chrono)
+         ("rust-rand" ,rust-rand-0.4)
+         ("rust-time" ,rust-time))))
+    (home-page
       "https://github.com/tailhook/humantime")
     (synopsis
       "A parser and formatter for std::time::{Duration, SystemTime}")
@@ -2703,6 +3799,186 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-hyper
+  (package
+    (name "rust-hyper")
+    (version "0.12.33")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "hyper" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "13rc9js5n8b338lwif94v6mfni5cjjvxf2jcdsrlzvnqx6y4rd3w"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-bytes" ,rust-bytes)
+         ("rust-futures" ,rust-futures)
+         ("rust-futures-cpupool" ,rust-futures-cpupool)
+         ("rust-h2" ,rust-h2)
+         ("rust-http" ,rust-http)
+         ("rust-http-body" ,rust-http-body)
+         ("rust-httparse" ,rust-httparse)
+         ("rust-iovec" ,rust-iovec)
+         ("rust-itoa" ,rust-itoa)
+         ("rust-log" ,rust-log)
+         ("rust-net2" ,rust-net2)
+         ("rust-time" ,rust-time)
+         ("rust-tokio" ,rust-tokio)
+         ("rust-tokio-buf" ,rust-tokio-buf)
+         ("rust-tokio-executor" ,rust-tokio-executor)
+         ("rust-tokio-io" ,rust-tokio-io)
+         ("rust-tokio-reactor" ,rust-tokio-reactor)
+         ("rust-tokio-tcp" ,rust-tokio-tcp)
+         ("rust-tokio-threadpool" ,rust-tokio-threadpool)
+         ("rust-tokio-timer" ,rust-tokio-timer)
+         ("rust-want" ,rust-want))
+        #:cargo-development-inputs
+        (("rust-futures-timer" ,rust-futures-timer)
+         ("rust-num-cpus" ,rust-num-cpus)
+         ("rust-pretty-env-logger"
+          ,rust-pretty-env-logger)
+         ("rust-rustc-version" ,rust-rustc-version)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-derive" ,rust-serde-derive)
+         ("rust-serde-json" ,rust-serde-json)
+         ("rust-spmc" ,rust-spmc)
+         ("rust-tokio-fs" ,rust-tokio-fs)
+         ("rust-tokio-mockstream" ,rust-tokio-mockstream)
+         ("rust-url" ,rust-url))))
+    (home-page "https://hyper.rs")
+    (synopsis "A fast and correct HTTP library.")
+    (description
+      "This package provides a fast and correct HTTP library.")
+    (license license:expat)))
+
+(define-public rust-hyper-old-types
+  (package
+    (name "rust-hyper-old-types")
+    (version "0.11.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "hyper-old-types" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1i69sks0bwamzqdbx8ffgkssxffv6crdmwjgl47nr5pkxi8vx5k8"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-base64" ,rust-base64)
+         ("rust-bytes" ,rust-bytes)
+         ("rust-http" ,rust-http)
+         ("rust-httparse" ,rust-httparse)
+         ("rust-language-tags" ,rust-language-tags)
+         ("rust-log" ,rust-log)
+         ("rust-mime" ,rust-mime)
+         ("rust-percent-encoding" ,rust-percent-encoding)
+         ("rust-time" ,rust-time)
+         ("rust-unicase" ,rust-unicase))))
+    (home-page "https://hyper.rs")
+    (synopsis "HTTP types from hyper 0.11.x")
+    (description "HTTP types from hyper 0.11.x")
+    (license license:expat)))
+
+(define-public rust-hyper-native-tls
+  (package
+    (name "rust-hyper-native-tls")
+    (version "0.3.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "hyper-native-tls" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0s30y20qy0akzss91yxsq1x1q7rr04jy33i0cq72nx22yjc5advd"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-antidote" ,rust-antidote)
+         ("rust-hyper" ,rust-hyper)
+         ("rust-native-tls" ,rust-native-tls))))
+    (home-page "https://github.com/sfackler/hyper-native-tls")
+    (synopsis "native-tls support for Hyper 0.10.")
+    (description "native-tls support for Hyper 0.10.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-hyper-rustls
+  (package
+    (name "rust-hyper-rustls")
+    (version "0.17.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "hyper-rustls" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0li9xkzmqd40dbjbl9g0nbf2ka9y0q538ififyd30zsavz3qb7bi"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-bytes" ,rust-bytes)
+         ("rust-ct-logs" ,rust-ct-logs)
+         ("rust-futures" ,rust-futures)
+         ("rust-hyper" ,rust-hyper)
+         ("rust-rustls" ,rust-rustls)
+         ("rust-tokio-io" ,rust-tokio-io)
+         ("rust-tokio-rustls" ,rust-tokio-rustls)
+         ("rust-webpki" ,rust-webpki)
+         ("rust-webpki-roots" ,rust-webpki-roots))
+        #:cargo-development-inputs
+        (("rust-tokio" ,rust-tokio)
+         ("rust-tokio-tcp" ,rust-tokio-tcp))))
+    (home-page "https://github.com/ctz/hyper-rustls")
+    (synopsis
+      "Rustls+hyper integration for pure rust HTTPS")
+    (description
+      "Rustls+hyper integration for pure rust HTTPS")
+    (license (list license:asl2.0
+                   license:isc
+                   license:expat))))
+
+(define-public rust-hyper-tls
+  (package
+    (name "rust-hyper-tls")
+    (version "0.3.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "hyper-tls" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0kqp4sz8613j6nv375wfj3gh95ff4nb6a3rb1f2vbx0almm0v01s"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-bytes" ,rust-bytes)
+         ("rust-futures" ,rust-futures)
+         ("rust-hyper" ,rust-hyper)
+         ("rust-native-tls" ,rust-native-tls)
+         ("rust-tokio-io" ,rust-tokio-io))
+        #:cargo-development-inputs
+        (("rust-tokio" ,rust-tokio))))
+    (home-page "https://hyper.rs")
+    (synopsis
+      "Default TLS implementation for use with hyper")
+    (description
+      "Default TLS implementation for use with hyper")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-hyphenation
   (package
     (name "rust-hyphenation")
@@ -2889,6 +4165,38 @@ pseudorandom number generator")
       "This package provides a snapshot testing library for Rust")
     (license license:asl2.0)))
 
+(define-public rust-intel-mkl-src
+  (package
+    (name "rust-intel-mkl-src")
+    (version "0.4.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "intel-mkl-src" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "16kq725cl4rnvfpwq9x4rl83ylcqs7d0xryagx8ijm6bdblbfabc"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-failure" ,rust-failure)
+         ("rust-pkg-config" ,rust-pkg-config)
+         ("rust-reqwest" ,rust-reqwest)
+         ("rust-tar" ,rust-tar)
+         ("rust-xz2" ,rust-xz2))
+        #:cargo-development-inputs
+        (("rust-libc" ,rust-libc))))
+    (home-page
+      "https://github.com/termoshtt/rust-intel-mkl")
+    (synopsis
+      "Redistribution of Intel MKL as a crate.")
+    (description
+      "Redistribution of Intel MKL as a crate.")
+    (license (list license:non-copyleft "Intel Simplified Software License"
+                   license:expat)))) ; some wrapper codes
+
 (define-public rust-intervaltree
   (package
     (name "rust-intervaltree")
@@ -2914,6 +4222,39 @@ pseudorandom number generator")
       "This package provides a simple and generic implementation of an immutable interval tree.")
     (license license:expat)))
 
+(define-public rust-iron
+  (package
+    (name "rust-iron")
+    (version "0.6.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "iron" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1s4mf8395f693nhwsr0znw3j5frzn56gzllypyl50il85p50ily6"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-hyper" ,rust-hyper)
+         ("rust-log" ,rust-log)
+         ("rust-mime-guess" ,rust-mime-guess)
+         ("rust-modifier" ,rust-modifier)
+         ("rust-num-cpus" ,rust-num-cpus)
+         ("rust-plugin" ,rust-plugin)
+         ("rust-typemap" ,rust-typemap)
+         ("rust-url" ,rust-url)
+         ("rust-hyper-native-tls" ,rust-hyper-native-tls))
+        #:cargo-development-inputs
+        (("rust-mime" ,rust-mime)
+         ("rust-time" ,rust-time))))
+    (home-page "https://github.com/iron/iron")
+    (synopsis "Extensible, Concurrency Focused Web Development in Rust.")
+    (description "Extensible, Concurrency Focused Web Development in Rust.")
+    (license license:expat)))
+
 (define-public rust-iovec
   (package
     (name "rust-iovec")
@@ -2940,6 +4281,35 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-ipconfig
+  (package
+    (name "rust-ipconfig")
+    (version "0.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "ipconfig" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0gyqiqr4nk2dw9ild1aq3hnv6984sgydfdq7ki586q5ydwhzlyda"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-socket2" ,rust-socket2)
+         ("rust-widestring" ,rust-widestring)
+         ("rust-winapi" ,rust-winapi)
+         ("rust-winreg" ,rust-winreg))))
+    (home-page
+      "https://github.com/liranringel/ipconfig")
+    (synopsis
+      "Get network adapters information and network configuration for windows.")
+    (description
+      "Get network adapters information and network configuration for windows.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-itertools
   (package
     (name "rust-itertools")
@@ -2970,9 +4340,29 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-jemalloc-ctl
+(define-public rust-itertools-0.7
   (package
-    (name "rust-jemalloc-ctl")
+    (inherit rust-itertools)
+    (name "rust-itertools")
+    (version "0.7.11")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "itertools" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "03cpsj26xmyamcalclqzr1i700vwx8hnbgxbpjvs354f8mnr8iqd"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-either" ,rust-either))
+       #:cargo-development-inputs
+       (("rust-permutohedron" ,rust-permutohedron)
+        ("rust-quickcheck" ,rust-quickcheck-0.5))))))
+
+(define-public rust-jemalloc-ctl
+  (package
+    (name "rust-jemalloc-ctl")
     (version "0.3.3")
     (source
       (origin
@@ -3086,6 +4476,87 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-js-sys
+  (package
+    (name "rust-js-sys")
+    (version "0.3.27")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "js-sys" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1m6p0bdgdkhwwy6bvapl9z3bw9nq3li2x480anfffn3calm4zz0y"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-wasm-bindgen" ,rust-wasm-bindgen))
+        #:cargo-development-inputs
+        (("rust-futures" ,rust-futures)
+         ("rust-wasm-bindgen-futures"
+          ,rust-wasm-bindgen-futures)
+         ("rust-wasm-bindgen-test"
+          ,rust-wasm-bindgen-test))))
+    (home-page
+      "https://rustwasm.github.io/wasm-bindgen/")
+    (synopsis
+      "Bindings for all JS global objects and functions in all JS environments like Node.js and browsers, built on `#[wasm_bindgen]` using the `wasm-bindgen` crate.")
+    (description
+      "Bindings for all JS global objects and functions in all JS environments like Node.js and browsers, built on `#[wasm_bindgen]` using the `wasm-bindgen` crate.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-kernel32-sys
+  (package
+    (name "rust-kernel32-sys")
+    (version "0.2.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "kernel32-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1389av0601a9yz8dvx5zha9vmkd6ik7ax0idpb032d28555n41vm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-winapi" ,rust-winapi)
+        ("rust-winapi-build" ,rust-winapi-build))))
+    (home-page "https://github.com/retep998/winapi-rs")
+    (synopsis "Contains function definitions for the Windows API library kernel32")
+    (description "Contains function definitions for the Windows API library kernel32.")
+    (license license:expat)))
+
+(define-public rust-language-tags
+  (package
+    (name "rust-language-tags")
+    (version "0.2.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "language-tags" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "16hrjdpa827carq5x4b8zhas24d8kg4s16m6nmmn1kb7cr5qh7d9"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-heapsize" ,rust-heapsize))
+        #:cargo-development-inputs
+        (("rust-heapsize-plugin" ,rust-heapsize-plugin))))
+    (home-page
+      "https://github.com/pyfisch/rust-language-tags")
+    (synopsis
+      "Language tags for Rust")
+    (description
+      "Language tags for Rust")
+    (license license:expat)))
+
 (define-public rust-lazy-static
   (package
     (name "rust-lazy-static")
@@ -3171,6 +4642,35 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-libflate
+  (package
+    (name "rust-libflate")
+    (version "0.1.27")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "libflate" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1p8z839c5lpl0g01mf8iglys9lgcjxw6xjw56crhwp8z7gs5s4yr"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-adler32" ,rust-adler32)
+         ("rust-crc32fast" ,rust-crc32fast)
+         ("rust-rle-decode-fast" ,rust-rle-decode-fast)
+         ("rust-take-mut" ,rust-take-mut))
+        #:cargo-development-inputs
+        (("rust-clap" ,rust-clap))))
+    (home-page "https://github.com/sile/libflate")
+    (synopsis
+      "A Rust implementation of DEFLATE algorithm and related formats (ZLIB, GZIP)")
+    (description
+      "This package provides a Rust implementation of DEFLATE algorithm and related formats (ZLIB, GZIP)")
+    (license license:expat)))
+
 (define-public rust-libgit2-sys
   (package
     (name "rust-libgit2-sys")
@@ -3444,26 +4944,180 @@ pseudorandom number generator")
       (origin
         (method url-fetch)
         (uri (crate-uri "log" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1cx51p86d9s1y2vbyi6jr4wj5cs7nryikygfcpbc42h7ajnvcxf2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if)
+        ("rust-serde" ,rust-serde))
+       #:cargo-development-inputs
+       (("rust-serde-test" ,rust-serde-test))))
+    (home-page "https://github.com/rust-lang/log")
+    (synopsis
+      "A lightweight logging facade for Rust")
+    (description
+      "This package provides a lightweight logging facade for Rust")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-log-0.3
+  (package
+    (inherit rust-log)
+    (name "rust-log")
+    (version "0.3.9")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "log" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0jq23hhn5h35k7pa8r7wqnsywji6x3wn1q5q7lif5q536if8v7p1"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-log" ,rust-log))))))
+
+(define-public rust-loom
+  (package
+    (name "rust-loom")
+    (version "0.2.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "loom" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1cx51p86d9s1y2vbyi6jr4wj5cs7nryikygfcpbc42h7ajnvcxf2"))))
+            "0w95rjw0sv3f5psaxlgfl4fsj6imjv16v2pap18alx2w7n2f8j24"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
         (("rust-cfg-if" ,rust-cfg-if)
-         ("rust-serde" ,rust-serde))
+         ("rust-futures-util-preview"
+          ,rust-futures-util-preview)
+         ("rust-generator" ,rust-generator)
+         ("rust-scoped-tls" ,rust-scoped-tls)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-json" ,rust-serde-json))))
+    (home-page "https://github.com/carllerche/loom")
+    (synopsis
+      "Permutation testing for concurrent code")
+    (description
+      "Permutation testing for concurrent code")
+    (license license:expat)))
+
+(define-public rust-lru-cache
+  (package
+    (name "rust-lru-cache")
+    (version "0.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "lru-cache" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "071viv6g2p3akwqmfb3c8vsycs5n7kr17b70l7la071jv0d4zqii"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-heapsize" ,rust-heapsize)
+         ("rust-linked-hash-map" ,rust-linked-hash-map))))
+    (home-page
+      "https://github.com/contain-rs/lru-cache")
+    (synopsis
+      "A cache that holds a limited number of key-value pairs")
+    (description
+      "This package provides a cache that holds a limited number of key-value pairs")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-lzma-sys
+  (package
+    (name "rust-lzma-sys")
+    (version "0.1.15")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "lzma-sys" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "14gyj256yh0wm77jbvmlc39v7lfn0navpfrja4alczarzlc8ir2k"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-libc" ,rust-libc))
         #:cargo-development-inputs
-        (("rust-serde-test" ,rust-serde-test))))
-    (home-page "https://github.com/rust-lang/log")
+        (("rust-cc" ,rust-cc)
+         ("rust-pkg-config" ,rust-pkg-config))))
+    (home-page
+      "https://github.com/alexcrichton/xz2-rs")
     (synopsis
-      "A lightweight logging facade for Rust")
+      "Raw bindings to liblzma which contains an implementation of LZMA and xz stream
+      encoding/decoding.
+
+      High level Rust bindings are available in the `xz2` crate.")
     (description
-      "This package provides a lightweight logging facade for Rust")
+        "Raw bindings to liblzma which contains an implementation of LZMA and xz stream
+        encoding/decoding.
+
+        High level Rust bindings are available in the `xz2` crate.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-matrixmultiply
+  (package
+    (name "rust-matrixmultiply")
+    (version "0.2.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "matrixmultiply" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "16sgc1j87hmsqmhlqpqgcpbrb00f267ikbr55fhxla8nhwnxgznw"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-rawpointer" ,rust-rawpointer))
+        #:cargo-development-inputs
+        (("rust-bencher" ,rust-bencher)
+         ("rust-itertools" ,rust-itertools))))
+    (home-page
+      "https://github.com/bluss/matrixmultiply/")
+    (synopsis "General matrix multiplication for f32 and f64 matrices.")
+    (description "General matrix multiplication for f32 and f64 matrices. Operates on matrices with general layout (they can use arbitrary row and column stride). Detects and uses AVX or SSE2 on x86 platforms transparently for higher performance. Uses a microkernel strategy, so that the implementation is easy to parallelize and optimize.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-matrixmultiply-0.1
+  (package
+    (inherit rust-matrixmultiply)
+    (name "rust-matrixmultiply")
+    (version "0.1.15")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "matrixmultiply" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "00p0fpjhm45qdzi37mgv7ggsy8b9gqvq4999yrbgyn1dxkf6gbfw"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-rawpointer" ,rust-rawpointer))
+       #:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher))))))
+
 (define-public rust-memchr
   (package
     (name "rust-memchr")
@@ -3552,3577 +5206,5722 @@ pseudorandom number generator")
       (origin
         (method url-fetch)
         (uri (crate-uri "memoffset" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "1cvm2z7dy138s302ii7wlzcxbka5a8yfl5pl5di7lbdnw9hw578g"))))))
+         (base32
+          "1cvm2z7dy138s302ii7wlzcxbka5a8yfl5pl5di7lbdnw9hw578g"))))))
 
-(define-public rust-no-panic
+(define-public rust-mime
   (package
-    (name "rust-no-panic")
-    (version "0.1.10")
+    (name "rust-mime")
+    (version "0.3.13")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "no-panic" version))
+        (uri (crate-uri "mime" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "089gmyxg7kviimqn5nmghm5kngnmi77a0c6fbv0j67jxx7pjhq3r"))))
+            "09clbyvdkwflp8anwjhqdib0sw8191gphcchdp80nc8ayhhwl9ry"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote)
-         ("rust-syn" ,rust-syn))
-        #:cargo-development-inputs
-        (("rust-tempfile" ,rust-tempfile))))
-    (home-page "https://github.com/dtolnay/no-panic")
+        (("rust-unicase" ,rust-unicase))))
+    (home-page "https://github.com/hyperium/mime")
     (synopsis
-      "Attribute macro to require that the compiler prove a function can't ever panic.")
+      "Strongly Typed Mimes")
     (description
-      "Attribute macro to require that the compiler prove a function can't ever panic.")
+      "Strongly Typed Mimes")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-nodrop ; guix upstreamable
+(define-public rust-mime-guess
   (package
-    (name "rust-nodrop")
-    (version "0.1.13")
+    (name "rust-mime-guess")
+    (version "2.0.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "nodrop" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "mime_guess" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "0if9ifn6rvar5jirx4b3qh4sl5kjkmcifycvzhxa9j3crkfng5ig"))))
+          (base32
+            "16c5ssgali30db6jh1cndy77dd1qgcykhshiyfyjvxxf94wx03hs"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-nodrop-union" ,rust-nodrop-union))))
-    (home-page "https://github.com/bluss/arrayvec")
-    (synopsis "Wrapper type to inhibit drop (destructor)")
-    (description "This package provides a wrapper type to inhibit drop
-(destructor).  Use @code{std::mem::ManuallyDrop} instead!")
-    (license (list license:asl2.0
-                   license:expat))))
+      `(#:cargo-inputs
+        (("rust-mime" ,rust-mime)
+         ("rust-unicase" ,rust-unicase))
+        #:cargo-development-inputs
+        (("rust-criterion" ,rust-criterion))))
+    (home-page "https://github.com/abonander/mime_guess")
+    (synopsis
+      "MIME/MediaType guessing by file extension. Uses a static map of known file extension -> MIME type mappings.")
+    (description
+      "MIME/MediaType guessing by file extension. Uses a static map of known file extension -> MIME type mappings.")
+    (license license:expat)))
 
-(define-public rust-nodrop-union ; guix upstreamable
+(define-public rust-miniz-oxide
   (package
-    (name "rust-nodrop-union")
-    (version "0.1.10")
+    (name "rust-miniz-oxide")
+    (version "0.3.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "nodrop-union" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "miniz_oxide" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "0jsnkdn9l8jlmb9h4wssi76sxnyxwnyi00p6y1p2gdq7c1gdw2b7"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/bluss/arrayvec")
-    (synopsis "Wrapper type to inhibit drop (destructor)")
-    (description "This package provides a wrapper type to inhibit drop
-(destructor).  Implementation crate for nodrop, the untagged unions
-implementation (which is unstable / requires nightly).")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-nom
-  (package
-    (name "rust-nom")
-    (version "5.0.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "nom" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "06snml9wfrvk8k71l4md6gg29jgj4pa8wzsg180q3qr0jf2isxp9"))))
+          (base32
+            "041s41l5w7z8pkp93pdzn8rngxr93q4wxp034pr0cvc7bgway23i"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-lazy-static" ,rust-lazy-static)
-         ("rust-lexical-core" ,rust-lexical-core)
-         ("rust-memchr" ,rust-memchr)
-         ("rust-regex" ,rust-regex))
-        #:cargo-development-inputs
-        (("rust-criterion" ,rust-criterion)
-         ("rust-doc-comment" ,rust-doc-comment)
-         ("rust-jemallocator" ,rust-jemallocator)
-         ("rust-version-check" ,rust-version-check))))
-    (home-page "https://github.com/Geal/nom")
+      `(#:cargo-inputs (("rust-adler32" ,rust-adler32))))
+    (home-page
+      "https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide")
     (synopsis
-      "A byte-oriented, zero-copy, parser combinators library")
+      "DEFLATE compression and decompression library rewritten in Rust based on miniz")
     (description
-      "This package provides a byte-oriented, zero-copy, parser combinators library")
+      "DEFLATE compression and decompression library rewritten in Rust based on miniz")
     (license license:expat)))
 
-(define-public rust-num-cpus
+(define-public rust-miniz-sys
   (package
-    (name "rust-num-cpus")
-    (version "1.10.1")
+    (name "rust-miniz-sys")
+    (version "0.1.12")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "num_cpus" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "miniz-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0wrj3zvj6h3q26sqj9zxpd59frjb54n7jhjwf307clq31ic47vxw"))))
+         (base32
+          "00l2r4anm8g35x0js2zfdnwfbrih9m43vphdpb77c5ga3kjkm7hy"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-libc" ,rust-libc))
-        #:cargo-development-inputs
-        (("rust-doc-comment" ,rust-doc-comment))))
-    (home-page
-      "https://github.com/seanmonstar/num_cpus")
-    (synopsis "Get the number of CPUs on a machine.")
+     `(#:cargo-inputs
+       (("rust-cc" ,rust-cc)
+        ("rust-libc" ,rust-libc))))
+    (home-page "https://github.com/alexcrichton/flate2-rs")
+    (synopsis
+      "Bindings to the miniz.c library.")
     (description
-      "Get the number of CPUs on a machine.")
+      "Bindings to the miniz.c library.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-num-iter
+(define-public rust-mio
   (package
-    (name "rust-num-iter")
-    (version "0.1.39")
+    (name "rust-mio")
+    (version "0.6.19")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "num-iter" version))
+        (uri (crate-uri "mio" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0bhk2qbr3261r6zvfc58lz4spfqjhvdripxgz5mks5rd85r55gbn"))))
+            "08zzs227vrnyz5kvws6awzlgzb8zqpnihs71hkqlw07dlfb1kxc3"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-num-integer" ,rust-num-integer)
-         ("rust-num-traits" ,rust-num-traits))
+        (("rust-fuchsia-zircon" ,rust-fuchsia-zircon)
+         ("rust-fuchsia-zircon-sys"
+          ,rust-fuchsia-zircon-sys)
+         ("rust-iovec" ,rust-iovec)
+         ("rust-kernel32-sys" ,rust-kernel32-sys)
+         ("rust-libc" ,rust-libc)
+         ("rust-log" ,rust-log)
+         ("rust-miow" ,rust-miow)
+         ("rust-net2" ,rust-net2)
+         ("rust-slab" ,rust-slab)
+         ("rust-winapi" ,rust-winapi))
         #:cargo-development-inputs
-        (("rust-autocfg" ,rust-autocfg))))
-    (home-page
-      "https://github.com/rust-num/num-iter")
-    (synopsis
-      "External iterators for generic mathematics")
-    (description
-      "External iterators for generic mathematics")
-    (license (list license:asl2.0
-                   license:expat))))
+        (("rust-bytes" ,rust-bytes)
+         ("rust-env-logger" ,rust-env-logger)
+         ("rust-tempdir" ,rust-tempdir))))
+    (home-page "https://github.com/carllerche/mio")
+    (synopsis "Lightweight non-blocking IO")
+    (description "Lightweight non-blocking IO")
+    (license license:expat)))
 
-(define-public rust-openssl
+(define-public rust-mio-uds
   (package
-    (name "rust-openssl")
-    (version "0.10.24")
+    (name "rust-mio-uds")
+    (version "0.6.7")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "openssl" version))
+        (uri (crate-uri "mio-uds" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "05dg25rmg17rl3ykfl2yf69ghfd5z6zf6di38qw1awjvkddbnll1"))))
+            "09gimdbnj7b9yca99pk8lxh9jhl79msj795c8fxi2sqr9slmfqln"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-bitflags" ,rust-bitflags)
-         ("rust-cfg-if" ,rust-cfg-if)
-         ("rust-foreign-types" ,rust-foreign-types)
-         ("rust-lazy-static" ,rust-lazy-static)
+        (("rust-iovec" ,rust-iovec)
          ("rust-libc" ,rust-libc)
-         ("rust-openssl-sys" ,rust-openssl-sys))
+         ("rust-mio" ,rust-mio))
         #:cargo-development-inputs
-        (("rust-hex" ,rust-hex)
-         ("rust-tempdir" ,rust-tempdir))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'find-openssl
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((openssl (assoc-ref inputs "openssl")))
-               (setenv "OPENSSL_DIR" openssl))
-             #t)))))
-    (inputs
-     `(("openssl" ,(@ (gnu packages tls) openssl))))
+        (("rust-tempdir" ,rust-tempdir))))
     (home-page
-      "https://github.com/sfackler/rust-openssl")
-    (synopsis "OpenSSL bindings")
-    (description "OpenSSL bindings")
-    (license license:asl2.0)))
+      "https://github.com/alexcrichton/mio-uds")
+    (synopsis
+      "Unix domain socket bindings for mio")
+    (description
+      "Unix domain socket bindings for mio")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-openssl-src
+(define-public rust-miow
   (package
-    (name "rust-openssl-src")
-    (version "111.4.0+1.1.1c")
+    (name "rust-miow")
+    (version "0.3.3")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "openssl-src" version))
+        (uri (crate-uri "miow" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "10s3hvkfk6bi4ba1ssvj914rjs31vs8plssy4kbvsa0w7idkqfkq"))))
+            "09ljvx6wg30f2xlv7b7hhpkw7k312n3hjgmrbhwzhz9x03ra0sir"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs (("rust-cc" ,rust-cc))))
+      `(#:cargo-inputs
+        (("rust-socket2" ,rust-socket2)
+         ("rust-winapi" ,rust-winapi))
+        #:cargo-development-inputs
+        (("rust-rand" ,rust-rand))))
     (home-page
-      "https://github.com/alexcrichton/openssl-src-rs")
+      "https://github.com/alexcrichton/miow")
     (synopsis
-      "Source of OpenSSL and logic to build it.")
+      "A zero overhead I/O library for Windows, focusing on IOCP and Async I/O abstractions.")
     (description
-      "Source of OpenSSL and logic to build it.")
+      "This package provides a zero overhead I/O library for Windows, focusing on IOCP and Async I/O abstractions.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-openssl-sys
+(define-public rust-modifier
   (package
-    (name "rust-openssl-sys")
-    (version "0.9.48")
+    (name "rust-modifier")
+    (version "0.1.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "openssl-sys" version))
+        (uri (crate-uri "modifier" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "1f05kxx8mai9ac16x1lk0404bymghbbj7vcbqrfwqfr52w131fmm"))))
+         (base32
+          "0n3fmgli1nsskl0whrfzm1gk0rmwwl6pw1q4nb9sqqmn5h8wkxa1"))))
     (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-autocfg" ,rust-autocfg)
-        ("rust-libc" ,rust-libc))
-       #:cargo-development-inputs
-       (("rust-autocfg" ,rust-autocfg)
-        ("rust-cc" ,rust-cc)
-        ("rust-openssl-src" ,rust-openssl-src)
-        ("rust-pkg-config" ,rust-pkg-config)
-        ("rust-vcpkg" ,rust-vcpkg))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'find-openssl
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((openssl (assoc-ref inputs "openssl")))
-               (setenv "OPENSSL_DIR" openssl))
-             #t)))))
-    (inputs
-     `(("openssl" ,(@ (gnu packages tls) openssl))
-       ("pkg-config" ,(@ (gnu packages pkg-config) pkg-config))))
-    (home-page
-      "https://github.com/sfackler/rust-openssl")
-    (synopsis "FFI bindings to OpenSSL")
-    (description "FFI bindings to OpenSSL")
+    (home-page "https://github.com/reem/rust-modifier")
+    (synopsis
+      "Chaining APIs for both self -> Self and &mut self methods.")
+    (description
+      "Chaining APIs for both self -> Self and &mut self methods.")
     (license license:expat)))
 
-(define-public rust-rand-os
+(define-public rust-native-tls
   (package
-    (name "rust-rand-os")
-    (version "0.2.0")
+    (name "rust-native-tls")
+    (version "0.2.3")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_os" version))
+        (uri (crate-uri "native-tls" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "06is69f8rfzs620g5b54k6cgy5yaycrsyqg55flyfrsf8g88733f"))))
+            "0ki7cj4wzyd2nach4qdjly69sp7rs0yz3n3z2ii4mm1gqajg2bab"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-getrandom" ,rust-getrandom)
-         ("rust-rand-core" ,rust-rand-core))))
-    (home-page "https://crates.io/crates/rand_os")
-    (synopsis "OS backed Random Number Generator")
-    (description "OS backed Random Number Generator")
+        (("rust-lazy-static" ,rust-lazy-static)
+         ("rust-libc" ,rust-libc)
+         ("rust-log" ,rust-log)
+         ("rust-openssl" ,rust-openssl)
+         ("rust-openssl-probe" ,rust-openssl-probe)
+         ("rust-openssl-sys" ,rust-openssl-sys)
+         ("rust-schannel" ,rust-schannel)
+         ("rust-security-framework" ,rust-security-framework)
+         ("rust-security-framework-sys" ,rust-security-framework-sys)
+         ("rust-tempfile" ,rust-tempfile))
+        #:cargo-development-inputs
+        (("rust-hex" ,rust-hex))))
+    (home-page "https://github.com/sfackler/rust-native-tls")
+    (synopsis
+      "An abstraction over platform-specific TLS implementations.")
+    (description
+      "An abstraction over platform-specific TLS implementations.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rand-os-0.1
+(define-public rust-ndarray
   (package
-    (inherit rust-rand-os)
-    (name "rust-rand-os")
-    (version "0.1.3")
+    (name "rust-ndarray")
+    (version "0.12.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_os" version))
+        (uri (crate-uri "ndarray" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0wahppm0s64gkr2vmhcgwc0lij37in1lgfxg5rbgqlz0l5vgcxbv"))))
+          "0a5rfwcbqnvbwi3nw5sfz6kf0flhmjxs64s0b4kxc6lhmyl81wvw"))))
+    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-cloudabi" ,rust-cloudabi)
-        ("rust-fuchsia-cprng" ,rust-fuchsia-cprng)
-        ("rust-getrandom" ,rust-getrandom)
-        ("rust-libc" ,rust-libc)
-        ("rust-log" ,rust-log)
-        ("rust-rand-core" ,rust-rand-core-0.4)
-        ("rust-rdrand" ,rust-rdrand-0.4)
-        ("rust-stdweb" ,rust-stdweb)
-        ("rust-wasm-bindgen" ,rust-wasm-bindgen)
-        ("rust-winapi" ,rust-winapi))))))
+       (("rust-itertools" ,rust-itertools-0.7)
+        ("rust-matrixmultiply" ,rust-matrixmultiply-0.1)
+        ("rust-num-complex" ,rust-num-complex)
+        ("rust-num-traits" ,rust-num-traits)
+        ("rust-blas-src" ,rust-blas-src-0.2)
+        ("rust-cblas-sys" ,rust-cblas-sys)
+        ("rust-rustc-serialize" ,rust-rustc-serialize)
+        ("rust-serde" ,rust-serde))
+       #:cargo-development-inputs
+       (("rust-defmac" ,rust-defmac-0.1)
+        ("rust-quickcheck" ,rust-quickcheck-0.7)
+        ("rust-rawpointer" ,rust-rawpointer))))
+    (home-page "https://github.com/rust-ndarray/ndarray")
+    (synopsis
+      "ndarray implements an n-dimensional container for general elements and for numerics.")
+    (description
+      "ndarray implements an n-dimensional container for general elements and for numerics.")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-packed-simd
+(define-public rust-net2
   (package
-    (name "rust-packed-simd")
-    (version "0.3.3")
+    (name "rust-net2")
+    (version "0.2.33")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "packed_simd" version))
+        (uri (crate-uri "net2" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0822wqf6kzw4ig9ykndg348w2bxkhs3x64brzsvdxh2a1pyajpm8"))))
+            "126g3fgfxp06zimc1l9iyxnn9cif1hjsg7sd81nlls5nnyghsma2"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
         (("rust-cfg-if" ,rust-cfg-if)
-         ("rust-core-arch" ,rust-core-arch)
-         ("rust-sleef-sys" ,rust-sleef-sys))
-        #:cargo-development-inputs
-        (("rust-arrayvec" ,rust-arrayvec)
-         ("rust-paste" ,rust-paste)
-         ("rust-wasm-bindgen" ,rust-wasm-bindgen)
-         ("rust-wasm-bindgen-test"
-          ,rust-wasm-bindgen-test))))
+         ("rust-libc" ,rust-libc)
+         ("rust-winapi" ,rust-winapi))))
     (home-page
-      "https://github.com/rust-lang-nursery/packed_simd")
-    (synopsis "Portable Packed SIMD vectors")
-    (description "Portable Packed SIMD vectors")
+      "https://github.com/rust-lang-nursery/net2-rs")
+    (synopsis
+      "Extensions to the standard library's networking types as proposed in RFC 1158.")
+    (description
+      "Extensions to the standard library's networking types as proposed in RFC 1158.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-parking-lot
+(define-public rust-netlib-src
   (package
-    (name "rust-parking-lot")
-    (version "0.9.0")
+    (name "rust-netlib-src")
+    (version "0.7.4")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "parking_lot" version))
+        (uri (crate-uri "netlib-src" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0lk2vq3hp88ygpgsrypdr3ss71fidnqbykva0csgxhmn5scb2hpq"))))
+            "112hwfw1zzdj10h3j213xxqjrq38iygb3nb3ijay65ycmrg819s4"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-lock-api" ,rust-lock-api)
-         ("rust-parking-lot-core" ,rust-parking-lot-core))
-        #:cargo-development-inputs
-        (("rust-bincode" ,rust-bincode)
-         ("rust-lazy-static" ,rust-lazy-static)
-         ("rust-rand" ,rust-rand)
-         ("rust-rustc-version" ,rust-rustc-version))))
-    (home-page
-      "https://github.com/Amanieu/parking_lot")
+      `(#:cargo-development-inputs
+        (("rust-cmake" ,rust-cmake)
+         ("rust-libc" ,rust-libc))))
+    (home-page "https://github.com/cmr/netlib-src")
     (synopsis
-      "More compact and efficient implementations of the standard synchronization primitives.")
+      "The package provides a source of BLAS and LAPACK via Netlib.")
     (description
-      "More compact and efficient implementations of the standard synchronization primitives.")
+      "The package provides a source of BLAS and LAPACK via Netlib.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-parking-lot-core
+(define-public rust-no-panic
   (package
-    (name "rust-parking-lot-core")
-    (version "0.6.2")
+    (name "rust-no-panic")
+    (version "0.1.10")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "parking_lot_core" version))
+        (uri (crate-uri "no-panic" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0ay67dpnrn68ryyvp720m9i8hzp189fd4d6slrs1lvmcwywv2xmq"))))
+            "089gmyxg7kviimqn5nmghm5kngnmi77a0c6fbv0j67jxx7pjhq3r"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-backtrace" ,rust-backtrace)
-         ("rust-cfg-if" ,rust-cfg-if)
-         ("rust-cloudabi" ,rust-cloudabi)
-         ("rust-libc" ,rust-libc)
-         ("rust-petgraph" ,rust-petgraph)
-         ("rust-redox-syscall" ,rust-redox-syscall)
-         ("rust-smallvec" ,rust-smallvec)
-         ("rust-thread-id" ,rust-thread-id)
-         ("rust-winapi" ,rust-winapi))
+        (("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-syn" ,rust-syn))
         #:cargo-development-inputs
-        (("rust-rustc-version" ,rust-rustc-version))))
-    (home-page
-      "https://github.com/Amanieu/parking_lot")
+        (("rust-tempfile" ,rust-tempfile))))
+    (home-page "https://github.com/dtolnay/no-panic")
     (synopsis
-      "An advanced API for creating custom synchronization primitives.")
+      "Attribute macro to require that the compiler prove a function can't ever panic.")
     (description
-      "An advanced API for creating custom synchronization primitives.")
+      "Attribute macro to require that the compiler prove a function can't ever panic.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-paste
+(define-public rust-nodrop ; guix upstreamable
   (package
-    (name "rust-paste")
-    (version "0.1.5")
+    (name "rust-nodrop")
+    (version "0.1.13")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "paste" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "nodrop" version))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0ygs077hlq8qlx5y46sfgrmhlqqgkmvvhn4x3y10arawalf4ljhz"))))
+         (base32
+          "0if9ifn6rvar5jirx4b3qh4sl5kjkmcifycvzhxa9j3crkfng5ig"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-paste-impl" ,rust-paste-impl)
-         ("rust-proc-macro-hack" ,rust-proc-macro-hack))))
-    (home-page "https://github.com/dtolnay/paste")
-    (synopsis
-      "Macros for all your token pasting needs")
-    (description
-      "Macros for all your token pasting needs")
+     `(#:cargo-inputs
+       (("rust-nodrop-union" ,rust-nodrop-union))))
+    (home-page "https://github.com/bluss/arrayvec")
+    (synopsis "Wrapper type to inhibit drop (destructor)")
+    (description "This package provides a wrapper type to inhibit drop
+(destructor).  Use @code{std::mem::ManuallyDrop} instead!")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-paste-impl
+(define-public rust-nodrop-union ; guix upstreamable
   (package
-    (name "rust-paste-impl")
-    (version "0.1.5")
+    (name "rust-nodrop-union")
+    (version "0.1.10")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "paste-impl" version))
+        (uri (crate-uri "nodrop-union" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0jsnkdn9l8jlmb9h4wssi76sxnyxwnyi00p6y1p2gdq7c1gdw2b7"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/bluss/arrayvec")
+    (synopsis "Wrapper type to inhibit drop (destructor)")
+    (description "This package provides a wrapper type to inhibit drop
+(destructor).  Implementation crate for nodrop, the untagged unions
+implementation (which is unstable / requires nightly).")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-nom
+  (package
+    (name "rust-nom")
+    (version "5.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "nom" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1rkh8nixmb7r1y0mjnsz62p6r1bqah5ciri7bwhmgcmq4gk9drr6"))))
+            "06snml9wfrvk8k71l4md6gg29jgj4pa8wzsg180q3qr0jf2isxp9"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-proc-macro-hack" ,rust-proc-macro-hack)
-         ("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote)
-         ("rust-syn" ,rust-syn))))
-    (home-page "https://github.com/dtolnay/paste")
+        (("rust-lazy-static" ,rust-lazy-static)
+         ("rust-lexical-core" ,rust-lexical-core)
+         ("rust-memchr" ,rust-memchr)
+         ("rust-regex" ,rust-regex))
+        #:cargo-development-inputs
+        (("rust-criterion" ,rust-criterion)
+         ("rust-doc-comment" ,rust-doc-comment)
+         ("rust-jemallocator" ,rust-jemallocator)
+         ("rust-version-check" ,rust-version-check))))
+    (home-page "https://github.com/Geal/nom")
     (synopsis
-      "Implementation detail of the `paste` crate")
+      "A byte-oriented, zero-copy, parser combinators library")
     (description
-      "Implementation detail of the `paste` crate")
-    (license (list license:asl2.0
-                   license:expat))))
+      "This package provides a byte-oriented, zero-copy, parser combinators library")
+    (license license:expat)))
 
-(define-public rust-pest
+(define-public rust-num-complex
   (package
-    (name "rust-pest")
-    (version "2.1.1")
+    (name "rust-num-complex")
+    (version "0.2.3")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "pest" version))
+        (uri (crate-uri "num-complex" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "134686mwxm73asbiads53zfchqvvcrsrsyax2cghfcizmvg8ac4k"))))
+            "1z6zjdzx1g1hj4y132ddy83d3p3zvw06igbf59npxxrzzcqwzc7w"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-serde" ,rust-serde)
-         ("rust-serde-json" ,rust-serde-json)
-         ("rust-ucd-trie" ,rust-ucd-trie))))
-    (home-page "https://pest-parser.github.io/")
-    (synopsis "The Elegant Parser")
-    (description "The Elegant Parser")
+        (("rust-num-traits" ,rust-num-traits)
+         ("rust-rand" ,rust-rand)
+         ("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-autocfg" ,rust-autocfg))))
+    (home-page
+      "https://github.com/rust-num/num-complex")
+    (synopsis
+      "Complex numbers implementation for Rust")
+    (description
+      "Complex numbers implementation for Rust")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-pest-derive
+(define-public rust-num-cpus
   (package
-    (name "rust-pest-derive")
-    (version "2.1.0")
+    (name "rust-num-cpus")
+    (version "1.10.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "pest_derive" version))
+        (uri (crate-uri "num_cpus" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1l5jfa6ril71cw5nsiw0r45br54dd8cj2r1nc2d1wq6wb3jilgc3"))))
+            "0wrj3zvj6h3q26sqj9zxpd59frjb54n7jhjwf307clq31ic47vxw"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-pest" ,rust-pest)
-         ("rust-pest-generator" ,rust-pest-generator))))
-    (home-page "https://pest-parser.github.io/")
-    (synopsis "pest's derive macro")
-    (description "pest's derive macro")
+        (("rust-libc" ,rust-libc))
+        #:cargo-development-inputs
+        (("rust-doc-comment" ,rust-doc-comment))))
+    (home-page
+      "https://github.com/seanmonstar/num_cpus")
+    (synopsis "Get the number of CPUs on a machine.")
+    (description
+      "Get the number of CPUs on a machine.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-pest-generator
+(define-public rust-num-iter
   (package
-    (name "rust-pest-generator")
-    (version "2.1.0")
+    (name "rust-num-iter")
+    (version "0.1.39")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "pest_generator" version))
+        (uri (crate-uri "num-iter" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0ipnv77lqhj4d4fpfxi8m168lcjp482kszaknlardmpgqiv0a4k3"))))
+            "0bhk2qbr3261r6zvfc58lz4spfqjhvdripxgz5mks5rd85r55gbn"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-pest" ,rust-pest)
-         ("rust-pest-meta" ,rust-pest-meta)
-         ("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote)
-         ("rust-syn" ,rust-syn))))
-    (home-page "https://pest-parser.github.io/")
-    (synopsis "pest code generator")
-    (description "pest code generator")
+        (("rust-num-integer" ,rust-num-integer)
+         ("rust-num-traits" ,rust-num-traits))
+        #:cargo-development-inputs
+        (("rust-autocfg" ,rust-autocfg))))
+    (home-page
+      "https://github.com/rust-num/num-iter")
+    (synopsis
+      "External iterators for generic mathematics")
+    (description
+      "External iterators for generic mathematics")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-pest-meta
+(define-public rust-object
   (package
-    (name "rust-pest-meta")
-    (version "2.1.1")
+    (name "rust-object")
+    (version "0.13.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "pest_meta" version))
+        (uri (crate-uri "object" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0kaprdz3jis9bjfwhri1zncbsvack5m3gx2g5flspdy7wxnyljgj"))))
+            "05gfh6da1aavksxxq52hpzy40yiqpwzra8lfk7pcc45qqrdw97nq"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-maplit" ,rust-maplit)
-        ("rust-pest" ,rust-pest)
-        ("rust-sha-1" ,rust-sha-1))))
-    (home-page "https://pest-parser.github.io/")
-    (synopsis "pest meta language parser and validator")
+      `(#:cargo-inputs
+        (("rust-goblin" ,rust-goblin)
+         ("rust-scroll" ,rust-scroll)
+         ("rust-target-lexicon" ,rust-target-lexicon)
+         ("rust-uuid" ,rust-uuid)
+         ("rust-crc32fast" ,rust-crc32fast)
+         ("rust-flate2" ,rust-flate2)
+         ("rust-indexmap" ,rust-indexmap)
+         ("rust-parity-wasm" ,rust-parity-wasm))
+        #:cargo-development-inputs
+        (("rust-memmap" ,rust-memmap))))
+    (home-page "https://github.com/gimli-rs/object")
+    (synopsis
+      "A unified interface for parsing object file formats.")
     (description
-      "pest meta language parser and validator")
+      "A unified interface for parsing object file formats.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-pkg-config
+(define-public rust-odds
   (package
-    (name "rust-pkg-config")
-    (version "0.3.14")
+    (name "rust-odds")
+    (version "0.3.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "pkg-config" version))
+        (uri (crate-uri "odds" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "135ia995lqzr0gxpk85h0bjxf82kj6hbxdx924sh9jdln6r8wvk7"))))
+            "0rdnxa0na4897yb0svb3figz35g4imxjv61yfm2j21gbh5q8v8d9"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-development-inputs
-       (("rust-lazy-static" ,rust-lazy-static))))
-    (inputs
-     `(("pkg-config" ,(@ (gnu packages pkg-config) pkg-config))))
+      `(#:cargo-inputs
+        (("rust-rawpointer" ,rust-rawpointer)
+         ("rust-rawslice" ,rust-rawslice)
+         ("rust-unchecked-index" ,rust-unchecked-index))
+        #:cargo-development-inputs
+        (("rust-itertools" ,rust-itertools)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-memchr" ,rust-memchr)
+         ("rust-quickcheck" ,rust-quickcheck))))
     (home-page
-      "https://github.com/alexcrichton/pkg-config-rs")
+      "https://github.com/bluss/odds")
     (synopsis
-      "A library to run the pkg-config system tool at build time in order to be used in Cargo build scripts.")
+      "Odds and ends")
     (description
-      "A library to run the pkg-config system tool at build time in order to be used in Cargo build scripts.")
+      "Odds and ends  collection miscellania. Extra functionality for slices (`.find()`, `RevSlice`), strings and other things. Things in odds may move to more appropriate crates if we find them.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-proc-macro-nested ; guix upstreamable
+(define-public rust-openblas-src
   (package
-    (name "rust-proc-macro-nested")
-    (version "0.1.3")
+    (name "rust-openblas-src")
+    (version "0.7.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "proc-macro-nested" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "openblas-src" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "0bmlksm8vl44wkwihmwr7jsjznhbg0n7aibcw1cs2jgjcp86x6in"))))
+          (base32
+            "1dyf7yh6rmkk7k3pgcp5p8248f08hhajkigw42bfwjw1d3jk6d8b"))))
     (build-system cargo-build-system)
-    (home-page "https://github.com/dtolnay/proc-macro-hack")
-    (synopsis "Support for nested proc-macro-hack invocations")
-    (description "This crate provides support for nested proc-macro-hack
-invocations.")
+    (arguments
+      `(#:cargo-development-inputs
+        (("rust-libc" ,rust-libc))))
+    (home-page
+      "https://github.com/blas-lapack-rs/openblas-src")
+    (synopsis
+      "The package provides a source of BLAS and LAPACK via OpenBLAS.")
+    (description
+      "The package provides a source of BLAS and LAPACK via OpenBLAS.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-proptest
+(define-public rust-openssl
   (package
-    (name "rust-proptest")
-    (version "0.9.4")
+    (name "rust-openssl")
+    (version "0.10.24")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "proptest" version))
+        (uri (crate-uri "openssl" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "17sjg8isas4qk85807c4panih9k0lwa4k1mbajhciw5c5q17w56g"))))
+            "05dg25rmg17rl3ykfl2yf69ghfd5z6zf6di38qw1awjvkddbnll1"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-bit-set" ,rust-bit-set)
-         ("rust-bitflags" ,rust-bitflags)
-         ("rust-byteorder" ,rust-byteorder)
+        (("rust-bitflags" ,rust-bitflags)
+         ("rust-cfg-if" ,rust-cfg-if)
+         ("rust-foreign-types" ,rust-foreign-types)
          ("rust-lazy-static" ,rust-lazy-static)
-         ("rust-num-traits" ,rust-num-traits)
-         ("rust-quick-error" ,rust-quick-error)
-         ("rust-rand" ,rust-rand)
-         ("rust-rand-chacha" ,rust-rand-chacha)
-         ("rust-rand-xorshift" ,rust-rand-xorshift)
-         ("rust-regex-syntax" ,rust-regex-syntax)
-         ("rust-rusty-fork" ,rust-rusty-fork)
-         ("rust-tempfile" ,rust-tempfile))
+         ("rust-libc" ,rust-libc)
+         ("rust-openssl-sys" ,rust-openssl-sys))
         #:cargo-development-inputs
-        (("rust-regex" ,rust-regex))))
-    (home-page
-      "https://altsysrq.github.io/proptest-book/proptest/index.html")
-    (synopsis
-      "Hypothesis-like property-based testing and shrinking.")
-    (description
-      "Hypothesis-like property-based testing and shrinking.")
-    (license (list license:asl2.0
-                   license:expat))))
+        (("rust-hex" ,rust-hex)
+         ("rust-tempdir" ,rust-tempdir))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'find-openssl
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((openssl (assoc-ref inputs "openssl")))
+               (setenv "OPENSSL_DIR" openssl))
+             #t)))))
+    (inputs
+     `(("openssl" ,(@ (gnu packages tls) openssl))))
+    (home-page
+      "https://github.com/sfackler/rust-openssl")
+    (synopsis "OpenSSL bindings")
+    (description "OpenSSL bindings")
+    (license license:asl2.0)))
 
-(define-public rust-proc-macro-hack
+(define-public rust-openssl-probe
   (package
-    (name "rust-proc-macro-hack")
-    (version "0.5.8")
+    (name "rust-openssl-probe")
+    (version "0.1.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "proc-macro-hack" version))
+        (uri (crate-uri "openssl-probe" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0y2ix90qdvsfks4j1g5qnpyzaa6a4j6sdi35klqvm120378kaalq"))))
+            "1pijrdifgsdwd45b08c2g0dsmnhz7c3kmagb70839ngrd7d29bvp"))))
     (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote)
-         ("rust-syn" ,rust-syn))
-        #:cargo-development-inputs
-        (("rust-demo-hack" ,rust-demo-hack)
-         ("rust-demo-hack-impl" ,rust-demo-hack-impl))))
     (home-page
-      "https://github.com/dtolnay/proc-macro-hack")
+      "https://github.com/alexcrichton/openssl-probe")
     (synopsis
-      "Procedural functionlike!() macros using only Macros 1.1")
+      "Tool for helping to find SSL certificate locations on the system for OpenSSL")
     (description
-      "Procedural functionlike!() macros using only Macros 1.1")
+      "Tool for helping to find SSL certificate locations on the system for OpenSSL")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-proc-macro-hack-0.4
+(define-public rust-openssl-src
   (package
-    (inherit rust-proc-macro-hack)
-    (name "rust-proc-macro-hack")
-    (version "0.4.2")
+    (name "rust-openssl-src")
+    (version "111.4.0+1.1.1c")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "proc-macro-hack" version))
+        (uri (crate-uri "openssl-src" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0fxn3qfhw76c518dfal2qqjwj5dbf0a1f7z0r5c4wd0igygg4fs6"))))
+            "10s3hvkfk6bi4ba1ssvj914rjs31vs8plssy4kbvsa0w7idkqfkq"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-proc-macro-hack-impl" ,rust-proc-macro-hack-impl))
-        #:cargo-development-inputs
-        (("rust-demo-hack" ,rust-demo-hack)
-         ("rust-demo-hack-impl" ,rust-demo-hack-impl))))))
+      `(#:cargo-inputs (("rust-cc" ,rust-cc))))
+    (home-page
+      "https://github.com/alexcrichton/openssl-src-rs")
+    (synopsis
+      "Source of OpenSSL and logic to build it.")
+    (description
+      "Source of OpenSSL and logic to build it.")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-pulldown-cmark
+(define-public rust-openssl-sys
   (package
-    (name "rust-pulldown-cmark")
-    (version "0.5.3")
+    (name "rust-openssl-sys")
+    (version "0.9.48")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "pulldown-cmark" version))
+        (uri (crate-uri "openssl-sys" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0mq3cgjwxlrv0p1svjg93m1jkybzyfrl9p0jwa76hx1352hks13p"))))
+            "1f05kxx8mai9ac16x1lk0404bymghbbj7vcbqrfwqfr52w131fmm"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-bitflags" ,rust-bitflags)
-         ("rust-getopts" ,rust-getopts)
-         ("rust-memchr" ,rust-memchr)
-         ("rust-unicase" ,rust-unicase))
-        #:cargo-development-inputs
-        (("rust-criterion" ,rust-criterion)
-         ("rust-html5ever" ,rust-html5ever)
-         ("rust-lazy-static" ,rust-lazy-static)
-         ("rust-regex" ,rust-regex)
-         ("rust-tendril" ,rust-tendril))))
+     `(#:cargo-inputs
+       (("rust-autocfg" ,rust-autocfg)
+        ("rust-libc" ,rust-libc))
+       #:cargo-development-inputs
+       (("rust-autocfg" ,rust-autocfg)
+        ("rust-cc" ,rust-cc)
+        ("rust-openssl-src" ,rust-openssl-src)
+        ("rust-pkg-config" ,rust-pkg-config)
+        ("rust-vcpkg" ,rust-vcpkg))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'find-openssl
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((openssl (assoc-ref inputs "openssl")))
+               (setenv "OPENSSL_DIR" openssl))
+             #t)))))
+    (inputs
+     `(("openssl" ,(@ (gnu packages tls) openssl))
+       ("pkg-config" ,(@ (gnu packages pkg-config) pkg-config))))
     (home-page
-      "https://github.com/raphlinus/pulldown-cmark")
-    (synopsis "A pull parser for CommonMark")
-    (description
-      "This package provides a pull parser for CommonMark")
+      "https://github.com/sfackler/rust-openssl")
+    (synopsis "FFI bindings to OpenSSL")
+    (description "FFI bindings to OpenSSL")
     (license license:expat)))
 
-(define-public rust-quantiles
+(define-public rust-ordermap
   (package
-    (name "rust-quantiles")
-    (version "0.7.1")
+    (name "rust-ordermap")
+    (version "0.4.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "quantiles" version))
+        (uri (crate-uri "ordermap" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1wjp16a3d4bmldq9w2wds0q4gjz4mnsqac3g38r6ryr6zc9sh3y1"))))
+            "1m0vxmlm1x92m1ydgpddzg5mrfk3ddy8gk3r9dmpml18qrs9ch4i"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-serde" ,rust-serde)
-         ("rust-serde-derive" ,rust-serde-derive))
-        #:cargo-development-inputs
-        (("rust-quickcheck" ,rust-quickcheck))))
-    (home-page
-      "https://github.com/postmates/quantiles")
+     `(#:cargo-inputs
+       (("rust-serde" ,rust-serde))
+       #:cargo-development-inputs
+       (("rust-fnv" ,rust-fnv)
+        ("rust-itertools" ,rust-itertools)
+        ("rust-lazy-static" ,rust-lazy-static)
+        ("rust-quickcheck" ,rust-quickcheck)
+        ("rust-rand" ,rust-rand-0.4)
+        ("rust-serde-test" ,rust-serde-test))))
+    (home-page "https://github.com/bluss/ordermap")
     (synopsis
-      "a collection of approximate quantile algorithms")
+      "A hash table with consistent order and fast iteration. NOTE: This crate was renamed to indexmap. Please use it under its new name.")
     (description
-      "a collection of approximate quantile algorithms")
-    (license license:expat)))
+      "A hash table with consistent order and fast iteration. NOTE: This crate was renamed to indexmap. Please use it under its new name.")
+    (properties `((superseded . ,rust-indexmap)))
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-quickcheck
+(define-public rust-owning-ref
   (package
-    (name "rust-quickcheck")
-    (version "0.8.5")
+    (name "rust-owning-ref")
+    (version "0.4.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "quickcheck" version))
+        (uri (crate-uri "owning_ref" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0mkl4wnvvjk4m32aq3an4ayfyvnmbxnzcybfm7n3fbsndb1xjdcw"))))
+            "04zgwy77lin8qz398s6g44467pd6kjhbrlqifkia5rkr47mbi929"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-env-logger" ,rust-env-logger)
-         ("rust-log" ,rust-log)
-         ("rust-rand" ,rust-rand-0.6)
-         ("rust-rand-core" ,rust-rand-core))))
+        (("rust-stable-deref-trait" ,rust-stable-deref-trait))))
     (home-page
-      "https://github.com/BurntSushi/quickcheck")
+      "https://github.com/Kimundi/owning-ref-rs")
     (synopsis
-      "Automatic property based testing with shrinking.")
+      "A library for creating references that carry their owner with them.")
     (description
-      "Automatic property based testing with shrinking.")
-    (license (list license:unlicense
-                   license:expat))))
+      "A library for creating references that carry their owner with them.")
+    (license license:expat)))
 
-(define-public rust-rand
+(define-public rust-rand-os
   (package
-    (name "rust-rand")
-    (version "0.7.0")
+    (name "rust-rand-os")
+    (version "0.2.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "rand_os" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "0b05gwx8nnxr9bydyjxd1rszdvqnm946ky15z103ssfrhc7anznl"))))
+          (base32
+            "06is69f8rfzs620g5b54k6cgy5yaycrsyqg55flyfrsf8g88733f"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-getrandom" ,rust-getrandom)
-        ("rust-libc" ,rust-libc)
-        ("rust-log" ,rust-log)
-        ("rust-packed-simd" ,rust-packed-simd)
-        ("rust-rand-chacha" ,rust-rand-chacha)
-        ("rust-rand-core" ,rust-rand-core)
-        ("rust-rand-hc" ,rust-rand-hc)
-        ("rust-rand-pcg" ,rust-rand-pcg))
-       #:cargo-development-inputs
-       (("rust-rand-hc" ,rust-rand-hc)
-        ("rust-rand-isaac" ,rust-rand-isaac)
-        ("rust-rand-pcg" ,rust-rand-pcg)
-        ("rust-rand-xorshift" ,rust-rand-xorshift)
-        ("rust-rand-xoshiro" ,rust-rand-xoshiro))))
-    (home-page "https://crates.io/crates/rand")
-    (synopsis
-      "Random number generators and other randomness functionality.")
-    (description
-      "Random number generators and other randomness functionality.")
+      `(#:cargo-inputs
+        (("rust-getrandom" ,rust-getrandom)
+         ("rust-rand-core" ,rust-rand-core))))
+    (home-page "https://crates.io/crates/rand_os")
+    (synopsis "OS backed Random Number Generator")
+    (description "OS backed Random Number Generator")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rand-0.6
+(define-public rust-rand-os-0.1
   (package
-    (inherit rust-rand)
-    (name "rust-rand")
-    (version "0.6.5")
+    (inherit rust-rand-os)
+    (name "rust-rand-os")
+    (version "0.1.3")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand" version))
+        (uri (crate-uri "rand_os" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1jl4449jcl4wgmzld6ffwqj5gwxrp8zvx8w573g1z368qg6xlwbd"))))
+          "0wahppm0s64gkr2vmhcgwc0lij37in1lgfxg5rbgqlz0l5vgcxbv"))))
     (arguments
      `(#:cargo-inputs
-       (("rust-autocfg" ,rust-autocfg)
+       (("rust-cloudabi" ,rust-cloudabi)
+        ("rust-fuchsia-cprng" ,rust-fuchsia-cprng)
+        ("rust-getrandom" ,rust-getrandom)
         ("rust-libc" ,rust-libc)
         ("rust-log" ,rust-log)
-        ("rust-packed-simd" ,rust-packed-simd)
-        ("rust-rand-chacha" ,rust-rand-chacha-0.1)
         ("rust-rand-core" ,rust-rand-core-0.4)
-        ("rust-rand-hc" ,rust-rand-hc-0.1)
-        ("rust-rand-isaac" ,rust-rand-isaac-0.1)
-        ("rust-rand-jitter" ,rust-rand-jitter-0.1)
-        ("rust-rand-os" ,rust-rand-os-0.1)
-        ("rust-rand-pcg" ,rust-rand-pcg-0.1)
-        ("rust-rand-xorshift" ,rust-rand-xorshift-0.1)
-        ("rust-winapi" ,rust-winapi))
-       #:cargo-development-inputs
-       (("rust-average" ,rust-average-0.9)
-        ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.1))))))
+        ("rust-rdrand" ,rust-rdrand-0.4)
+        ("rust-stdweb" ,rust-stdweb)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen)
+        ("rust-winapi" ,rust-winapi))))))
 
-(define-public rust-rand-0.5
+(define-public rust-rawpointer
   (package
-    (inherit rust-rand)
-    (name "rust-rand")
-    (version "0.5.6")
+    (name "rust-rawpointer")
+    (version "0.1.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand" version))
+        (uri (crate-uri "rawpointer" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1fdcgja9167hlzkf4g5daqwp498lwiyq7aqm05whklpbsdyc8666"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cloudabi" ,rust-cloudabi)
-        ("rust-fuchsia-cprng" ,rust-fuchsia-cprng)
-        ("rust-libc" ,rust-libc)
-        ("rust-log" ,rust-log)
-        ("rust-rand-core" ,rust-rand-core-0.3)
-        ("rust-serde" ,rust-serde)
-        ("rust-serde-derive" ,rust-serde-derive)
-        ("rust-stdweb" ,rust-stdweb)
-        ("rust-winapi" ,rust-winapi))
-       #:cargo-development-inputs
-       (("rust-bincode" ,rust-bincode))))))
+          "06ghpm9y7gacks78s3maakha07kbnwrxif5q37r2l7z1sali3b7b"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/bluss/rawpointer/")
+    (synopsis "Extra methods for raw pointers. For example `.post_inc()` and `.pre_dec()` (c.f. `ptr++` and `--ptr`) and `ptrdistance`.")
+    (description "Extra methods for raw pointers. For example `.post_inc()` and `.pre_dec()` (c.f. `ptr++` and `--ptr`) and `ptrdistance`.")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-rand-0.4
+(define-public rust-rspec
   (package
-    (inherit rust-rand)
-    (name "rust-rand")
-    (version "0.4.6")
+    (name "rust-rspec")
+    (version "1.0.0-beta.4")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "rspec" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "14qjfv3gggzhnma20k0sc1jf8y6pplsaq7n1j9ls5c8kf2wl0a2m"))))
+          (base32
+            "1abfzwkbxlwahb243k8d3fp6i135lx1aqmbfl79w9zlpng182ndk"))))
+    (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-fuchsia-cprng" ,rust-fuchsia-cprng)
-        ("rust-libc" ,rust-libc)
-        ("rust-rand-core" ,rust-rand-core-0.3)
-        ("rust-rdrand" ,rust-rdrand-0.4)
-        ("rust-winapi" ,rust-winapi))))))
-
-(define-public rust-rand-0.3
-  (package
-    (inherit rust-rand)
-    (name "rust-rand")
-    (version "0.3.23")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "rand" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0v679h38pjjqj5h4md7v2slsvj6686qgcn7p9fbw3h43iwnk1b34"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc)
-        ("rust-rand" ,rust-rand-0.4))))))
+      `(#:cargo-inputs
+        (("rust-colored" ,rust-colored)
+         ("rust-derive-new" ,rust-derive-new)
+         ("rust-derive-builder" ,rust-derive-builder)
+         ("rust-expectest" ,rust-expectest)
+         ("rust-rayon" ,rust-rayon))
+        #:cargo-development-inputs
+        (("rust-clippy" ,rust-clippy))))
+    (home-page "https://mackwic.github.io/rspec")
+    (synopsis
+      "Write Rspec-like tests with stable rust")
+    (description
+      "Write Rspec-like tests with stable rust")
+    (license license:mpl2.0)))
 
-(define-public rust-rand-chacha
+(define-public rust-packed-simd
   (package
-    (name "rust-rand-chacha")
-    (version "0.2.0")
+    (name "rust-packed-simd")
+    (version "0.3.3")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_chacha" version))
+        (uri (crate-uri "packed_simd" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "178d36jfkc4v95s25scc2vibj2hd2hlk64cs6id4hvzg89whd4z1"))))
+            "0822wqf6kzw4ig9ykndg348w2bxkhs3x64brzsvdxh2a1pyajpm8"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-c2-chacha" ,rust-c2-chacha)
-         ("rust-rand-core" ,rust-rand-core))
+        (("rust-cfg-if" ,rust-cfg-if)
+         ("rust-core-arch" ,rust-core-arch)
+         ("rust-sleef-sys" ,rust-sleef-sys))
         #:cargo-development-inputs
-        (("rust-autocfg" ,rust-autocfg))))
+        (("rust-arrayvec" ,rust-arrayvec)
+         ("rust-paste" ,rust-paste)
+         ("rust-wasm-bindgen" ,rust-wasm-bindgen)
+         ("rust-wasm-bindgen-test"
+          ,rust-wasm-bindgen-test))))
     (home-page
-      "https://crates.io/crates/rand_chacha")
-    (synopsis "ChaCha random number generator")
-    (description "ChaCha random number generator")
+      "https://github.com/rust-lang-nursery/packed_simd")
+    (synopsis "Portable Packed SIMD vectors")
+    (description "Portable Packed SIMD vectors")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rand-chacha-0.1
+(define-public rust-parity-wasm
   (package
-    (inherit rust-rand-chacha)
-    (name "rust-rand-chacha")
-    (version "0.1.1")
+    (name "rust-parity-wasm")
+    (version "0.40.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_chacha" version))
+        (uri (crate-uri "parity-wasm" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1vxwyzs4fy1ffjc8l00fsyygpiss135irjf7nyxgq2v0lqf3lvam"))))
+            "0sp1nv5yjw2wpg2j7mjq3mhqqjqb85wmbxrgk27q2zvw7ddqmrky"))))
+    (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-autocfg" ,rust-autocfg)
-         ("rust-rand-core" ,rust-rand-core-0.3))))))
+      `(#:cargo-development-inputs
+        (("rust-time" ,rust-time))))
+    (home-page
+      "https://github.com/paritytech/parity-wasm")
+    (synopsis
+      "WebAssembly binary format serialization/deserialization/interpreter")
+    (description
+      "WebAssembly binary format serialization/deserialization/interpreter")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-rand-core
+(define-public rust-parking-lot
   (package
-    (name "rust-rand-core")
-    (version "0.5.0")
+    (name "rust-parking-lot")
+    (version "0.9.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_core" version))
+        (uri (crate-uri "parking_lot" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1jis94x9ri8xlxki2w2w5k29sjpfwgzkjylg7paganp74hrnhpk1"))))
+            "0lk2vq3hp88ygpgsrypdr3ss71fidnqbykva0csgxhmn5scb2hpq"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-getrandom" ,rust-getrandom)
-         ("rust-serde" ,rust-serde)
-         ("rust-serde-derive" ,rust-serde-derive))))
-    (home-page "https://crates.io/crates/rand_core")
+        (("rust-lock-api" ,rust-lock-api)
+         ("rust-parking-lot-core" ,rust-parking-lot-core))
+        #:cargo-development-inputs
+        (("rust-bincode" ,rust-bincode)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-rand" ,rust-rand)
+         ("rust-rustc-version" ,rust-rustc-version))))
+    (home-page
+      "https://github.com/Amanieu/parking_lot")
     (synopsis
-      "Core random number generator traits and tools for implementation.")
+      "More compact and efficient implementations of the standard synchronization primitives.")
     (description
-      "Core random number generator traits and tools for implementation.")
+      "More compact and efficient implementations of the standard synchronization primitives.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rand-core-0.4
+(define-public rust-parking-lot-core
   (package
-    (inherit rust-rand-core)
-    (name "rust-rand-core")
-    (version "0.4.0")
+    (name "rust-parking-lot-core")
+    (version "0.6.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_core" version))
+        (uri (crate-uri "parking_lot_core" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "1h3dbrhi5qgflqnzzd86s48v1dn1l17bmdssi5q170whsm4sbryh"))))
+          (base32
+            "0ay67dpnrn68ryyvp720m9i8hzp189fd4d6slrs1lvmcwywv2xmq"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-serde" ,rust-serde)
-        ("rust-serde-derive" ,rust-serde-derive))))))
+      `(#:cargo-inputs
+        (("rust-backtrace" ,rust-backtrace)
+         ("rust-cfg-if" ,rust-cfg-if)
+         ("rust-cloudabi" ,rust-cloudabi)
+         ("rust-libc" ,rust-libc)
+         ("rust-petgraph" ,rust-petgraph)
+         ("rust-redox-syscall" ,rust-redox-syscall)
+         ("rust-smallvec" ,rust-smallvec)
+         ("rust-thread-id" ,rust-thread-id)
+         ("rust-winapi" ,rust-winapi))
+        #:cargo-development-inputs
+        (("rust-rustc-version" ,rust-rustc-version))))
+    (home-page
+      "https://github.com/Amanieu/parking_lot")
+    (synopsis
+      "An advanced API for creating custom synchronization primitives.")
+    (description
+      "An advanced API for creating custom synchronization primitives.")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-rand-core-0.3
+(define-public rust-paste
   (package
-    (inherit rust-rand-core)
-    (name "rust-rand-core")
-    (version "0.3.1")
+    (name "rust-paste")
+    (version "0.1.5")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_core" version))
+        (uri (crate-uri "paste" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "0jzdgszfa4bliigiy4hi66k7fs3gfwi2qxn8vik84ph77fwdwvvs"))))
+          (base32
+            "0ygs077hlq8qlx5y46sfgrmhlqqgkmvvhn4x3y10arawalf4ljhz"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-rand-core" ,rust-rand-core-0.4))))))
+      `(#:cargo-inputs
+        (("rust-paste-impl" ,rust-paste-impl)
+         ("rust-proc-macro-hack" ,rust-proc-macro-hack))))
+    (home-page "https://github.com/dtolnay/paste")
+    (synopsis
+      "Macros for all your token pasting needs")
+    (description
+      "Macros for all your token pasting needs")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-rand-distr
+(define-public rust-paste-impl
   (package
-    (name "rust-rand-distr")
-    (version "0.2.1")
+    (name "rust-paste-impl")
+    (version "0.1.5")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_distr" version))
+        (uri (crate-uri "paste-impl" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "08drhcw9k4a79pri3rd1vkv7v9cbm6cf4i342nai39f527c58zn3"))))
+            "1rkh8nixmb7r1y0mjnsz62p6r1bqah5ciri7bwhmgcmq4gk9drr6"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-rand" ,rust-rand))
-        #:cargo-development-inputs
-        (("rust-average" ,rust-average)
-         ("rust-rand-pcg" ,rust-rand-pcg))))
-    (home-page "https://crates.io/crates/rand_distr")
+        (("rust-proc-macro-hack" ,rust-proc-macro-hack)
+         ("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-syn" ,rust-syn))))
+    (home-page "https://github.com/dtolnay/paste")
     (synopsis
-      "Sampling from random number distributions")
+      "Implementation detail of the `paste` crate")
     (description
-      "Sampling from random number distributions")
+      "Implementation detail of the `paste` crate")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rand-hc
+(define-public rust-permutohedron
   (package
-    (name "rust-rand-hc")
-    (version "0.2.0")
+    (name "rust-permutohedron")
+    (version "0.2.4")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_hc" version))
+        (uri (crate-uri "permutohedron" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0g31sqwpmsirdlwr0svnacr4dbqyz339im4ssl9738cjgfpjjcfa"))))
+            "0b1pzh48j86v46wxngch6k1kx9cdw3jr3lwa86gd6jd4bmxzz1xn"))))
     (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-rand-core" ,rust-rand-core))))
-    (home-page "https://crates.io/crates/rand_hc")
-    (synopsis "HC128 random number generator")
-    (description "HC128 random number generator")
+    (home-page
+      "https://github.com/bluss/permutohedron")
+    (synopsis
+      "Generate permutations of sequences. Either lexicographical order permutations, or a minimal swaps permutation sequence implemented using Heap's algorithm.")
+    (description
+      "Generate permutations of sequences. Either lexicographical order permutations, or a minimal swaps permutation sequence implemented using Heap's algorithm.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rand-hc-0.1
+(define-public rust-persistent
   (package
-    (inherit rust-rand-hc)
-    (name "rust-rand-hc")
-    (version "0.1.0")
+    (name "rust-persistent")
+    (version "0.4.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_hc" version))
+        (uri (crate-uri "persistent" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1i0vl8q5ddvvy0x8hf1zxny393miyzxkwqnw31ifg6p0gdy6fh3v"))))
+            "1iblxjjzd0h784l5y573nw5z3pdb3330k69hh413agagkh0a13wf"))))
+    (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-rand-core" ,rust-rand-core-0.3))))))
+        (("rust-iron" ,rust-iron)
+         ("rust-plugin" ,rust-plugin))))
+    (home-page "https://github.com/iron/persistent")
+    (synopsis "A set of middleware for sharing server-global data in Iron.")
+    (description "A set of middleware for sharing server-global data in Iron.")
+    (license license:expat)))
 
-(define-public rust-rand-isaac
+(define-public rust-pest
   (package
-    (name "rust-rand-isaac")
-    (version "0.2.0")
+    (name "rust-pest")
+    (version "2.1.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_isaac" version))
+        (uri (crate-uri "pest" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0xlb9415x518ffkazxhvk8b04i9i548nva4i5l5s34crvjrv1xld"))))
+            "134686mwxm73asbiads53zfchqvvcrsrsyax2cghfcizmvg8ac4k"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-rand-core" ,rust-rand-core)
-         ("rust-serde" ,rust-serde))
-        #:cargo-development-inputs
-        (("rust-bincode" ,rust-bincode))))
-    (home-page "https://crates.io/crates/rand_isaac")
-    (synopsis "ISAAC random number generator")
-    (description "ISAAC random number generator")
+        (("rust-serde" ,rust-serde)
+         ("rust-serde-json" ,rust-serde-json)
+         ("rust-ucd-trie" ,rust-ucd-trie))))
+    (home-page "https://pest-parser.github.io/")
+    (synopsis "The Elegant Parser")
+    (description "The Elegant Parser")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rand-isaac-0.1
+(define-public rust-pest-derive
   (package
-    (inherit rust-rand-isaac)
-    (name "rust-rand-isaac")
-    (version "0.1.1")
+    (name "rust-pest-derive")
+    (version "2.1.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_isaac" version))
+        (uri (crate-uri "pest_derive" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "027flpjr4znx2csxk7gxb7vrf9c7y5mydmvg5az2afgisp4rgnfy"))))
+            "1l5jfa6ril71cw5nsiw0r45br54dd8cj2r1nc2d1wq6wb3jilgc3"))))
+    (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-rand-core" ,rust-rand-core-0.3)
-         ("rust-serde" ,rust-serde)
-         ("rust-serde-derive" ,rust-serde-derive))
-        #:cargo-development-inputs
-        (("rust-bincode" ,rust-bincode))))))
+        (("rust-pest" ,rust-pest)
+         ("rust-pest-generator" ,rust-pest-generator))))
+    (home-page "https://pest-parser.github.io/")
+    (synopsis "pest's derive macro")
+    (description "pest's derive macro")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-rand-jitter
+(define-public rust-pest-generator
   (package
-    (name "rust-rand-jitter")
-    (version "0.2.0")
+    (name "rust-pest-generator")
+    (version "2.1.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_jitter" version))
+        (uri (crate-uri "pest_generator" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1mnjbfzj97g788jslz0k77bpsg6qjhz676cibk82ibbvgqp4sy43"))))
+            "0ipnv77lqhj4d4fpfxi8m168lcjp482kszaknlardmpgqiv0a4k3"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-libc" ,rust-libc)
-         ("rust-log" ,rust-log)
-         ("rust-rand-core" ,rust-rand-core)
-         ("rust-winapi" ,rust-winapi))))
-    (home-page "https://github.com/rust-random/rand")
-    (synopsis
-      "Random number generator based on timing jitter")
-    (description
-      "Random number generator based on timing jitter")
+        (("rust-pest" ,rust-pest)
+         ("rust-pest-meta" ,rust-pest-meta)
+         ("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-syn" ,rust-syn))))
+    (home-page "https://pest-parser.github.io/")
+    (synopsis "pest code generator")
+    (description "pest code generator")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rand-jitter-0.1
+(define-public rust-pest-meta
   (package
-    (inherit rust-rand-jitter)
-    (name "rust-rand-jitter")
-    (version "0.1.4")
+    (name "rust-pest-meta")
+    (version "2.1.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_jitter" version))
+        (uri (crate-uri "pest_meta" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "16z387y46bfz3csc42zxbjq89vcr1axqacncvv8qhyy93p4xarhi"))))
+            "0kaprdz3jis9bjfwhri1zncbsvack5m3gx2g5flspdy7wxnyljgj"))))
+    (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-libc" ,rust-libc)
-         ("rust-log" ,rust-log)
-         ("rust-rand-core" ,rust-rand-core-0.4)
-         ("rust-winapi" ,rust-winapi))))))
+     `(#:cargo-inputs
+       (("rust-maplit" ,rust-maplit)
+        ("rust-pest" ,rust-pest)
+        ("rust-sha-1" ,rust-sha-1))))
+    (home-page "https://pest-parser.github.io/")
+    (synopsis "pest meta language parser and validator")
+    (description
+      "pest meta language parser and validator")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-rand-pcg
+(define-public rust-petgraph
   (package
-    (name "rust-rand-pcg")
-    (version "0.2.0")
+    (name "rust-petgraph")
+    (version "0.4.13")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_pcg" version))
+        (uri (crate-uri "petgraph" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1dljwilv3640l1c5vlg4isiq7qz8gqa2cjbvgv3p0p5wrd36669y"))))
+            "0kyfmca854s54jk26g2x1kjb04c3k7cjilaxyr0if8lhxv8mjdlw"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-autocfg" ,rust-autocfg)
-         ("rust-rand-core" ,rust-rand-core)
-         ("rust-serde" ,rust-serde))
+        (("rust-fixedbitset" ,rust-fixedbitset)
+         ("rust-ordermap" ,rust-ordermap)
+         ("rust-quickcheck" ,rust-quickcheck)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-derive" ,rust-serde-derive))
         #:cargo-development-inputs
-        (("rust-bincode" ,rust-bincode))))
-    (home-page "https://crates.io/crates/rand_pcg")
+        (("rust-defmac" ,rust-defmac)
+         ("rust-itertools" ,rust-itertools)
+         ("rust-odds" ,rust-odds)
+         ("rust-rand" ,rust-rand-0.3))))
+    (home-page
+      "https://github.com/bluss/petgraph")
     (synopsis
-      "Selected PCG random number generators")
+      "Graph data structure library. Provides graph types and graph algorithms.")
     (description
-      "Selected PCG random number generators")
+      "Graph data structure library. Provides graph types and graph algorithms.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rand-pcg-0.1
+(define-public rust-pico-sys
   (package
-    (inherit rust-rand-pcg)
-    (name "rust-rand-pcg")
-    (version "0.1.2")
+    (name "rust-pico-sys")
+    (version "0.0.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_pcg" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "pico-sys" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0i0bdla18a8x4jn1w0fxsbs3jg7ajllz6azmch1zw33r06dv1ydb"))))
+          "1q5pg0ms6szz6b5h26h4k40zb76zbwwjgyigac4wly9qngdj4yl5"))))
+    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-autocfg" ,rust-autocfg)
-        ("rust-rand-core" ,rust-rand-core-0.4)
-        ("rust-serde" ,rust-serde)
-        ("rust-serde" ,rust-serde-derive))
-       #:cargo-development-inputs
-       (("rust-bincode" ,rust-bincode))))))
+       (("rust-cc" ,rust-cc)
+        ("rust-libc" ,rust-libc))))
+    (home-page "https://github.com/reem/rust-pico-sys.git")
+    (synopsis
+      "Bindings to the PicoHTTPParser.")
+    (description
+      "Bindings to the PicoHTTPParser.")
+    (license license:expat)))
 
-(define-public rust-rand-xorshift
+(define-public rust-pkg-config
   (package
-    (name "rust-rand-xorshift")
-    (version "0.2.0")
+    (name "rust-pkg-config")
+    (version "0.3.14")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_xorshift" version))
+        (uri (crate-uri "pkg-config" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1a6wy76lc5fimm1n9n8fzhp4cfjwfwxh4hx63bg3vlh1d2w1dm3p"))))
+            "135ia995lqzr0gxpk85h0bjxf82kj6hbxdx924sh9jdln6r8wvk7"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-rand-core" ,rust-rand-core)
-         ("rust-serde" ,rust-serde))
-        #:cargo-development-inputs
-        (("rust-bincode" ,rust-bincode))))
+     `(#:cargo-development-inputs
+       (("rust-lazy-static" ,rust-lazy-static))))
+    (inputs
+     `(("pkg-config" ,(@ (gnu packages pkg-config) pkg-config))))
     (home-page
-      "https://crates.io/crates/rand_xorshift")
-    (synopsis "Xorshift random number generator")
+      "https://github.com/alexcrichton/pkg-config-rs")
+    (synopsis
+      "A library to run the pkg-config system tool at build time in order to be used in Cargo build scripts.")
     (description
-      "Xorshift random number generator")
+      "A library to run the pkg-config system tool at build time in order to be used in Cargo build scripts.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rand-xorshift-0.1
+(define-public rust-plugin
   (package
-    (inherit rust-rand-xorshift)
-    (name "rust-rand-xorshift")
-    (version "0.1.1")
+    (name "rust-plugin")
+    (version "0.2.6")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_xorshift" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "plugin" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "0p2x8nr00hricpi2m6ca5vysiha7ybnghz79yqhhx6sl4gkfkxyb"))))
+          (base32
+            "1q7nghkpvxxr168y2jnzh3w7qc9vfrby9n7ygy3xpj0bj71hsshs"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-rand-core" ,rust-rand-core-0.3)
-         ("rust-serde" ,rust-serde)
-         ("rust-serde" ,rust-serde-derive))
+        (("rust-typemap" ,rust-typemap))
         #:cargo-development-inputs
-        (("rust-bincode" ,rust-bincode))))))
+        (("rust-void" ,rust-void))))
+    (home-page "https://github.com/reem/rust-plugin")
+    (synopsis
+      "Lazily evaluated, order-independent plugins for extensible types.")
+    (description
+      "Lazily evaluated, order-independent plugins for extensible types.")
+    (license license:expat)))
 
-(define-public rust-rand-xoshiro
+(define-public rust-pretty-env-logger
   (package
-    (name "rust-rand-xoshiro")
-    (version "0.3.0")
+    (name "rust-pretty-env-logger")
+    (version "0.3.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_xoshiro" version))
+        (uri (crate-uri "pretty_env_logger" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "07w3qgrac8r356lz5vqff42rly6yd9vs3g5lx5pbn13rcmb05rqb"))))
+            "0x4hyjlnvvhyk9m74iypzybm22w3dl2k8img4b956239n5vf8zki"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-byteorder" ,rust-byteorder)
-         ("rust-rand-core" ,rust-rand-core)
-         ("rust-serde" ,rust-serde))
-        #:cargo-development-inputs
-        (("rust-bincode" ,rust-bincode))))
+        (("rust-chrono" ,rust-chrono)
+         ("rust-env-logger" ,rust-env-logger)
+         ("rust-log" ,rust-log))))
     (home-page
-      "https://crates.io/crates/rand_xoshiro")
+      "https://github.com/seanmonstar/pretty-env-logger")
     (synopsis
-      "Xoshiro, xoroshiro and splitmix64 random number generators")
+      "A simple logger built on top off env_logger. It is configured via an environment variable and writes to standard error with nice colored output for log levels.")
     (description
-      "Xoshiro, xoroshiro and splitmix64 random number generators")
+      "A simple logger built on top off env_logger. It is configured via an environment variable and writes to standard error with nice colored output for log levels.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rand-xoshiro-0.1
+(define-public rust-pretty-assertions
   (package
-    (inherit rust-rand-xoshiro)
-    (name "rust-rand-xoshiro")
-    (version "0.1.0")
+    (name "rust-pretty-assertions")
+    (version "0.6.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rand_xoshiro" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "pretty_assertions" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "0ac9ha6ll8b6l1930bd99k29jrjpsbpddvr6ycrnbi5rkwb1id03"))))
+          (base32
+            "09yl14gnmpygiqrdlsa64lcl4w6ydjl9m8jri6kgam0v9rjf309z"))))
+    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-byteorder" ,rust-byteorder)
-        ("rust-rand-core" ,rust-rand-core-0.3))
-       #:cargo-development-inputs
-       (("rust-rand" ,rust-rand-0.6))))))
+       (("rust-ansi-term" ,rust-ansi-term)
+        ("rust-ctor" ,rust-ctor)
+        ("rust-difference" ,rust-difference)
+        ("rust-output-vt100" ,rust-output-vt100))))
+    (home-page
+      "https://github.com/colin-kiegel/rust-pretty-assertions")
+    (synopsis
+      "When writing tests in Rust, you'll probably use assert_eq!(a, b) a lot.
 
-(define-public rust-rayon
+      If such a test fails, it will present all the details of a and b. But you have to spot the differences yourself, which is not always straightforward, like here:")
+    (description
+      "When writing tests in Rust, you'll probably use assert_eq!(a, b) a lot.
+
+      If such a test fails, it will present all the details of a and b. But you have to spot the differences yourself, which is not always straightforward, like here:")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-proc-macro-nested ; guix upstreamable
   (package
-    (name "rust-rayon")
-    (version "1.1.0")
+    (name "rust-proc-macro-nested")
+    (version "0.1.3")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rayon" version))
+        (uri (crate-uri "proc-macro-nested" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0bmlksm8vl44wkwihmwr7jsjznhbg0n7aibcw1cs2jgjcp86x6in"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/dtolnay/proc-macro-hack")
+    (synopsis "Support for nested proc-macro-hack invocations")
+    (description "This crate provides support for nested proc-macro-hack
+invocations.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-proptest
+  (package
+    (name "rust-proptest")
+    (version "0.9.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "proptest" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "190hkbcdfvcphyyzkdg52zdia2y9d9yanpm072bmnzbn49p1ic54"))))
+            "17sjg8isas4qk85807c4panih9k0lwa4k1mbajhciw5c5q17w56g"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.6)
-         ("rust-either" ,rust-either)
-         ("rust-rayon-core" ,rust-rayon-core))
-        #:cargo-development-inputs
-        (("rust-doc-comment" ,rust-doc-comment)
-         ("rust-docopt" ,rust-docopt)
+        (("rust-bit-set" ,rust-bit-set)
+         ("rust-bitflags" ,rust-bitflags)
+         ("rust-byteorder" ,rust-byteorder)
          ("rust-lazy-static" ,rust-lazy-static)
-         ("rust-rand" ,rust-rand-0.6)
+         ("rust-num-traits" ,rust-num-traits)
+         ("rust-quick-error" ,rust-quick-error)
+         ("rust-rand" ,rust-rand)
+         ("rust-rand-chacha" ,rust-rand-chacha)
          ("rust-rand-xorshift" ,rust-rand-xorshift)
-         ("rust-serde" ,rust-serde)
-         ("rust-serde-derive" ,rust-serde-derive))))
-    (home-page "https://github.com/rayon-rs/rayon")
+         ("rust-regex-syntax" ,rust-regex-syntax)
+         ("rust-rusty-fork" ,rust-rusty-fork)
+         ("rust-tempfile" ,rust-tempfile))
+        #:cargo-development-inputs
+        (("rust-regex" ,rust-regex))))
+    (home-page
+      "https://altsysrq.github.io/proptest-book/proptest/index.html")
     (synopsis
-      "Simple work-stealing parallelism for Rust")
+      "Hypothesis-like property-based testing and shrinking.")
     (description
-      "Simple work-stealing parallelism for Rust")
+      "Hypothesis-like property-based testing and shrinking.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rayon-1.0
+(define-public rust-proc-macro-hack
   (package
-    (inherit rust-rayon)
-    (name "rust-rayon")
-    (version "1.0.3")
+    (name "rust-proc-macro-hack")
+    (version "0.5.8")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rayon" version))
+        (uri (crate-uri "proc-macro-hack" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "0wq41f15y05nlarijn9c1vxscxj5sazn3lhd6mmnicj5fzr18f1p"))))
+          (base32
+            "0y2ix90qdvsfks4j1g5qnpyzaa6a4j6sdi35klqvm120378kaalq"))))
+    (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.2)
-         ("rust-either" ,rust-either)
-         ("rust-rand" ,rust-rand-0.5)
-         ("rust-rayon-core" ,rust-rayon-core))
+        (("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-syn" ,rust-syn))
         #:cargo-development-inputs
-        (("rust-docopt" ,rust-docopt)
-         ("rust-lazy-static" ,rust-lazy-static)
-         ("rust-serde" ,rust-serde)
-         ("rust-serde-derive" ,rust-serde-derive))))))
-
-(define-public rust-rayon-core
+        (("rust-demo-hack" ,rust-demo-hack)
+         ("rust-demo-hack-impl" ,rust-demo-hack-impl))))
+    (home-page
+      "https://github.com/dtolnay/proc-macro-hack")
+    (synopsis
+      "Procedural functionlike!() macros using only Macros 1.1")
+    (description
+      "Procedural functionlike!() macros using only Macros 1.1")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-proc-macro-hack-0.4
   (package
-    (name "rust-rayon-core")
-    (version "1.5.0")
+    (inherit rust-proc-macro-hack)
+    (name "rust-proc-macro-hack")
+    (version "0.4.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rayon-core" version))
+        (uri (crate-uri "proc-macro-hack" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0fxn3qfhw76c518dfal2qqjwj5dbf0a1f7z0r5c4wd0igygg4fs6"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-proc-macro-hack-impl" ,rust-proc-macro-hack-impl))
+        #:cargo-development-inputs
+        (("rust-demo-hack" ,rust-demo-hack)
+         ("rust-demo-hack-impl" ,rust-demo-hack-impl))))))
+
+(define-public rust-publicsuffix
+  (package
+    (name "rust-publicsuffix")
+    (version "1.5.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "publicsuffix" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1ljva6blaf1wmzvg77h1i9pd0hsmsbbcmdk7sjbw7h2s8gw0vgpb"))))
+          "07ddqpri1xy7nxg5b7z8w49gw90rkn4qjvr423b4y7ngdnlcpzjs"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.6)
-         ("rust-crossbeam-queue" ,rust-crossbeam-queue)
-         ("rust-crossbeam-utils" ,rust-crossbeam-utils)
+        (("rust-error-chain" ,rust-error-chain)
+         ("rust-idna" ,rust-idna)
          ("rust-lazy-static" ,rust-lazy-static)
-         ("rust-num-cpus" ,rust-num-cpus))
+         ("rust-regex" ,rust-regex)
+         ("rust-url" ,rust-url)
+         ("rust-native-tls" ,rust-native-tls))
         #:cargo-development-inputs
-        (("rust-libc" ,rust-libc)
-         ("rust-rand" ,rust-rand)
-         ("rust-rand-xorshift" ,rust-rand-xorshift)
-         ("rust-scoped-tls" ,rust-scoped-tls))))
-    (home-page "https://github.com/rayon-rs/rayon")
-    (synopsis "Core APIs for Rayon")
-    (description "Core APIs for Rayon")
+        (("rust-rspec" ,rust-rspec))))
+    (home-page
+      "https://github.com/rushmorem/publicsuffix")
+    (synopsis
+      "Robust domain name parsing and RFC compliant email address validation")
+    (description
+      "Robust domain name parsing and RFC compliant email address validation")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rdrand
+(define-public rust-pulldown-cmark
   (package
-    (name "rust-rdrand")
-    (version "0.5.1")
+    (name "rust-pulldown-cmark")
+    (version "0.5.3")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rdrand" version))
+        (uri (crate-uri "pulldown-cmark" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "02dsyibvl1iygkmljr0ld9vjyp525q4mjy5j9yazrrkyvhvw7gvp"))))
+            "0mq3cgjwxlrv0p1svjg93m1jkybzyfrl9p0jwa76hx1352hks13p"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-rand-core" ,rust-rand-core))))
+        (("rust-bitflags" ,rust-bitflags)
+         ("rust-getopts" ,rust-getopts)
+         ("rust-memchr" ,rust-memchr)
+         ("rust-unicase" ,rust-unicase))
+        #:cargo-development-inputs
+        (("rust-criterion" ,rust-criterion)
+         ("rust-html5ever" ,rust-html5ever)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-regex" ,rust-regex)
+         ("rust-tendril" ,rust-tendril))))
     (home-page
-      "https://github.com/nagisa/rust_rdrand/")
+      "https://github.com/raphlinus/pulldown-cmark")
+    (synopsis "A pull parser for CommonMark")
+    (description
+      "This package provides a pull parser for CommonMark")
+    (license license:expat)))
+
+(define-public rust-quantiles
+  (package
+    (name "rust-quantiles")
+    (version "0.7.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "quantiles" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1wjp16a3d4bmldq9w2wds0q4gjz4mnsqac3g38r6ryr6zc9sh3y1"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-serde" ,rust-serde)
+         ("rust-serde-derive" ,rust-serde-derive))
+        #:cargo-development-inputs
+        (("rust-quickcheck" ,rust-quickcheck))))
+    (home-page
+      "https://github.com/postmates/quantiles")
     (synopsis
-      "An implementation of random number generator based on rdrand and rdseed instructions")
+      "a collection of approximate quantile algorithms")
     (description
-      "An implementation of random number generator based on rdrand and rdseed instructions")
-    (license license:isc)))
+      "a collection of approximate quantile algorithms")
+    (license license:expat)))
 
-(define-public rust-rdrand-0.4
+(define-public rust-quickcheck
   (package
-    (inherit rust-rdrand)
-    (name "rust-rdrand")
-    (version "0.4.0")
+    (name "rust-quickcheck")
+    (version "0.8.5")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rdrand" version))
+        (uri (crate-uri "quickcheck" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1cjq0kwx1bk7jx3kzyciiish5gqsj7620dm43dc52sr8fzmm9037"))))
+            "0mkl4wnvvjk4m32aq3an4ayfyvnmbxnzcybfm7n3fbsndb1xjdcw"))))
+    (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-rand-core" ,rust-rand-core-0.3))))))
+        (("rust-env-logger" ,rust-env-logger)
+         ("rust-log" ,rust-log)
+         ("rust-rand" ,rust-rand-0.6)
+         ("rust-rand-core" ,rust-rand-core))))
+    (home-page
+      "https://github.com/BurntSushi/quickcheck")
+    (synopsis
+      "Automatic property based testing with shrinking.")
+    (description
+      "Automatic property based testing with shrinking.")
+    (license (list license:unlicense
+                   license:expat))))
 
-(define-public rust-redox-syscall ; guix upstreamable
+(define-public rust-quickcheck-0.7
+  (package
+    (inherit rust-quickcheck)
+    (name "rust-quickcheck")
+    (version "0.7.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "quickcheck" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "05pqzja6fwdyrs1za5vmxb9ifb993knmpdsrs1fs2wyz9qz7slyl"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-env-logger" ,rust-env-logger-0.5)
+        ("rust-log" ,rust-log)
+        ("rust-rand" ,rust-rand-0.5)
+        ("rust-rand-core" ,rust-rand-core-0.2))))))
+
+(define-public rust-quickcheck-0.6
+  (package
+    (inherit rust-quickcheck)
+    (name "rust-quickcheck")
+    (version "0.6.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "quickcheck" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1dyazm2fcq0v9fscq1a7597zsvdl9f0j8c2bfj1jm2nlzz2sn6y0"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-env-logger" ,rust-env-logger-0.5)
+        ("rust-log" ,rust-log)
+        ("rust-rand" ,rust-rand-0.4))))))
+
+(define-public rust-quickcheck-0.5
+  (package
+    (inherit rust-quickcheck)
+    (name "rust-quickcheck")
+    (version "0.5.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "quickcheck" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1jzm1ygfbn4igaq14b9nipc8yvsn6c8panpgd1qiy5r2insjllyd"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-env-logger" ,rust-env-logger-0.4)
+        ("rust-log" ,rust-log-0.3)
+        ("rust-rand" ,rust-rand-0.3))))))
+
+(define-public rust-rand
+  (package
+    (name "rust-rand")
+    (version "0.7.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0b05gwx8nnxr9bydyjxd1rszdvqnm946ky15z103ssfrhc7anznl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-getrandom" ,rust-getrandom)
+        ("rust-libc" ,rust-libc)
+        ("rust-log" ,rust-log)
+        ("rust-packed-simd" ,rust-packed-simd)
+        ("rust-rand-chacha" ,rust-rand-chacha)
+        ("rust-rand-core" ,rust-rand-core)
+        ("rust-rand-hc" ,rust-rand-hc)
+        ("rust-rand-pcg" ,rust-rand-pcg))
+       #:cargo-development-inputs
+       (("rust-rand-hc" ,rust-rand-hc)
+        ("rust-rand-isaac" ,rust-rand-isaac)
+        ("rust-rand-pcg" ,rust-rand-pcg)
+        ("rust-rand-xorshift" ,rust-rand-xorshift)
+        ("rust-rand-xoshiro" ,rust-rand-xoshiro))))
+    (home-page "https://crates.io/crates/rand")
+    (synopsis
+      "Random number generators and other randomness functionality.")
+    (description
+      "Random number generators and other randomness functionality.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rand-0.6
+  (package
+    (inherit rust-rand)
+    (name "rust-rand")
+    (version "0.6.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1jl4449jcl4wgmzld6ffwqj5gwxrp8zvx8w573g1z368qg6xlwbd"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-autocfg" ,rust-autocfg)
+        ("rust-libc" ,rust-libc)
+        ("rust-log" ,rust-log)
+        ("rust-packed-simd" ,rust-packed-simd)
+        ("rust-rand-chacha" ,rust-rand-chacha-0.1)
+        ("rust-rand-core" ,rust-rand-core-0.4)
+        ("rust-rand-hc" ,rust-rand-hc-0.1)
+        ("rust-rand-isaac" ,rust-rand-isaac-0.1)
+        ("rust-rand-jitter" ,rust-rand-jitter-0.1)
+        ("rust-rand-os" ,rust-rand-os-0.1)
+        ("rust-rand-pcg" ,rust-rand-pcg-0.1)
+        ("rust-rand-xorshift" ,rust-rand-xorshift-0.1)
+        ("rust-winapi" ,rust-winapi))
+       #:cargo-development-inputs
+       (("rust-average" ,rust-average-0.9)
+        ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.1))))))
+
+(define-public rust-rand-0.5
+  (package
+    (inherit rust-rand)
+    (name "rust-rand")
+    (version "0.5.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1fdcgja9167hlzkf4g5daqwp498lwiyq7aqm05whklpbsdyc8666"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cloudabi" ,rust-cloudabi)
+        ("rust-fuchsia-cprng" ,rust-fuchsia-cprng)
+        ("rust-libc" ,rust-libc)
+        ("rust-log" ,rust-log)
+        ("rust-rand-core" ,rust-rand-core-0.3)
+        ("rust-serde" ,rust-serde)
+        ("rust-serde-derive" ,rust-serde-derive)
+        ("rust-stdweb" ,rust-stdweb)
+        ("rust-winapi" ,rust-winapi))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode))))))
+
+(define-public rust-rand-0.4
+  (package
+    (inherit rust-rand)
+    (name "rust-rand")
+    (version "0.4.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "14qjfv3gggzhnma20k0sc1jf8y6pplsaq7n1j9ls5c8kf2wl0a2m"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-fuchsia-cprng" ,rust-fuchsia-cprng)
+        ("rust-libc" ,rust-libc)
+        ("rust-rand-core" ,rust-rand-core-0.3)
+        ("rust-rdrand" ,rust-rdrand-0.4)
+        ("rust-winapi" ,rust-winapi))))))
+
+(define-public rust-rand-0.3
+  (package
+    (inherit rust-rand)
+    (name "rust-rand")
+    (version "0.3.23")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0v679h38pjjqj5h4md7v2slsvj6686qgcn7p9fbw3h43iwnk1b34"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc)
+        ("rust-rand" ,rust-rand-0.4))))))
+
+(define-public rust-rand-chacha
+  (package
+    (name "rust-rand-chacha")
+    (version "0.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_chacha" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "178d36jfkc4v95s25scc2vibj2hd2hlk64cs6id4hvzg89whd4z1"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-c2-chacha" ,rust-c2-chacha)
+         ("rust-rand-core" ,rust-rand-core))
+        #:cargo-development-inputs
+        (("rust-autocfg" ,rust-autocfg))))
+    (home-page
+      "https://crates.io/crates/rand_chacha")
+    (synopsis "ChaCha random number generator")
+    (description "ChaCha random number generator")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rand-chacha-0.1
+  (package
+    (inherit rust-rand-chacha)
+    (name "rust-rand-chacha")
+    (version "0.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_chacha" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1vxwyzs4fy1ffjc8l00fsyygpiss135irjf7nyxgq2v0lqf3lvam"))))
+    (arguments
+      `(#:cargo-inputs
+        (("rust-autocfg" ,rust-autocfg)
+         ("rust-rand-core" ,rust-rand-core-0.3))))))
+
+(define-public rust-rand-core
+  (package
+    (name "rust-rand-core")
+    (version "0.5.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_core" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1jis94x9ri8xlxki2w2w5k29sjpfwgzkjylg7paganp74hrnhpk1"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-getrandom" ,rust-getrandom)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-derive" ,rust-serde-derive))))
+    (home-page "https://crates.io/crates/rand_core")
+    (synopsis
+      "Core random number generator traits and tools for implementation.")
+    (description
+      "Core random number generator traits and tools for implementation.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rand-core-0.4
+  (package
+    (inherit rust-rand-core)
+    (name "rust-rand-core")
+    (version "0.4.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_core" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1p09ynysrq1vcdlmcqnapq4qakl2yd1ng3kxh3qscpx09k2a6cww"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-serde" ,rust-serde)
+        ("rust-serde-derive" ,rust-serde-derive))))))
+
+(define-public rust-rand-core-0.3
+  (package
+    (inherit rust-rand-core)
+    (name "rust-rand-core")
+    (version "0.3.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_core" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0jzdgszfa4bliigiy4hi66k7fs3gfwi2qxn8vik84ph77fwdwvvs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-rand-core" ,rust-rand-core-0.4))))))
+
+(define-public rust-rand-core-0.2
+  (package
+    (inherit rust-rand-core)
+    (name "rust-rand-core")
+    (version "0.2.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_core" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0wikbw2a36bz8ywjyycjrd7db6ra3yzj14zs1ysxz2fiqhia8q8r"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-rand-core" ,rust-rand-core-0.3))))))
+
+(define-public rust-rand-distr
+  (package
+    (name "rust-rand-distr")
+    (version "0.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_distr" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "08drhcw9k4a79pri3rd1vkv7v9cbm6cf4i342nai39f527c58zn3"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-rand" ,rust-rand))
+        #:cargo-development-inputs
+        (("rust-average" ,rust-average)
+         ("rust-rand-pcg" ,rust-rand-pcg))))
+    (home-page "https://crates.io/crates/rand_distr")
+    (synopsis
+      "Sampling from random number distributions")
+    (description
+      "Sampling from random number distributions")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rand-hc
+  (package
+    (name "rust-rand-hc")
+    (version "0.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_hc" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0g31sqwpmsirdlwr0svnacr4dbqyz339im4ssl9738cjgfpjjcfa"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-rand-core" ,rust-rand-core))))
+    (home-page "https://crates.io/crates/rand_hc")
+    (synopsis "HC128 random number generator")
+    (description "HC128 random number generator")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rand-hc-0.1
+  (package
+    (inherit rust-rand-hc)
+    (name "rust-rand-hc")
+    (version "0.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_hc" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1i0vl8q5ddvvy0x8hf1zxny393miyzxkwqnw31ifg6p0gdy6fh3v"))))
+    (arguments
+      `(#:cargo-inputs
+        (("rust-rand-core" ,rust-rand-core-0.3))))))
+
+(define-public rust-rand-isaac
+  (package
+    (name "rust-rand-isaac")
+    (version "0.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_isaac" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0xlb9415x518ffkazxhvk8b04i9i548nva4i5l5s34crvjrv1xld"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-rand-core" ,rust-rand-core)
+         ("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-bincode" ,rust-bincode))))
+    (home-page "https://crates.io/crates/rand_isaac")
+    (synopsis "ISAAC random number generator")
+    (description "ISAAC random number generator")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rand-isaac-0.1
+  (package
+    (inherit rust-rand-isaac)
+    (name "rust-rand-isaac")
+    (version "0.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_isaac" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "027flpjr4znx2csxk7gxb7vrf9c7y5mydmvg5az2afgisp4rgnfy"))))
+    (arguments
+      `(#:cargo-inputs
+        (("rust-rand-core" ,rust-rand-core-0.3)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-derive" ,rust-serde-derive))
+        #:cargo-development-inputs
+        (("rust-bincode" ,rust-bincode))))))
+
+(define-public rust-rand-jitter
+  (package
+    (name "rust-rand-jitter")
+    (version "0.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_jitter" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1mnjbfzj97g788jslz0k77bpsg6qjhz676cibk82ibbvgqp4sy43"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-libc" ,rust-libc)
+         ("rust-log" ,rust-log)
+         ("rust-rand-core" ,rust-rand-core)
+         ("rust-winapi" ,rust-winapi))))
+    (home-page "https://github.com/rust-random/rand")
+    (synopsis
+      "Random number generator based on timing jitter")
+    (description
+      "Random number generator based on timing jitter")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rand-jitter-0.1
+  (package
+    (inherit rust-rand-jitter)
+    (name "rust-rand-jitter")
+    (version "0.1.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_jitter" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "16z387y46bfz3csc42zxbjq89vcr1axqacncvv8qhyy93p4xarhi"))))
+    (arguments
+      `(#:cargo-inputs
+        (("rust-libc" ,rust-libc)
+         ("rust-log" ,rust-log)
+         ("rust-rand-core" ,rust-rand-core-0.4)
+         ("rust-winapi" ,rust-winapi))))))
+
+(define-public rust-rand-pcg
+  (package
+    (name "rust-rand-pcg")
+    (version "0.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_pcg" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1dljwilv3640l1c5vlg4isiq7qz8gqa2cjbvgv3p0p5wrd36669y"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-autocfg" ,rust-autocfg)
+         ("rust-rand-core" ,rust-rand-core)
+         ("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-bincode" ,rust-bincode))))
+    (home-page "https://crates.io/crates/rand_pcg")
+    (synopsis
+      "Selected PCG random number generators")
+    (description
+      "Selected PCG random number generators")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rand-pcg-0.1
+  (package
+    (inherit rust-rand-pcg)
+    (name "rust-rand-pcg")
+    (version "0.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_pcg" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0i0bdla18a8x4jn1w0fxsbs3jg7ajllz6azmch1zw33r06dv1ydb"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-autocfg" ,rust-autocfg)
+        ("rust-rand-core" ,rust-rand-core-0.4)
+        ("rust-serde" ,rust-serde)
+        ("rust-serde" ,rust-serde-derive))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode))))))
+
+(define-public rust-rand-xorshift
+  (package
+    (name "rust-rand-xorshift")
+    (version "0.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_xorshift" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1a6wy76lc5fimm1n9n8fzhp4cfjwfwxh4hx63bg3vlh1d2w1dm3p"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-rand-core" ,rust-rand-core)
+         ("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-bincode" ,rust-bincode))))
+    (home-page
+      "https://crates.io/crates/rand_xorshift")
+    (synopsis "Xorshift random number generator")
+    (description
+      "Xorshift random number generator")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rand-xorshift-0.1
+  (package
+    (inherit rust-rand-xorshift)
+    (name "rust-rand-xorshift")
+    (version "0.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_xorshift" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0p2x8nr00hricpi2m6ca5vysiha7ybnghz79yqhhx6sl4gkfkxyb"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-rand-core" ,rust-rand-core-0.3)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde" ,rust-serde-derive))
+        #:cargo-development-inputs
+        (("rust-bincode" ,rust-bincode))))))
+
+(define-public rust-rand-xoshiro
+  (package
+    (name "rust-rand-xoshiro")
+    (version "0.3.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_xoshiro" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "07w3qgrac8r356lz5vqff42rly6yd9vs3g5lx5pbn13rcmb05rqb"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-byteorder" ,rust-byteorder)
+         ("rust-rand-core" ,rust-rand-core)
+         ("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-bincode" ,rust-bincode))))
+    (home-page
+      "https://crates.io/crates/rand_xoshiro")
+    (synopsis
+      "Xoshiro, xoroshiro and splitmix64 random number generators")
+    (description
+      "Xoshiro, xoroshiro and splitmix64 random number generators")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rand-xoshiro-0.1
+  (package
+    (inherit rust-rand-xoshiro)
+    (name "rust-rand-xoshiro")
+    (version "0.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_xoshiro" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0ac9ha6ll8b6l1930bd99k29jrjpsbpddvr6ycrnbi5rkwb1id03"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder)
+        ("rust-rand-core" ,rust-rand-core-0.3))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.6))))))
+
+(define-public rust-rayon
+  (package
+    (name "rust-rayon")
+    (version "1.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rayon" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "190hkbcdfvcphyyzkdg52zdia2y9d9yanpm072bmnzbn49p1ic54"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.6)
+         ("rust-either" ,rust-either)
+         ("rust-rayon-core" ,rust-rayon-core))
+        #:cargo-development-inputs
+        (("rust-doc-comment" ,rust-doc-comment)
+         ("rust-docopt" ,rust-docopt)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-rand" ,rust-rand-0.6)
+         ("rust-rand-xorshift" ,rust-rand-xorshift)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-derive" ,rust-serde-derive))))
+    (home-page "https://github.com/rayon-rs/rayon")
+    (synopsis
+      "Simple work-stealing parallelism for Rust")
+    (description
+      "Simple work-stealing parallelism for Rust")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rayon-1.0
+  (package
+    (inherit rust-rayon)
+    (name "rust-rayon")
+    (version "1.0.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rayon" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0wq41f15y05nlarijn9c1vxscxj5sazn3lhd6mmnicj5fzr18f1p"))))
+    (arguments
+      `(#:cargo-inputs
+        (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.2)
+         ("rust-either" ,rust-either)
+         ("rust-rand" ,rust-rand-0.5)
+         ("rust-rayon-core" ,rust-rayon-core))
+        #:cargo-development-inputs
+        (("rust-docopt" ,rust-docopt)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-derive" ,rust-serde-derive))))))
+
+(define-public rust-rayon-core
+  (package
+    (name "rust-rayon-core")
+    (version "1.5.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rayon-core" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1ljva6blaf1wmzvg77h1i9pd0hsmsbbcmdk7sjbw7h2s8gw0vgpb"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.6)
+         ("rust-crossbeam-queue" ,rust-crossbeam-queue)
+         ("rust-crossbeam-utils" ,rust-crossbeam-utils)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-num-cpus" ,rust-num-cpus))
+        #:cargo-development-inputs
+        (("rust-libc" ,rust-libc)
+         ("rust-rand" ,rust-rand)
+         ("rust-rand-xorshift" ,rust-rand-xorshift)
+         ("rust-scoped-tls" ,rust-scoped-tls))))
+    (home-page "https://github.com/rayon-rs/rayon")
+    (synopsis "Core APIs for Rayon")
+    (description "Core APIs for Rayon")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rdrand
+  (package
+    (name "rust-rdrand")
+    (version "0.5.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rdrand" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "02dsyibvl1iygkmljr0ld9vjyp525q4mjy5j9yazrrkyvhvw7gvp"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-rand-core" ,rust-rand-core))))
+    (home-page
+      "https://github.com/nagisa/rust_rdrand/")
+    (synopsis
+      "An implementation of random number generator based on rdrand and rdseed instructions")
+    (description
+      "An implementation of random number generator based on rdrand and rdseed instructions")
+    (license license:isc)))
+
+(define-public rust-rdrand-0.4
+  (package
+    (inherit rust-rdrand)
+    (name "rust-rdrand")
+    (version "0.4.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rdrand" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1cjq0kwx1bk7jx3kzyciiish5gqsj7620dm43dc52sr8fzmm9037"))))
+    (arguments
+      `(#:cargo-inputs
+        (("rust-rand-core" ,rust-rand-core-0.3))))))
+
+(define-public rust-redox-syscall ; guix upstreamable
+  (package
+    (name "rust-redox-syscall")
+    (version "0.1.56")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "redox_syscall" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "110y7dyfm2vci4x5vk7gr0q551dvp31npl99fnsx2fb17wzwcf94"))))
+    (build-system cargo-build-system)
+    (home-page "https://gitlab.redox-os.org/redox-os/syscall")
+    (synopsis "Rust library to access raw Redox system calls")
+    (description "This package provides a Rust library to access raw Redox
+system calls.")
+    (license license:expat)))
+
+(define-public rust-redox-users
+  (package
+    (name "rust-redox-users")
+    (version "0.3.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "redox_users" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0a1q5jv76vj1mwmqf2mmhknmkpw5wndx91gjfgg7vs8p79621r9z"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-argon2rs" ,rust-argon2rs)
+         ("rust-failure" ,rust-failure)
+         ("rust-rand-os" ,rust-rand-os)
+         ("rust-redox-syscall" ,rust-redox-syscall))))
+    (home-page
+      "https://gitlab.redox-os.org/redox-os/users")
+    (synopsis
+      "A Rust library to access Redox users and groups functionality")
+    (description
+      "This package provides a Rust library to access Redox users and groups functionality")
+    (license #f)))
+
+(define-public rust-ref-cast
+  (package
+    (name "rust-ref-cast")
+    (version "0.2.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "ref-cast" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0jgj1zxaikqm030flpifbp517fy4z21lly6ysbwyciii39bkzcf1"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-ref-cast-impl" ,rust-ref-cast-impl))))
+    (home-page "https://github.com/dtolnay/ref-cast")
+    (synopsis
+      "Safely cast &T to &U where the struct U contains a single field of type T.")
+    (description
+      "Safely cast &T to &U where the struct U contains a single field of type T.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-ref-cast-impl
+  (package
+    (name "rust-ref-cast-impl")
+    (version "0.2.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "ref-cast-impl" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0hw0frpzna5rf5szix56zyzd0vackcb3svj94ndj629xi75dkb32"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-syn" ,rust-syn))))
+    (home-page "https://github.com/dtolnay/ref-cast")
+    (synopsis
+      "Derive implementation for ref_cast::RefCast.")
+    (description
+      "Derive implementation for ref_cast::RefCast.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-regex
+  (package
+    (name "rust-regex")
+    (version "1.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "regex" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1k6jpx0bqlg6vb8rsdnlmcw2szczbl51j047w3blpa4qzn6xl8vb"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-aho-corasick" ,rust-aho-corasick)
+         ("rust-memchr" ,rust-memchr)
+         ("rust-regex-syntax" ,rust-regex-syntax)
+         ("rust-thread-local" ,rust-thread-local)
+         ("rust-utf8-ranges" ,rust-utf8-ranges))
+        #:cargo-development-inputs
+        (("rust-doc-comment" ,rust-doc-comment)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-quickcheck" ,rust-quickcheck)
+         ("rust-rand" ,rust-rand))))
+    (home-page "https://github.com/rust-lang/regex")
+    (synopsis
+      "An implementation of regular expressions for Rust. This implementation uses
+      finite automata and guarantees linear time matching on all inputs.")
+    (description
+      "An implementation of regular expressions for Rust.  This implementation uses
+      finite automata and guarantees linear time matching on all inputs.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-regex-0.2
+  (package
+    (inherit rust-regex)
+    (name "rust-regex")
+    (version "0.2.11")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "regex" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1163ir1k5zjspirfjl4wqbviwrxlhmfwy95xxb69y4irkv4snack"))))
+    (arguments
+      `(#:cargo-inputs
+        (("rust-aho-corasick" ,rust-aho-corasick-0.6)
+         ("rust-memchr" ,rust-memchr)
+         ("rust-regex-syntax" ,rust-regex-syntax)
+         ("rust-thread-local" ,rust-thread-local)
+         ("rust-utf8-ranges" ,rust-utf8-ranges))
+        #:cargo-development-inputs
+        (("rust-lazy-static" ,rust-lazy-static)
+         ("rust-quickcheck" ,rust-quickcheck-0.6)
+         ("rust-rand" ,rust-rand-0.4))))))
+
+(define-public rust-regex-syntax
+  (package
+    (name "rust-regex-syntax")
+    (version "0.6.10")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "regex-syntax" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0p47lf38yj2g2fnmvnraccqlxwk35zr76hlnqi8yva932nzqam6d"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-ucd-util" ,rust-ucd-util))))
+    (home-page "https://github.com/rust-lang/regex")
+    (synopsis "A regular expression parser.")
+    (description
+      "This package provides a regular expression parser.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-remove-dir-all
+  (package
+    (name "rust-remove-dir-all")
+    (version "0.5.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "remove_dir_all" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0bkrlyg26mgizpiy1yb2hhpgscxcag8r5fnckqsvk25608vzm0sa"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-winapi" ,rust-winapi))
+        #:cargo-development-inputs
+        (("rust-doc-comment" ,rust-doc-comment))))
+    (home-page
+      "https://github.com/XAMPPRocky/remove_dir_all.git")
+    (synopsis
+      "A safe, reliable implementation of remove_dir_all for Windows")
+    (description
+      "This package provides a safe, reliable implementation of remove_dir_all for Windows")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-reqwest
+  (package
+    (name "rust-reqwest")
+    (version "0.9.20")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "reqwest" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0y4wvzl3pspd8drr2hf9kk107cjw455cb6p529sh90x58dhqjv8g"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-base64" ,rust-base64)
+         ("rust-bytes" ,rust-bytes)
+         ("rust-cookie" ,rust-cookie)
+         ("rust-cookie-store" ,rust-cookie-store)
+         ("rust-encoding-rs" ,rust-encoding-rs)
+         ("rust-flate2" ,rust-flate2)
+         ("rust-futures" ,rust-futures)
+         ("rust-http" ,rust-http)
+         ("rust-hyper" ,rust-hyper)
+         ("rust-log" ,rust-log)
+         ("rust-mime" ,rust-mime)
+         ("rust-mime-guess" ,rust-mime-guess)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-json" ,rust-serde-json)
+         ("rust-serde-urlencoded" ,rust-urlencoded)
+         ("rust-time" ,rust-time)
+         ("rust-tokio" ,rust-tokio)
+         ("rust-tokio-executor" ,rust-tokio-executor)
+         ("rust-tokio-io" ,rust-tokio-io)
+         ("rust-tokio-threadpool" ,rust-tokio-threadpool)
+         ("rust-tokio-timer" ,rust-tokio-timer)
+         ("rust-url" ,rust-url)
+         ("rust-uuid" ,rust-uuid)
+         ("rust-winreg" ,rust-winreg)
+         ("rust-hyper-old-types" ,rust-hyper-old-types)
+         ("rust-hyper-rustls" ,rust-hyper-rustls)
+         ("rust-hyper-tls" ,rust-hyper-tls)
+         ("rust-native-tls" ,rust-native-tls)
+         ("rust-rustls" ,rust-rustls)
+         ("rust-socks" ,rust-socks)
+         ("rust-tokio-rustls" ,rust-tokio-rustls)
+         ("rust-trust-dns-resolver" ,rust-trust-dns-resolver)
+         ("rust-webpki-roots" ,rust-webpki-roots))
+        #:cargo-development-inputs
+        (("rust-bytes" ,rust-bytes)
+         ("rust-doc-comment" ,rust-doc-comment)
+         ("rust-env-logger" ,rust-env-logger)
+         ("rust-libflate" ,rust-libflate)
+         ("rust-serde" ,rust-serde)
+         ("rust-tokio" ,rust-tokio)
+         ("rust-tokio-tcp" ,rust-tokio-tcp))))
+    (home-page
+      "https://github.com/seanmonstar/reqwest")
+    (synopsis
+      "An ergonomic, batteries-included HTTP Client for Rust.")
+    (description
+      "An ergonomic, batteries-included HTTP Client for Rust.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-resolv-conf
+  (package
+    (name "rust-resolv-conf")
+    (version "0.6.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "resolv-conf" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1jvdsmksdf6yiipm3aqahyv8n1cjd7wqc8sa0p0gzsax3fmb8qxj"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-quick-error" ,rust-quick-error)
+         ("rust-hostname" ,rust-hostname))))
+    (home-page
+      "https://github.com/tailhook/resolv-conf")
+    (synopsis
+      "A /etc/resolv.conf parser crate for rust.")
+    (description
+      "A /etc/resolv.conf parser crate for rust.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-ring
+  (package
+    (name "rust-ring")
+    (version "0.16.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "ring" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0mzpk6zmvlvzy021fh8b3xs2zl6c8mqdqfwqn7zlvc07g8qyhskr"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-cc" ,rust-cc)
+         ("rust-libc" ,rust-libc)
+         ("rust-spin" ,rust-spin)
+         ("rust-untrusted" ,rust-untrusted)
+         ("rust-web-sys" ,rust-web-sys)
+         ("rust-winapi" ,rust-winapi)
+         ("rust-lazy-static" ,rust-lazy-static))
+        #:cargo-development-inputs
+        (("rust-libc" ,rust-libc)
+         ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test))))
+    (home-page "https://github.com/briansmith/ring")
+    (synopsis
+      "Safe, fast, small crypto using Rust")
+    (description
+      "Safe, fast, small crypto using Rust")
+    (license (license:non-copyleft "file://LICENSE"))))
+
+(define-public rust-ron
+  (package
+    (name "rust-ron")
+    (version "0.5.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "ron" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1mb2bavvp8jg5wx0kx9n45anrsbjwhjzddim987bjaa11hg45kif"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-base64" ,rust-base64)
+         ("rust-bitflags" ,rust-bitflags)
+         ("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-serde-bytes" ,rust-serde-bytes)
+         ("rust-serde-json" ,rust-serde-json))))
+    (home-page "https://github.com/ron-rs/ron")
+    (synopsis "Rusty Object Notation")
+    (description "Rusty Object Notation")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rustc-demangle
+  (package
+    (name "rust-rustc-demangle")
+    (version "0.1.15")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rustc-demangle" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1brqf2bknkxsdzn3kd3wfifvzfc33bmvdy9r1k6fp4a8dz7xrx57"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-compiler-builtins"
+          ,rust-compiler-builtins)
+         ("rust-rustc-std-workspace-core"
+          ,rust-rustc-std-workspace-core))))
+    (home-page
+      "https://github.com/alexcrichton/rustc-demangle")
+    (synopsis "Rust compiler symbol demangling.")
+    (description
+      "Rust compiler symbol demangling.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rustc-serialize
+  (package
+    (name "rust-rustc-serialize")
+    (version "0.3.24")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rustc-serialize" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1nkg3vasg7nk80ffkazizgiyv3hb1l9g3d8h17cajbkx538jiwfw"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-development-inputs
+        (("rust-rand" ,rust-rand-0.3))))
+    (home-page
+      "https://github.com/rust-lang/rustc-serialize")
+    (synopsis
+      "Generic serialization/deserialization support corresponding to the `derive(RustcEncodable, RustcDecodable)` mode in the compiler. Also includes support for hex, base64, and json encoding and decoding.")
+    (description
+      "Generic serialization/deserialization support corresponding to the `derive(RustcEncodable, RustcDecodable)` mode in the compiler. Also includes support for hex, base64, and json encoding and decoding.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rustc-test
+  (package
+    (name "rust-rustc-test")
+    (version "0.3.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rustc-test" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0a27mlcg0ck0hgsdvwk792x9z1k1qq1wj091f1l5yggbdbcsnx5w"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-getopts" ,rust-getopts)
+         ("rust-libc" ,rust-libc)
+         ("rust-rustc-serialize" ,rust-rustc-serialize)
+         ("rust-term" ,rust-term)
+         ("rust-time" ,rust-time))
+        #:cargo-development-inputs
+        (("rust-rustc-version" ,rust-rustc-version))))
+    (home-page
+      "https://github.com/SimonSapin/rustc-test")
+    (synopsis
+      "A fork of Rustâ\x80\x99s `test` crate that doesnâ\x80\x99t require unstable language features.")
+    (description
+      "This package provides a fork of Rustâ\x80\x99s `test` crate that doesnâ\x80\x99t require unstable language features.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rustc-version
+  (package
+    (name "rust-rustc-version")
+    (version "0.2.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rustc_version" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "02h3x57lcr8l2pm0a645s9whdh33pn5cnrwvn5cb57vcrc53x3hk"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs (("rust-semver" ,rust-semver))))
+    (home-page
+      "https://github.com/Kimundi/rustc-version-rs")
+    (synopsis
+      "A library for querying the version of a installed rustc compiler")
+    (description
+      "This package provides a library for querying the version of a installed rustc compiler")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rustls
+  (package
+    (name "rust-rustls")
+    (version "0.16.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rustls" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "17n0fx3fpkg4fhpdplrdhkissnl003kj90vzbqag11vkpyqihnmj"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-base64" ,rust-base64)
+         ("rust-log" ,rust-log)
+         ("rust-ring" ,rust-ring)
+         ("rust-sct" ,rust-sct)
+         ("rust-webpki" ,rust-webpki))
+        #:cargo-development-inputs
+        (("rust-criterion" ,rust-criterion)
+         ("rust-env-logger" ,rust-env-logger)
+         ("rust-log" ,rust-log)
+         ("rust-tempfile" ,rust-tempfile)
+         ("rust-webpki-roots" ,rust-webpki-roots))))
+    (home-page "https://github.com/ctz/rustls")
+    (synopsis
+      "Rustls is a modern TLS library written in Rust.")
+    (description
+      "Rustls is a modern TLS library written in Rust.")
+    (license (list license:asl2.0
+                   license:isc
+                   license:expat))))
+
+(define-public rust-ryu
+  (package
+    (name "rust-ryu")
+    (version "1.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "ryu" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "15r9z2wzgbj04pks4jz7y6wif5xqhf1wqkl2nd7qrvn08ys68969"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-no-panic" ,rust-no-panic))
+        #:cargo-development-inputs
+        (("rust-num-cpus" ,rust-num-cpus)
+         ("rust-rand" ,rust-rand))))
+    (home-page "https://github.com/dtolnay/ryu")
+    (synopsis
+      "Fast floating point to string conversion")
+    (description
+      "Fast floating point to string conversion")
+    (license (list license:asl2.0
+                   license:boost1.0))))
+
+(define-public rust-same-file
+  (package
+    (name "rust-same-file")
+    (version "1.0.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "same-file" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "08a4zy10pjindf2rah320s6shgswk13mqw7s61m8i1y1xpf8spjq"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-winapi-util" ,rust-winapi-util))))
+    (home-page
+      "https://github.com/BurntSushi/same-file")
+    (synopsis
+      "A simple crate for determining whether two file paths point to the same file.")
+    (description
+      "This package provides a simple crate for determining whether two file paths point to the same file.")
+    (license (list license:unlicense
+                   license:expat))))
+
+(define-public rust-schannel
+  (package
+    (name "rust-schannel")
+    (version "0.1.15")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "schannel" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0f9k4pm8yc3z0n1n8hazvnrvg52f0sfxjc91bhf3r76rb3rapxpj"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-lazy-static" ,rust-lazy-static)
+         ("rust-winapi" ,rust-winapi))))
+    (home-page "https://github.com/steffengy/schannel-rs")
+    (synopsis
+      "Rust bindings to the Windows SChannel APIs providing TLS client and server functionality.")
+    (description
+      "Rust bindings to the Windows SChannel APIs providing TLS client and server functionality.")
+    (license license:expat)))
+
+(define-public rust-scopeguard-0.3
+  (package
+    (inherit rust-scopeguard)
+    (name "rust-scopeguard")
+    (version "0.3.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "scopeguard" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl"))))))
+
+(define-public rust-scroll
+  (package
+    (name "rust-scroll")
+    (version "0.9.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "scroll" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "10q3w86bn22xrjlfg1c90dfi9c26qjkzn26nad0i9z8pxwad311g"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-scroll-derive" ,rust-scroll-derive)
+         ("rust-rustc-version" ,rust-rustc-version))
+        #:cargo-development-inputs
+        (("rust-byteorder" ,rust-byteorder)
+         ("rust-rayon" ,rust-rayon))))
+    (home-page "https://github.com/m4b/scroll")
+    (synopsis
+      "A suite of powerful, extensible, generic, endian-aware Read/Write traits for byte buffers")
+    (description
+      "This package provides a suite of powerful, extensible, generic, endian-aware Read/Write traits for byte buffers")
+    (license license:expat)))
+
+(define-public rust-scroll-derive
+  (package
+    (name "rust-scroll-derive")
+    (version "0.9.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "scroll_derive" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1jqg5mm8nvii6avl1z1rc89agzh2kwkppgpsnwfakxg78mnaj6lg"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-syn" ,rust-syn))
+        #:cargo-development-inputs
+        (("rust-scroll" ,rust-scroll))))
+    (home-page
+      "https://github.com/m4b/scroll_derive")
+    (synopsis
+      "A macros 1.1 derive implementation for Pread and Pwrite traits from the scroll crate")
+    (description
+      "This package provides a macros 1.1 derive implementation for Pread and Pwrite traits from the scroll crate")
+    (license license:expat)))
+
+(define-public rust-sct
+  (package
+    (name "rust-sct")
+    (version "0.6.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "sct" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0g4dz7las43kcpi9vqv9c6l1afjkdv3g3w3s7d2w7a7w77wjl173"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-ring" ,rust-ring)
+         ("rust-untrusted" ,rust-untrusted))))
+    (home-page "https://github.com/ctz/sct.rs")
+    (synopsis
+      "Certificate transparency SCT verification library")
+    (description
+      "Certificate transparency SCT verification library")
+    (license (list license:asl2.0
+                   license:isc
+                   license:expat))))
+
+(define-public rust-seahash ; guix upstreamable
+  (package
+    (name "rust-seahash")
+    (version "3.0.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "seahash" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1pr8ijnxnp68ki4m4740yc5mr01zijf86yx07wbsqzwiyhghdmhq"))))
+    (build-system cargo-build-system)
+    (home-page "https://gitlab.redox-os.org/redox-os/seahash")
+    (synopsis "Hash function with proven statistical guarantees")
+    (description "This package provides a blazingly fast, portable hash
+function with proven statistical guarantees.")
+    (license license:expat)))
+
+(define-public rust-security-framework
+  (package
+    (name "rust-security-framework")
+    (version "0.3.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "security-framework" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1hmdsdj061wk76g3fajbfjnw74p0q45hy8hfngp7diwy987kvrpf"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-core-foundation" ,rust-core-foundation)
+         ("rust-core-foundation-sys"
+          ,rust-core-foundation-sys)
+         ("rust-libc" ,rust-libc)
+         ("rust-security-framework-sys"
+          ,rust-security-framework-sys))
+        #:cargo-development-inputs
+        (("rust-hex" ,rust-hex)
+         ("rust-tempdir" ,rust-tempdir))))
+    (home-page
+      "https://lib.rs/crates/security_framework")
+    (synopsis
+      "Security.framework bindings for macOS and iOS")
+    (description
+      "Security.framework bindings for macOS and iOS")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-security-framework-sys
+  (package
+    (name "rust-security-framework-sys")
+    (version "0.3.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "security-framework-sys" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0mlsakq9kmqyc0fg2hcbgm6rjk55mb0rhjw2wid3hqdzkjcghdln"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-core-foundation-sys"
+          ,rust-core-foundation-sys))))
+    (home-page
+      "https://lib.rs/crates/security-framework-sys")
+    (synopsis
+      "Apple `Security.framework` low-level FFI bindings")
+    (description
+      "Apple `Security.framework` low-level FFI bindings")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-select-rustc
+  (package
+    (name "rust-select-rustc")
+    (version "0.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "select-rustc" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0daqd56smi93g59nz43n4mh3d8whr6j5pa8dmwlf8bd76mdy3cpx"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-syn" ,rust-syn))))
+    (home-page
+      "https://github.com/dtolnay/select-rustc")
+    (synopsis
+      "Conditional compilation according to rustc compiler version")
+    (description
+      "Conditional compilation according to rustc compiler version")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-semver
+  (package
+    (name "rust-semver")
+    (version "0.9.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "semver" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "00q4lkcj0rrgbhviv9sd4p6qmdsipkwkbra7rh11jrhq5kpvjzhx"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-semver-parser" ,rust-semver-parser-0.7)
+         ("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-crates-index" ,rust-crates-index)
+         ("rust-serde-derive" ,rust-serde-derive)
+         ("rust-serde-json" ,rust-serde-json)
+         ("rust-tempdir" ,rust-tempdir))))
+    (home-page "https://docs.rs/crate/semver/")
+    (synopsis
+      "Semantic version parsing and comparison.")
+    (description
+      "Semantic version parsing and comparison.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-semver-parser-0.7
+  (package
+    (inherit rust-semver-parser)
+    (name "rust-semver-parser")
+    (version "0.7.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "semver-parser" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq"))))))
+
+(define-public rust-serde
+  (package
+    (name "rust-serde")
+    (version "1.0.97")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0wlvfs82flb3di86m3nzf1m4vkc78vqcwrk865s0ldhrvgz3ssyl"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-serde-derive" ,rust-serde-derive))
+        #:cargo-development-inputs
+        (("rust-serde-derive" ,rust-serde-derive))))
+    (home-page "https://serde.rs")
+    (synopsis
+      "A generic serialization/deserialization framework")
+    (description
+      "This package provides a generic serialization/deserialization framework")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-serde-big-array
+  (package
+    (name "rust-serde-big-array")
+    (version "0.1.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde-big-array" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0gkyqxk760mp1lfcg6lhjk95ajc89nr0qdd0vl4ic0g8pyxcy9mr"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-serde" ,rust-serde)
+         ("rust-serde-derive" ,rust-serde-derive))
+        #:cargo-development-inputs
+        (("rust-serde-json" ,rust-serde-json))))
+    (home-page
+      "https://github.com/est31/serde-big-array")
+    (synopsis "Big array helper for serde.")
+    (description "Big array helper for serde.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-serde-bytes
+  (package
+    (name "rust-serde-bytes")
+    (version "0.11.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde_bytes" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0sc5n336i7q4fiij4l8f892zcirgybrbxzl8bp51qxzqdvdlgzxa"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-bincode" ,rust-bincode)
+         ("rust-serde-derive" ,rust-serde-derive)
+         ("rust-serde-test" ,rust-serde-test))))
+    (home-page "https://github.com/serde-rs/bytes")
+    (synopsis
+      "Optimized handling of `&[u8]` and `Vec<u8>` for Serde")
+    (description
+      "Optimized handling of `&[u8]` and `Vec<u8>` for Serde")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-serde-cbor
+  (package
+    (name "rust-serde-cbor")
+    (version "0.10.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde_cbor" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0jcb4j637vdlqk2z38jixaqmp6f92h36r17kclv5brjay32911ii"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-byteorder" ,rust-byteorder)
+         ("rust-half" ,rust-half)
+         ("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-serde-derive" ,rust-serde-derive))))
+    (home-page "https://github.com/pyfisch/cbor")
+    (synopsis "CBOR support for serde.")
+    (description "CBOR support for serde.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-serde-derive
+  (package
+    (name "rust-serde-derive")
+    (version "1.0.97")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde_derive" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0zq2qm2gabmpa57wxfxb09jl41nxccsk454715xjabzymlh0han2"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-syn" ,rust-syn))
+        #:cargo-development-inputs
+        (("rust-serde" ,rust-serde))))
+    (home-page "https://serde.rs")
+    (synopsis
+      "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]")
+    (description
+      "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-serde-json
+  (package
+    (name "rust-serde-json")
+    (version "1.0.40")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde_json" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "010pa89zx07aqx1cwgw2a603wcp3q5n2iy0k71ppqbr8kwi4j705"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-indexmap" ,rust-indexmap)
+        ("rust-itoa" ,rust-itoa)
+        ("rust-ryu" ,rust-ryu)
+        ("rust-serde" ,rust-serde))
+       #:cargo-development-inputs
+       (("rust-automod" ,rust-automod)
+        ("rust-select-rustc" ,rust-select-rustc)
+        ("rust-serde-bytes" ,rust-serde-bytes)
+        ("rust-serde-derive" ,rust-serde-derive)
+        ("rust-serde-stacker" ,rust-serde-stacker)
+        ("rust-trybuild" ,rust-trybuild))))
+    (home-page "https://github.com/serde-rs/json")
+    (synopsis "A JSON serialization file format")
+    (description
+      "This package provides a JSON serialization file format")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-serde-json-1.0.39
+  (package
+    (inherit rust-serde-json)
+    (name "rust-serde-json")
+    (version "1.0.39")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde_json" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "03fl9l680gij0hrsr2csfm8nm858igvfy05czbdkzm54siqsl8ss"))))))
+
+(define-public rust-serde-stacker
+  (package
+    (name "rust-serde-stacker")
+    (version "0.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde_stacker" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1jn54i5m1mlc6nm47f96k85fgjs9mhpbbqa4dvd5xjbivkdw55ic"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-serde" ,rust-serde)
+         ("rust-stacker" ,rust-stacker))
+        #:cargo-development-inputs
+        (("rust-serde-json" ,rust-serde-json))))
+    (home-page
+      "https://github.com/dtolnay/serde-stacker")
+    (synopsis
+      "Serde adapter that avoids stack overflow by dynamically growing the stack")
+    (description
+      "Serde adapter that avoids stack overflow by dynamically growing the stack")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-serde-test
+  (package
+    (name "rust-serde-test")
+    (version "1.0.97")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde_test" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0i17jdgy18rcp19v6h4shim27l99q3vc7pzr2xaa2g0rjq9p6lr2"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-serde" ,rust-serde)
+         ("rust-serde-derive" ,rust-serde-derive))))
+    (home-page "https://serde.rs")
+    (synopsis
+      "Token De/Serializer for testing De/Serialize implementations")
+    (description
+      "Token De/Serializer for testing De/Serialize implementations")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-serde-yaml
+  (package
+    (name "rust-serde-yaml")
+    (version "0.8.9")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde_yaml" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "10mmjpnshgrwij01a13679nxy1hnh5yfr0343kh0y9p5j2d8mc1q"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-dtoa" ,rust-dtoa)
+         ("rust-linked-hash-map" ,rust-linked-hash-map)
+         ("rust-serde" ,rust-serde)
+         ("rust-yaml-rust" ,rust-yaml-rust))
+        #:cargo-development-inputs
+        (("rust-serde-derive" ,rust-serde-derive)
+         ("rust-unindent" ,rust-unindent)
+         ("rust-version-sync" ,rust-version-sync))))
+    (home-page
+      "https://github.com/dtolnay/serde-yaml")
+    (synopsis "YAML support for Serde")
+    (description "YAML support for Serde")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-sha-1
+  (package
+    (name "rust-sha-1")
+    (version "0.8.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "sha-1" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0s6fdy5wp3x4h2z4fcl2d9vjvrpzr87v4h49r51xcq8nm4qj35i3"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-block-buffer" ,rust-block-buffer)
+         ("rust-digest" ,rust-digest)
+         ("rust-fake-simd" ,rust-fake-simd)
+         ("rust-opaque-debug" ,rust-opaque-debug)
+         ("rust-sha1-asm" ,rust-sha1-asm))
+        #:cargo-development-inputs
+        (("rust-digest" ,rust-digest)
+         ("rust-hex-literal" ,rust-hex-literal))))
+    (home-page
+      "https://github.com/RustCrypto/hashes")
+    (synopsis "SHA-1 hash function")
+    (description "SHA-1 hash function")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-sha1
   (package
-    (name "rust-redox-syscall")
-    (version "0.1.56")
+    (name "rust-sha1")
+    (version "0.6.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "redox_syscall" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "sha1" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "110y7dyfm2vci4x5vk7gr0q551dvp31npl99fnsx2fb17wzwcf94"))))
+          (base32
+            "03gs2q4m67rn2p8xcdfxhip6mpgahdwm12bnb3vh90ahv9grhy95"))))
     (build-system cargo-build-system)
-    (home-page "https://gitlab.redox-os.org/redox-os/syscall")
-    (synopsis "Rust library to access raw Redox system calls")
-    (description "This package provides a Rust library to access raw Redox
-system calls.")
-    (license license:expat)))
+    (arguments
+      `(#:cargo-inputs
+        (("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-openssl" ,rust-openssl)
+         ("rust-rand" ,rust-rand)
+         ("rust-serde-json" ,rust-serde-json))))
+    (home-page
+      "https://github.com/mitsuhiko/rust-sha1")
+    (synopsis
+      "Minimal implementation of SHA1 for Rust.")
+    (description
+      "Minimal implementation of SHA1 for Rust.")
+    (license license:bsd-3)))
 
-(define-public rust-redox-users
+(define-public rust-sleef-sys
   (package
-    (name "rust-redox-users")
-    (version "0.3.0")
+    (name "rust-sleef-sys")
+    (version "0.1.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "redox_users" version))
+        (uri (crate-uri "sleef-sys" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0a1q5jv76vj1mwmqf2mmhknmkpw5wndx91gjfgg7vs8p79621r9z"))))
+            "1881q2yc17j2m1yvh01447c93ws1mspnrj3k2nbvwbvcm8z81kkv"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-argon2rs" ,rust-argon2rs)
-         ("rust-failure" ,rust-failure)
-         ("rust-rand-os" ,rust-rand-os)
-         ("rust-redox-syscall" ,rust-redox-syscall))))
-    (home-page
-      "https://gitlab.redox-os.org/redox-os/users")
+        (("rust-cfg-if" ,rust-cfg-if)
+         ("rust-libc" ,rust-libc))
+        #:cargo-development-inputs
+        (("rust-bindgen" ,rust-bindgen)
+         ("rust-cmake" ,rust-cmake)
+         ("rust-env-logger" ,rust-env-logger))))
+    (home-page "https://github.com/gnzlbg/sleef-sys")
     (synopsis
-      "A Rust library to access Redox users and groups functionality")
+      "Rust FFI bindings to the SLEEF Vectorized Math Library")
     (description
-      "This package provides a Rust library to access Redox users and groups functionality")
-    (license #f)))
+      "Rust FFI bindings to the SLEEF Vectorized Math Library")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-ref-cast
+(define-public rust-slog
   (package
-    (name "rust-ref-cast")
-    (version "0.2.6")
+    (name "rust-slog")
+    (version "2.5.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "ref-cast" version))
+        (uri (crate-uri "slog" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0jgj1zxaikqm030flpifbp517fy4z21lly6ysbwyciii39bkzcf1"))))
+            "16bv6zrdn1sm315vbnia02g31xvsmbjyz5gv3z0vrgxdli0cdj8w"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-ref-cast-impl" ,rust-ref-cast-impl))))
-    (home-page "https://github.com/dtolnay/ref-cast")
+        (("rust-erased-serde" ,rust-erased-serde))))
+    (home-page "https://github.com/slog-rs/slog")
     (synopsis
-      "Safely cast &T to &U where the struct U contains a single field of type T.")
+      "Structured, extensible, composable logging for Rust")
     (description
-      "Safely cast &T to &U where the struct U contains a single field of type T.")
+      "Structured, extensible, composable logging for Rust")
     (license (list license:asl2.0
+                   license:mpl2.0
                    license:expat))))
 
-(define-public rust-ref-cast-impl
+(define-public rust-smallvec
   (package
-    (name "rust-ref-cast-impl")
-    (version "0.2.6")
+    (name "rust-smallvec")
+    (version "0.6.10")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "ref-cast-impl" version))
+        (uri (crate-uri "smallvec" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0hw0frpzna5rf5szix56zyzd0vackcb3svj94ndj629xi75dkb32"))))
+            "1dyl43rgzny79jjpgzi07y0ly2ggx1xwsn64csxj0j91bsf6lq5b"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote)
-         ("rust-syn" ,rust-syn))))
-    (home-page "https://github.com/dtolnay/ref-cast")
+        (("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-bincode" ,rust-bincode))))
+    (home-page
+      "https://github.com/servo/rust-smallvec")
     (synopsis
-      "Derive implementation for ref_cast::RefCast.")
+      "'Small vector' optimization for Rust: store up to a small number of items on the stack")
     (description
-      "Derive implementation for ref_cast::RefCast.")
+      "'Small vector' optimization for Rust: store up to a small number of items on the stack")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-regex
+(define-public rust-socket2
   (package
-    (name "rust-regex")
-    (version "1.2.0")
+    (name "rust-socket2")
+    (version "0.3.11")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "regex" version))
+        (uri (crate-uri "socket2" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1k6jpx0bqlg6vb8rsdnlmcw2szczbl51j047w3blpa4qzn6xl8vb"))))
+            "11bdcz04i106g4q7swkll0qxrb4287srqd2k3aq2q6i22zjlvdz8"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-aho-corasick" ,rust-aho-corasick)
-         ("rust-memchr" ,rust-memchr)
-         ("rust-regex-syntax" ,rust-regex-syntax)
-         ("rust-thread-local" ,rust-thread-local)
-         ("rust-utf8-ranges" ,rust-utf8-ranges))
+        (("rust-cfg-if" ,rust-cfg-if)
+         ("rust-libc" ,rust-libc)
+         ("rust-redox-syscall" ,rust-redox-syscall)
+         ("rust-winapi" ,rust-winapi))
         #:cargo-development-inputs
-        (("rust-doc-comment" ,rust-doc-comment)
-         ("rust-lazy-static" ,rust-lazy-static)
-         ("rust-quickcheck" ,rust-quickcheck)
-         ("rust-rand" ,rust-rand))))
-    (home-page "https://github.com/rust-lang/regex")
+        (("rust-tempdir" ,rust-tempdir))))
+    (home-page
+      "https://github.com/alexcrichton/socket2-rs")
     (synopsis
-      "An implementation of regular expressions for Rust. This implementation uses
-      finite automata and guarantees linear time matching on all inputs.")
+      "Utilities for handling networking sockets with a maximal amount of configuration possible intended.")
     (description
-      "An implementation of regular expressions for Rust.  This implementation uses
-      finite automata and guarantees linear time matching on all inputs.")
+      "Utilities for handling networking sockets with a maximal amount of configuration possible intended.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-regex-syntax
+(define-public rust-socks
   (package
-    (name "rust-regex-syntax")
-    (version "0.6.10")
+    (name "rust-socks")
+    (version "0.3.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "regex-syntax" version))
+        (uri (crate-uri "socks" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0p47lf38yj2g2fnmvnraccqlxwk35zr76hlnqi8yva932nzqam6d"))))
+            "1hnbw4c4j7dn9n3bd1v7ddkdzlxlzkfw3z29da1nxlj6jgx4r9p6"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-ucd-util" ,rust-ucd-util))))
-    (home-page "https://github.com/rust-lang/regex")
-    (synopsis "A regular expression parser.")
+        (("rust-byteorder" ,rust-byteorder)
+         ("rust-libc" ,rust-libc)
+         ("rust-winapi" ,rust-winapi)
+         ("rust-ws2-32-sys" ,rust-ws2-32-sys))))
+    (home-page "https://github.com/sfackler/rust-socks")
+    (synopsis
+      "SOCKS proxy support for Rust.")
     (description
-      "This package provides a regular expression parser.")
+      "SOCKS proxy support for Rust.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-remove-dir-all
+(define-public rust-sourcefile
   (package
-    (name "rust-remove-dir-all")
-    (version "0.5.2")
+    (name "rust-sourcefile")
+    (version "0.1.4")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "remove_dir_all" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "sourcefile" version))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0bkrlyg26mgizpiy1yb2hhpgscxcag8r5fnckqsvk25608vzm0sa"))))
+         (base32
+          "1lwa6973zs4bgj29my7agfjgk4nw9hp6j7dfnr13nid85fw7rxsb"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-winapi" ,rust-winapi))
-        #:cargo-development-inputs
-        (("rust-doc-comment" ,rust-doc-comment))))
-    (home-page
-      "https://github.com/XAMPPRocky/remove_dir_all.git")
+     `(#:cargo-development-inputs
+       (("rust-tempfile" ,rust-tempfile))))
+    (home-page "https://github.com/derekdreery/sourcefile-rs")
     (synopsis
-      "A safe, reliable implementation of remove_dir_all for Windows")
+      "A library for concatenating source from multiple files, whilst keeping track of where each new file and line starts.")
     (description
-      "This package provides a safe, reliable implementation of remove_dir_all for Windows")
+      "A library for concatenating source from multiple files, whilst keeping track of where each new file and line starts.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-ron
+(define-public rust-spmc
   (package
-    (name "rust-ron")
-    (version "0.5.1")
+    (name "rust-spmc")
+    (version "0.3.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "ron" version))
+        (uri (crate-uri "spmc" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1mb2bavvp8jg5wx0kx9n45anrsbjwhjzddim987bjaa11hg45kif"))))
+            "1rgcqgj6b3d0cshi7277akr2xk0cx11rkmviaahy7a3pla6l5a02"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-base64" ,rust-base64)
-         ("rust-bitflags" ,rust-bitflags)
-         ("rust-serde" ,rust-serde))
-        #:cargo-development-inputs
-        (("rust-serde-bytes" ,rust-serde-bytes)
-         ("rust-serde-json" ,rust-serde-json))))
-    (home-page "https://github.com/ron-rs/ron")
-    (synopsis "Rusty Object Notation")
-    (description "Rusty Object Notation")
+      `(#:cargo-development-inputs
+        (("rust-loom" ,rust-loom))))
+    (home-page
+      "https://github.com/seanmonstar/spmc")
+    (synopsis
+      "Simple SPMC channel")
+    (description
+      "Simple SPMC channel")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rustc-demangle
+(define-public rust-stable-deref-trait
   (package
-    (name "rust-rustc-demangle")
-    (version "0.1.15")
+    (name "rust-stable-deref-trait")
+    (version "1.1.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rustc-demangle" version))
+        (uri (crate-uri "stable_deref_trait" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1brqf2bknkxsdzn3kd3wfifvzfc33bmvdy9r1k6fp4a8dz7xrx57"))))
+            "1j2lkgakksmz4vc5hfawcch2ipiskrhjs1sih0f3br7s7rys58fv"))))
     (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-compiler-builtins"
-          ,rust-compiler-builtins)
-         ("rust-rustc-std-workspace-core"
-          ,rust-rustc-std-workspace-core))))
     (home-page
-      "https://github.com/alexcrichton/rustc-demangle")
-    (synopsis "Rust compiler symbol demangling.")
+      "https://github.com/storyyeller/stable_deref_trait0")
+    (synopsis
+      "This crate defines an unsafe marker trait, StableDeref, for container types which deref to a fixed address which is valid even when the containing type is moved. For example, Box, Vec, Rc, Arc and String implement this trait. Additionally, it defines CloneStableDeref for types like Rc where clones deref to the same address.")
     (description
-      "Rust compiler symbol demangling.")
+      "This crate defines an unsafe marker trait, StableDeref, for container types which deref to a fixed address which is valid even when the containing type is moved. For example, Box, Vec, Rc, Arc and String implement this trait. Additionally, it defines CloneStableDeref for types like Rc where clones deref to the same address.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rustc-serialize
+(define-public rust-stacker
   (package
-    (name "rust-rustc-serialize")
-    (version "0.3.24")
+    (name "rust-stacker")
+    (version "0.1.5")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rustc-serialize" version))
+        (uri (crate-uri "stacker" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1nkg3vasg7nk80ffkazizgiyv3hb1l9g3d8h17cajbkx538jiwfw"))))
+            "0js0axz5nla1mkr2dm2vrv9rj964ng1lrv4l43sqlnfgawplhygv"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-development-inputs
-        (("rust-rand" ,rust-rand-0.3))))
+      `(#:cargo-inputs
+        (("rust-cfg-if" ,rust-cfg-if)
+         ("rust-libc" ,rust-libc)
+         ("rust-winapi" ,rust-winapi)
+         ("rust-cc" ,rust-cc))))
     (home-page
-      "https://github.com/rust-lang/rustc-serialize")
+      "https://github.com/alexcrichton/stacker")
     (synopsis
-      "Generic serialization/deserialization support corresponding to the `derive(RustcEncodable, RustcDecodable)` mode in the compiler. Also includes support for hex, base64, and json encoding and decoding.")
+      "A stack growth library useful when implementing deeply recursive algorithms that
+      may accidentally blow the stack.")
     (description
-      "Generic serialization/deserialization support corresponding to the `derive(RustcEncodable, RustcDecodable)` mode in the compiler. Also includes support for hex, base64, and json encoding and decoding.")
+      "This package provides a stack growth library useful when implementing deeply recursive algorithms that
+      may accidentally blow the stack.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rustc-test
+(define-public rust-stdweb
   (package
-    (name "rust-rustc-test")
-    (version "0.3.0")
+    (name "rust-stdweb")
+    (version "0.4.18")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rustc-test" version))
+        (uri (crate-uri "stdweb" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0a27mlcg0ck0hgsdvwk792x9z1k1qq1wj091f1l5yggbdbcsnx5w"))))
+            "1srsjarj36f57ibr63n70bgy250yb72a73g14b80wh7piki0r356"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-getopts" ,rust-getopts)
-         ("rust-libc" ,rust-libc)
-         ("rust-rustc-serialize" ,rust-rustc-serialize)
-         ("rust-term" ,rust-term)
-         ("rust-time" ,rust-time))
+        (("rust-discard" ,rust-discard)
+         ("rust-futures-channel-preview"
+          ,rust-futures-channel-preview)
+         ("rust-futures-core-preview"
+          ,rust-futures-core-preview)
+         ("rust-futures-executor-preview"
+          ,rust-futures-executor-preview)
+         ("rust-futures-util-preview"
+          ,rust-futures-util-preview)
+         ("rust-rustc-version" ,rust-rustc-version)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-json" ,rust-serde-json)
+         ("rust-stdweb-derive" ,rust-stdweb-derive)
+         ("rust-stdweb-internal-macros"
+          ,rust-stdweb-internal-macros)
+         ("rust-stdweb-internal-runtime"
+          ,rust-stdweb-internal-runtime)
+         ("rust-wasm-bindgen" ,rust-wasm-bindgen))
         #:cargo-development-inputs
-        (("rust-rustc-version" ,rust-rustc-version))))
-    (home-page
-      "https://github.com/SimonSapin/rustc-test")
+        (("rust-rustc-version" ,rust-rustc-version)
+         ("rust-serde-derive" ,rust-serde-derive)
+         ("rust-serde-json" ,rust-serde-json)
+         ("rust-stdweb-internal-test-macro"
+          ,rust-stdweb-internal-test-macro)
+         ("rust-wasm-bindgen-test"
+          ,rust-wasm-bindgen-test))))
+    (home-page "https://github.com/koute/stdweb")
     (synopsis
-      "A fork of Rustâ\x80\x99s `test` crate that doesnâ\x80\x99t require unstable language features.")
+      "A standard library for the client-side Web")
     (description
-      "This package provides a fork of Rustâ\x80\x99s `test` crate that doesnâ\x80\x99t require unstable language features.")
+      "This package provides a standard library for the client-side Web")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-rustc-version
+(define-public rust-stdweb-derive
   (package
-    (name "rust-rustc-version")
-    (version "0.2.3")
+    (name "rust-stdweb-derive")
+    (version "0.5.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rustc_version" version))
+        (uri (crate-uri "stdweb-derive" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "02h3x57lcr8l2pm0a645s9whdh33pn5cnrwvn5cb57vcrc53x3hk"))))
+            "0c1rxx6rqcc4iic5hx320ki3vshpi8k58m5600iqzq4x2zcyn88f"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs (("rust-semver" ,rust-semver))))
-    (home-page
-      "https://github.com/Kimundi/rustc-version-rs")
-    (synopsis
-      "A library for querying the version of a installed rustc compiler")
+      `(#:cargo-inputs
+        (("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-derive" ,rust-serde-derive)
+         ("rust-syn" ,rust-syn))))
+    (home-page "https://github.com/koute/stdweb")
+    (synopsis "Derive macros for the `stdweb` crate")
     (description
-      "This package provides a library for querying the version of a installed rustc compiler")
+      "Derive macros for the `stdweb` crate")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-ryu
+(define-public rust-stdweb-internal-macros
   (package
-    (name "rust-ryu")
-    (version "1.0.0")
+    (name "rust-stdweb-internal-macros")
+    (version "0.2.7")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "ryu" version))
+        (uri (crate-uri "stdweb-internal-macros" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "15r9z2wzgbj04pks4jz7y6wif5xqhf1wqkl2nd7qrvn08ys68969"))))
+            "1yjrmkc6sb1035avic383pa3avk2s9k3n17yjcza8yb9nw47v3z6"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-no-panic" ,rust-no-panic))
-        #:cargo-development-inputs
-        (("rust-num-cpus" ,rust-num-cpus)
-         ("rust-rand" ,rust-rand))))
-    (home-page "https://github.com/dtolnay/ryu")
+        (("rust-base-x" ,rust-base-x)
+         ("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-derive" ,rust-serde-derive)
+         ("rust-serde-json" ,rust-serde-json)
+         ("rust-sha1" ,rust-sha1)
+         ("rust-syn" ,rust-syn))))
+    (home-page "https://github.com/koute/stdweb")
     (synopsis
-      "Fast floating point to string conversion")
+      "Internal procedural macros for the `stdweb` crate")
     (description
-      "Fast floating point to string conversion")
+      "Internal procedural macros for the `stdweb` crate")
     (license (list license:asl2.0
-                   license:boost1.0))))
+                   license:expat))))
 
-(define-public rust-same-file
+(define-public rust-stdweb-internal-test-macro
   (package
-    (name "rust-same-file")
-    (version "1.0.5")
+    (name "rust-stdweb-internal-test-macro")
+    (version "0.1.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "same-file" version))
+        (uri (crate-uri "stdweb-internal-test-macro" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "08a4zy10pjindf2rah320s6shgswk13mqw7s61m8i1y1xpf8spjq"))))
+            "12rrm7p77xnm3xacgn3rgniiyyjb4gq7902wpbljsvbx045z69l2"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-winapi-util" ,rust-winapi-util))))
-    (home-page
-      "https://github.com/BurntSushi/same-file")
-    (synopsis
-      "A simple crate for determining whether two file paths point to the same file.")
+        (("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote))))
+    (home-page "https://github.com/koute/stdweb")
+    (synopsis "Internal crate of the `stdweb` crate")
     (description
-      "This package provides a simple crate for determining whether two file paths point to the same file.")
-    (license (list license:unlicense
+      "Internal crate of the `stdweb` crate")
+    (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-scopeguard-0.3
+(define-public rust-stream-cipher
   (package
-    (inherit rust-scopeguard)
-    (name "rust-scopeguard")
-    (version "0.3.3")
+    (name "rust-stream-cipher")
+    (version "0.3.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "scopeguard" version))
+        (uri (crate-uri "stream-cipher" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl"))))))
+          (base32
+            "1g1nd8r6pph70rzk5yyvg7a9ji7pkap9ddiqpp4v9xa9ys0bqqc8"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-blobby" ,rust-blobby)
+         ("rust-generic-array" ,rust-generic-array))))
+    (home-page
+      "https://github.com/RustCrypto/traits")
+    (synopsis "Stream cipher traits")
+    (description "Stream cipher traits")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-scroll
+(define-public rust-streaming-stats
   (package
-    (name "rust-scroll")
-    (version "0.9.2")
+    (name "rust-streaming-stats")
+    (version "0.2.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "scroll" version))
+        (uri (crate-uri "streaming-stats" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "10q3w86bn22xrjlfg1c90dfi9c26qjkzn26nad0i9z8pxwad311g"))))
+            "0l7xz4g6709s80zqpvlhrg0qhgz64r94cwhmfsg8xhabgznbp2px"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-scroll-derive" ,rust-scroll-derive)
-         ("rust-rustc-version" ,rust-rustc-version))
-        #:cargo-development-inputs
-        (("rust-byteorder" ,rust-byteorder)
-         ("rust-rayon" ,rust-rayon))))
-    (home-page "https://github.com/m4b/scroll")
+        (("rust-num-traits" ,rust-num-traits))))
+    (home-page
+      "https://github.com/BurntSushi/rust-stats")
     (synopsis
-      "A suite of powerful, extensible, generic, endian-aware Read/Write traits for byte buffers")
+      "Experimental crate for computing basic statistics on streams.")
     (description
-      "This package provides a suite of powerful, extensible, generic, endian-aware Read/Write traits for byte buffers")
-    (license license:expat)))
+      "Experimental crate for computing basic statistics on streams.")
+    (license (list license:unlicense
+                   license:expat))))
 
-(define-public rust-scroll-derive
+(define-public rust-string
   (package
-    (name "rust-scroll-derive")
-    (version "0.9.5")
+    (name "rust-string")
+    (version "0.2.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "scroll_derive" version))
+        (uri (crate-uri "string" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1jqg5mm8nvii6avl1z1rc89agzh2kwkppgpsnwfakxg78mnaj6lg"))))
+            "0vaxz85ja52fn66akgvggb29wqa5bpj3y38syykpr1pbrjzi8hfj"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote)
-         ("rust-syn" ,rust-syn))
-        #:cargo-development-inputs
-        (("rust-scroll" ,rust-scroll))))
+      `(#:cargo-inputs (("rust-bytes" ,rust-bytes))))
     (home-page
-      "https://github.com/m4b/scroll_derive")
+      "https://github.com/carllerche/string")
     (synopsis
-      "A macros 1.1 derive implementation for Pread and Pwrite traits from the scroll crate")
+      "A UTF-8 encoded string with configurable byte storage.")
     (description
-      "This package provides a macros 1.1 derive implementation for Pread and Pwrite traits from the scroll crate")
+      "This package provides a UTF-8 encoded string with configurable byte storage.")
     (license license:expat)))
 
-(define-public rust-seahash ; guix upstreamable
+(define-public rust-strsim-0.8
   (package
-    (name "rust-seahash")
-    (version "3.0.6")
+    (inherit rust-strsim)
+    (name "rust-strsim")
+    (version "0.8.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "seahash" version))
+        (uri (crate-uri "strsim" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1pr8ijnxnp68ki4m4740yc5mr01zijf86yx07wbsqzwiyhghdmhq"))))
-    (build-system cargo-build-system)
-    (home-page "https://gitlab.redox-os.org/redox-os/seahash")
-    (synopsis "Hash function with proven statistical guarantees")
-    (description "This package provides a blazingly fast, portable hash
-function with proven statistical guarantees.")
-    (license license:expat)))
+          "0sjsm7hrvjdifz661pjxq5w4hf190hx53fra8dfvamacvff139cf"))))))
 
-(define-public rust-select-rustc
+(define-public rust-structopt
   (package
-    (name "rust-select-rustc")
-    (version "0.1.2")
+    (name "rust-structopt")
+    (version "0.2.18")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "select-rustc" version))
+        (uri (crate-uri "structopt" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0daqd56smi93g59nz43n4mh3d8whr6j5pa8dmwlf8bd76mdy3cpx"))))
+         (base32
+          "1mvfv1l8vp3y402fkl2wcl34hi7gmr4bqha13dfz2xf3kjzwvhhn"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote)
-         ("rust-syn" ,rust-syn))))
+        (("rust-clap" ,rust-clap)
+         ("rust-structopt-derive" ,rust-structopt-derive))))
     (home-page
-      "https://github.com/dtolnay/select-rustc")
+      "https://github.com/TeXitoi/structopt")
     (synopsis
-      "Conditional compilation according to rustc compiler version")
+      "Parse command line argument by defining a struct.")
     (description
-      "Conditional compilation according to rustc compiler version")
+      "Parse command line argument by defining a struct.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-semver
+(define-public rust-structopt-derive
   (package
-    (name "rust-semver")
-    (version "0.9.0")
+    (name "rust-structopt-derive")
+    (version "0.2.18")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "semver" version))
+        (uri (crate-uri "structopt-derive" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "00q4lkcj0rrgbhviv9sd4p6qmdsipkwkbra7rh11jrhq5kpvjzhx"))))
+            "01sis9z5kqmyhvzbnmlzpdxcry99a0b9blypksgnhdsbm1hh40ak"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-semver-parser" ,rust-semver-parser-0.7)
-         ("rust-serde" ,rust-serde))
-        #:cargo-development-inputs
-        (("rust-crates-index" ,rust-crates-index)
-         ("rust-serde-derive" ,rust-serde-derive)
-         ("rust-serde-json" ,rust-serde-json)
-         ("rust-tempdir" ,rust-tempdir))))
-    (home-page "https://docs.rs/crate/semver/")
+        (("rust-heck" ,rust-heck)
+         ("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-syn" ,rust-syn))))
+    (home-page
+      "https://github.com/TeXitoi/structopt")
     (synopsis
-      "Semantic version parsing and comparison.")
+      "Parse command line argument by defining a struct, derive crate.")
     (description
-      "Semantic version parsing and comparison.")
+      "Parse command line argument by defining a struct, derive crate.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-semver-parser-0.7
+(define-public rust-syn
   (package
-    (inherit rust-semver-parser)
-    (name "rust-semver-parser")
-    (version "0.7.0")
+    (name "rust-syn")
+    (version "0.15.42")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "semver-parser" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "syn" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq"))))))
+          (base32
+            "0png5pz7jjjj39xy8w7qr65y3s9qam0jpz6nbmal06m5dhq0kp7a"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-unicode-xid" ,rust-unicode-xid))
+        #:cargo-development-inputs
+        (("rust-insta" ,rust-insta)
+         ("rust-rayon" ,rust-rayon)
+         ("rust-ref-cast" ,rust-ref-cast)
+         ("rust-regex" ,rust-regex)
+         ("rust-termcolor" ,rust-termcolor)
+         ("rust-walkdir" ,rust-walkdir))))
+    (home-page "https://github.com/dtolnay/syn")
+    (synopsis "Parser for Rust source code")
+    (description "Parser for Rust source code")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-serde
+(define-public rust-synstructure
   (package
-    (name "rust-serde")
-    (version "1.0.97")
+    (name "rust-synstructure")
+    (version "0.11.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "serde" version))
+        (uri (crate-uri "synstructure" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0wlvfs82flb3di86m3nzf1m4vkc78vqcwrk865s0ldhrvgz3ssyl"))))
+            "1spqy31qcss57mciklc4nky4v778fvqs9qwdjgvnmf0hr5ichcca"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-serde-derive" ,rust-serde-derive))
+        (("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-syn" ,rust-syn)
+         ("rust-unicode-xid" ,rust-unicode-xid))
         #:cargo-development-inputs
-        (("rust-serde-derive" ,rust-serde-derive))))
-    (home-page "https://serde.rs")
+        (("rust-synstructure-test-traits"
+          ,rust-synstructure-test-traits))))
+    (home-page
+      "https://github.com/mystor/synstructure")
     (synopsis
-      "A generic serialization/deserialization framework")
+      "Helper methods and macros for custom derives")
     (description
-      "This package provides a generic serialization/deserialization framework")
-    (license (list license:asl2.0
-                   license:expat))))
+      "Helper methods and macros for custom derives")
+    (license license:expat)))
 
-(define-public rust-serde-big-array
+(define-public rust-tar
   (package
-    (name "rust-serde-big-array")
-    (version "0.1.5")
+    (name "rust-tar")
+    (version "0.4.26")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "serde-big-array" version))
+        (uri (crate-uri "tar" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0gkyqxk760mp1lfcg6lhjk95ajc89nr0qdd0vl4ic0g8pyxcy9mr"))))
+            "1lr6v3cpkfxd2lk5ll2jd8wr1xdskwj35smnh5sfb8xvzzxnn6dk"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-serde" ,rust-serde)
-         ("rust-serde-derive" ,rust-serde-derive))
+        (("rust-filetime" ,rust-filetime)
+         ("rust-libc" ,rust-libc)
+         ("rust-redox-syscall" ,rust-redox-syscall)
+         ("rust-xattr" ,rust-xattr))
         #:cargo-development-inputs
-        (("rust-serde-json" ,rust-serde-json))))
+        (("rust-tempdir" ,rust-tempdir))))
     (home-page
-      "https://github.com/est31/serde-big-array")
-    (synopsis "Big array helper for serde.")
-    (description "Big array helper for serde.")
+      "https://github.com/alexcrichton/tar-rs")
+    (synopsis
+      "A Rust implementation of a TAR file reader and writer. This library does not
+      currently handle compression, but it is abstract over all I/O readers and
+      writers. Additionally, great lengths are taken to ensure that the entire
+      contents are never required to be entirely resident in memory all at once.")
+    (description
+      "This package provides a Rust implementation of a TAR file reader and writer.  This library does not
+        currently handle compression, but it is abstract over all I/O readers and
+        writers.  Additionally, great lengths are taken to ensure that the entire
+        contents are never required to be entirely resident in memory all at once.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-serde-bytes
+(define-public rust-target-lexicon
   (package
-    (name "rust-serde-bytes")
-    (version "0.11.1")
+    (name "rust-target-lexicon")
+    (version "0.4.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "serde_bytes" version))
+        (uri (crate-uri "target-lexicon" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0sc5n336i7q4fiij4l8f892zcirgybrbxzl8bp51qxzqdvdlgzxa"))))
+            "1jrdch22pvm8r9fwx6d051l4yhac16lq6sn4q5fc6ic95fcb82hv"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-serde" ,rust-serde))
-        #:cargo-development-inputs
-        (("rust-bincode" ,rust-bincode)
-         ("rust-serde-derive" ,rust-serde-derive)
-         ("rust-serde-test" ,rust-serde-test))))
-    (home-page "https://github.com/serde-rs/bytes")
+     `(#:cargo-inputs
+       (("rust-failure" ,rust-failure)
+        ("rust-failure-derive" ,rust-failure-derive)
+        ("rust-serde-json" ,rust-serde-json))))
+    (home-page "https://github.com/CraneStation/target-lexicon")
     (synopsis
-      "Optimized handling of `&[u8]` and `Vec<u8>` for Serde")
+      "This is a library for managing targets for compilers and related tools.")
     (description
-      "Optimized handling of `&[u8]` and `Vec<u8>` for Serde")
-    (license (list license:asl2.0
-                   license:expat))))
+      "This is a library for managing targets for compilers and related tools.")
+    (license license:asl2.0))) ; with LLVM exception
 
-(define-public rust-serde-cbor
+(define-public rust-tempdir
   (package
-    (name "rust-serde-cbor")
-    (version "0.10.1")
+    (name "rust-tempdir")
+    (version "0.3.7")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "serde_cbor" version))
+        (uri (crate-uri "tempdir" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0jcb4j637vdlqk2z38jixaqmp6f92h36r17kclv5brjay32911ii"))))
+            "1n5n86zxpgd85y0mswrp5cfdisizq2rv3la906g6ipyc03xvbwhm"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-byteorder" ,rust-byteorder)
-         ("rust-half" ,rust-half)
-         ("rust-serde" ,rust-serde))
-        #:cargo-development-inputs
-        (("rust-serde-derive" ,rust-serde-derive))))
-    (home-page "https://github.com/pyfisch/cbor")
-    (synopsis "CBOR support for serde.")
-    (description "CBOR support for serde.")
+        (("rust-rand" ,rust-rand-0.4)
+         ("rust-remove-dir-all" ,rust-remove-dir-all))))
+    (home-page
+      "https://github.com/rust-lang/tempdir")
+    (synopsis
+      "A library for managing a temporary directory and deleting all contents when it's dropped.")
+    (description
+      "This package provides a library for managing a temporary directory and deleting all contents when it's dropped.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-serde-derive
+(define-public rust-tempfile
   (package
-    (name "rust-serde-derive")
-    (version "1.0.97")
+    (name "rust-tempfile")
+    (version "3.1.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "serde_derive" version))
+        (uri (crate-uri "tempfile" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0zq2qm2gabmpa57wxfxb09jl41nxccsk454715xjabzymlh0han2"))))
+            "1a9cfdqw70n7bcnkx05aih9xdba8lqazmqlkjpkmn2la6gcj8vks"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote)
-         ("rust-syn" ,rust-syn))
-        #:cargo-development-inputs
-        (("rust-serde" ,rust-serde))))
-    (home-page "https://serde.rs")
+        (("rust-cfg-if" ,rust-cfg-if)
+         ("rust-libc" ,rust-libc)
+         ("rust-rand" ,rust-rand)
+         ("rust-redox-syscall" ,rust-redox-syscall)
+         ("rust-remove-dir-all" ,rust-remove-dir-all)
+         ("rust-winapi" ,rust-winapi))))
+    (home-page
+      "http://stebalien.com/projects/tempfile-rs")
     (synopsis
-      "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]")
+      "A library for managing temporary files and directories.")
     (description
-      "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]")
+      "This package provides a library for managing temporary files and directories.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-serde-json
+(define-public rust-term
   (package
-    (name "rust-serde-json")
-    (version "1.0.40")
+    (name "rust-term")
+    (version "0.5.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "serde_json" version))
+        (uri (crate-uri "term" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "010pa89zx07aqx1cwgw2a603wcp3q5n2iy0k71ppqbr8kwi4j705"))))
+          (base32
+            "0hkgjrfisj6zjwz525639pmsvzhlc48a0h65nw87qrdp6jihdlgd"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-indexmap" ,rust-indexmap)
-        ("rust-itoa" ,rust-itoa)
-        ("rust-ryu" ,rust-ryu)
-        ("rust-serde" ,rust-serde))
-       #:cargo-development-inputs
-       (("rust-automod" ,rust-automod)
-        ("rust-select-rustc" ,rust-select-rustc)
-        ("rust-serde-bytes" ,rust-serde-bytes)
-        ("rust-serde-derive" ,rust-serde-derive)
-        ("rust-serde-stacker" ,rust-serde-stacker)
-        ("rust-trybuild" ,rust-trybuild))))
-    (home-page "https://github.com/serde-rs/json")
-    (synopsis "A JSON serialization file format")
+      `(#:cargo-inputs
+        (("rust-byteorder" ,rust-byteorder)
+         ("rust-dirs" ,rust-dirs)
+         ("rust-winapi" ,rust-winapi))))
+    (home-page "https://github.com/Stebalien/term")
+    (synopsis "A terminal formatting library")
     (description
-      "This package provides a JSON serialization file format")
+      "This package provides a terminal formatting library")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-serde-json-1.0.39
-  (package
-    (inherit rust-serde-json)
-    (name "rust-serde-json")
-    (version "1.0.39")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "serde_json" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "03fl9l680gij0hrsr2csfm8nm858igvfy05czbdkzm54siqsl8ss"))))))
-
-(define-public rust-serde-stacker
+(define-public rust-term-size
   (package
-    (name "rust-serde-stacker")
-    (version "0.1.0")
+    (name "rust-term-size")
+    (version "1.0.0-beta1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "serde_stacker" version))
+        (uri (crate-uri "term_size" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1jn54i5m1mlc6nm47f96k85fgjs9mhpbbqa4dvd5xjbivkdw55ic"))))
+            "13w9cqjhzh3mmx6zami8lxyf42xx53yy866zxhxqcm71k637v8d8"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-serde" ,rust-serde)
-         ("rust-stacker" ,rust-stacker))
-        #:cargo-development-inputs
-        (("rust-serde-json" ,rust-serde-json))))
+        (("rust-clippy" ,rust-clippy)
+         ;("rust-kernel32-sys" ,rust-kernel32-sys) ; windows
+         ("rust-libc" ,rust-libc)
+         ("rust-winapi" ,rust-winapi))))
     (home-page
-      "https://github.com/dtolnay/serde-stacker")
+      "https://github.com/kbknapp/term_size-rs.git")
     (synopsis
-      "Serde adapter that avoids stack overflow by dynamically growing the stack")
+      "functions for determining terminal sizes and dimensions")
     (description
-      "Serde adapter that avoids stack overflow by dynamically growing the stack")
+      "functions for determining terminal sizes and dimensions")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-serde-test
+(define-public rust-termcolor
   (package
-    (name "rust-serde-test")
-    (version "1.0.97")
+    (name "rust-termcolor")
+    (version "1.0.5")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "serde_test" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "termcolor" version))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0i17jdgy18rcp19v6h4shim27l99q3vc7pzr2xaa2g0rjq9p6lr2"))))
+         (base32
+          "0vjfsn1a8zvqhnrbygrz1id6yckwv1dncw3w4zj65qdx0f00kmln"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-serde" ,rust-serde))
-        #:cargo-development-inputs
-        (("rust-serde" ,rust-serde)
-         ("rust-serde-derive" ,rust-serde-derive))))
-    (home-page "https://serde.rs")
-    (synopsis
-      "Token De/Serializer for testing De/Serialize implementations")
-    (description
-      "Token De/Serializer for testing De/Serialize implementations")
-    (license (list license:asl2.0
+     `(#:cargo-inputs
+       (("rust-wincolor" ,rust-wincolor))))
+    (home-page "https://github.com/BurntSushi/termcolor")
+    (synopsis "Library for writing colored text to a terminal")
+    (description "This package provides a simple cross platform library for
+writing colored text to a terminal.")
+    (license (list license:unlicense
                    license:expat))))
 
-(define-public rust-serde-yaml
+(define-public rust-termios
   (package
-    (name "rust-serde-yaml")
-    (version "0.8.9")
+    (name "rust-termios")
+    (version "0.3.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "serde_yaml" version))
+        (uri (crate-uri "termios" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "10mmjpnshgrwij01a13679nxy1hnh5yfr0343kh0y9p5j2d8mc1q"))))
+            "09any1p4jp4bphvb5ikagnvwjc3xn2djchy96nkpa782xb2j1dkj"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-dtoa" ,rust-dtoa)
-         ("rust-linked-hash-map" ,rust-linked-hash-map)
-         ("rust-serde" ,rust-serde)
-         ("rust-yaml-rust" ,rust-yaml-rust))
-        #:cargo-development-inputs
-        (("rust-serde-derive" ,rust-serde-derive)
-         ("rust-unindent" ,rust-unindent)
-         ("rust-version-sync" ,rust-version-sync))))
+      `(#:cargo-inputs (("rust-libc" ,rust-libc))))
     (home-page
-      "https://github.com/dtolnay/serde-yaml")
-    (synopsis "YAML support for Serde")
-    (description "YAML support for Serde")
-    (license (list license:asl2.0
-                   license:expat))))
+      "https://github.com/dcuddeback/termios-rs")
+    (synopsis
+      "Safe bindings for the termios library.")
+    (description
+      "Safe bindings for the termios library.")
+    (license license:expat)))
 
-(define-public rust-sha-1
-  (package
-    (name "rust-sha-1")
-    (version "0.8.1")
+(define-public rust-test-assembler
+  (package
+    (name "rust-test-assembler")
+    (version "0.1.5")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "sha-1" version))
+        (uri (crate-uri "test-assembler" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0s6fdy5wp3x4h2z4fcl2d9vjvrpzr87v4h49r51xcq8nm4qj35i3"))))
+            "1sdx9hk0dk3z9crm8834ysyxsi92chls8arpd0gs796kis6lik2w"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-block-buffer" ,rust-block-buffer)
-         ("rust-digest" ,rust-digest)
-         ("rust-fake-simd" ,rust-fake-simd)
-         ("rust-opaque-debug" ,rust-opaque-debug)
-         ("rust-sha1-asm" ,rust-sha1-asm))
-        #:cargo-development-inputs
-        (("rust-digest" ,rust-digest)
-         ("rust-hex-literal" ,rust-hex-literal))))
+        (("rust-byteorder" ,rust-byteorder))))
     (home-page
-      "https://github.com/RustCrypto/hashes")
-    (synopsis "SHA-1 hash function")
-    (description "SHA-1 hash function")
-    (license (list license:asl2.0
-                   license:expat))))
+      "https://github.com/luser/rust-test-assembler")
+    (synopsis
+      "A set of types for building complex binary streams.")
+    (description
+      "This package provides a set of types for building complex binary streams.")
+    (license license:expat)))
 
-(define-public rust-sha1
+(define-public rust-textwrap
   (package
-    (name "rust-sha1")
-    (version "0.6.0")
+    (name "rust-textwrap")
+    (version "0.11.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "sha1" version))
+        (uri (crate-uri "textwrap" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "03gs2q4m67rn2p8xcdfxhip6mpgahdwm12bnb3vh90ahv9grhy95"))))
+            "0q5hky03ik3y50s9sz25r438bc4nwhqc6dqwynv4wylc807n29nk"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-serde" ,rust-serde))
+        (("rust-hyphenation" ,rust-hyphenation)
+         ("rust-term-size" ,rust-term-size)
+         ("rust-unicode-width" ,rust-unicode-width))
         #:cargo-development-inputs
-        (("rust-openssl" ,rust-openssl)
+        (("rust-lipsum" ,rust-lipsum)
          ("rust-rand" ,rust-rand)
-         ("rust-serde-json" ,rust-serde-json))))
+         ("rust-rand-xorshift" ,rust-rand-xorshift)
+         ("rust-version-sync" ,rust-version-sync))))
     (home-page
-      "https://github.com/mitsuhiko/rust-sha1")
+      "https://github.com/mgeisler/textwrap")
     (synopsis
-      "Minimal implementation of SHA1 for Rust.")
+      "Textwrap is a small library for word wrapping, indenting, and
+      dedenting strings.
+
+      You can use it to format strings (such as help and error messages) for
+      display in commandline applications. It is designed to be efficient
+      and handle Unicode characters correctly.")
     (description
-      "Minimal implementation of SHA1 for Rust.")
-    (license license:bsd-3)))
+      "Textwrap is a small library for word wrapping, indenting, and
+      dedenting strings.
 
-(define-public rust-sleef-sys
+      You can use it to format strings (such as help and error messages) for
+      display in commandline applications.  It is designed to be efficient
+      and handle Unicode characters correctly.")
+    (license license:expat)))
+
+(define-public rust-thread-id
   (package
-    (name "rust-sleef-sys")
-    (version "0.1.2")
+    (name "rust-thread-id")
+    (version "3.3.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "sleef-sys" version))
+        (uri (crate-uri "thread-id" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1881q2yc17j2m1yvh01447c93ws1mspnrj3k2nbvwbvcm8z81kkv"))))
+            "1h90v19fjz3x9b25ywh68z5yf2zsmm6h5zb4rl302ckbsp4z9yy7"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-cfg-if" ,rust-cfg-if)
-         ("rust-libc" ,rust-libc))
-        #:cargo-development-inputs
-        (("rust-bindgen" ,rust-bindgen)
-         ("rust-cmake" ,rust-cmake)
-         ("rust-env-logger" ,rust-env-logger))))
-    (home-page "https://github.com/gnzlbg/sleef-sys")
+        (("rust-libc" ,rust-libc)
+         ("rust-redox-syscall" ,rust-redox-syscall)
+         ("rust-winapi" ,rust-winapi))))
+    (home-page
+      "https://github.com/ruuda/thread-id")
     (synopsis
-      "Rust FFI bindings to the SLEEF Vectorized Math Library")
+      "Get a unique ID for the current thread in Rust.")
     (description
-      "Rust FFI bindings to the SLEEF Vectorized Math Library")
+      "Get a unique ID for the current thread in Rust.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-slog
+(define-public rust-thread-local
   (package
-    (name "rust-slog")
-    (version "2.5.2")
+    (name "rust-thread-local")
+    (version "0.3.6")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "slog" version))
+        (uri (crate-uri "thread_local" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "16bv6zrdn1sm315vbnia02g31xvsmbjyz5gv3z0vrgxdli0cdj8w"))))
+            "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-erased-serde" ,rust-erased-serde))))
-    (home-page "https://github.com/slog-rs/slog")
-    (synopsis
-      "Structured, extensible, composable logging for Rust")
-    (description
-      "Structured, extensible, composable logging for Rust")
+        (("rust-lazy-static" ,rust-lazy-static))))
+    (home-page
+      "https://github.com/Amanieu/thread_local-rs")
+    (synopsis "Per-object thread-local storage")
+    (description "Per-object thread-local storage")
     (license (list license:asl2.0
-                   license:mpl2.0
                    license:expat))))
 
-(define-public rust-stacker
+(define-public rust-threadpool
   (package
-    (name "rust-stacker")
-    (version "0.1.5")
+    (name "rust-threadpool")
+    (version "1.7.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "stacker" version))
+        (uri (crate-uri "threadpool" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0js0axz5nla1mkr2dm2vrv9rj964ng1lrv4l43sqlnfgawplhygv"))))
+            "0rd89n1q7vy47w4c32cnynibffv9kj3jy3dwr0536n9lbw5ckw72"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-cfg-if" ,rust-cfg-if)
-         ("rust-libc" ,rust-libc)
-         ("rust-winapi" ,rust-winapi)
-         ("rust-cc" ,rust-cc))))
+        (("rust-num-cpus" ,rust-num-cpus))))
     (home-page
-      "https://github.com/alexcrichton/stacker")
+      "https://github.com/rust-threadpool/rust-threadpool")
     (synopsis
-      "A stack growth library useful when implementing deeply recursive algorithms that
-      may accidentally blow the stack.")
+      "A thread pool for running a number of jobs on a fixed set of worker threads.")
     (description
-      "This package provides a stack growth library useful when implementing deeply recursive algorithms that
-      may accidentally blow the stack.")
+      "This package provides a thread pool for running a number of jobs on a fixed set of worker threads.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-stdweb
+(define-public rust-time
   (package
-    (name "rust-stdweb")
-    (version "0.4.18")
+    (name "rust-time")
+    (version "0.1.42")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "stdweb" version))
+        (uri (crate-uri "time" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1srsjarj36f57ibr63n70bgy250yb72a73g14b80wh7piki0r356"))))
+            "0vsbvsz0ryxb35dy9j4anxvy8zlaplmjmi0a4z4l64bc135cz3fv"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-discard" ,rust-discard)
-         ("rust-futures-channel-preview"
-          ,rust-futures-channel-preview)
-         ("rust-futures-core-preview"
-          ,rust-futures-core-preview)
-         ("rust-futures-executor-preview"
-          ,rust-futures-executor-preview)
-         ("rust-futures-util-preview"
-          ,rust-futures-util-preview)
-         ("rust-rustc-version" ,rust-rustc-version)
-         ("rust-serde" ,rust-serde)
-         ("rust-serde-json" ,rust-serde-json)
-         ("rust-stdweb-derive" ,rust-stdweb-derive)
-         ("rust-stdweb-internal-macros"
-          ,rust-stdweb-internal-macros)
-         ("rust-stdweb-internal-runtime"
-          ,rust-stdweb-internal-runtime)
-         ("rust-wasm-bindgen" ,rust-wasm-bindgen))
+        (("rust-libc" ,rust-libc)
+         ("rust-redox-syscall" ,rust-redox-syscall)
+         ("rust-rustc-serialize" ,rust-rustc-serialize)
+         ("rust-winapi" ,rust-winapi))
         #:cargo-development-inputs
-        (("rust-rustc-version" ,rust-rustc-version)
-         ("rust-serde-derive" ,rust-serde-derive)
-         ("rust-serde-json" ,rust-serde-json)
-         ("rust-stdweb-internal-test-macro"
-          ,rust-stdweb-internal-test-macro)
-         ("rust-wasm-bindgen-test"
-          ,rust-wasm-bindgen-test))))
-    (home-page "https://github.com/koute/stdweb")
+        (("rust-log" ,rust-log)
+         ("rust-winapi" ,rust-winapi))))
+    (home-page "https://github.com/rust-lang/time")
     (synopsis
-      "A standard library for the client-side Web")
+      "Utilities for working with time-related functions in Rust.")
     (description
-      "This package provides a standard library for the client-side Web")
+      "Utilities for working with time-related functions in Rust.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-stdweb-derive
+(define-public rust-tokio
   (package
-    (name "rust-stdweb-derive")
-    (version "0.5.1")
+    (name "rust-tokio")
+    (version "0.1.22")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "stdweb-derive" version))
+        (uri (crate-uri "tokio" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0c1rxx6rqcc4iic5hx320ki3vshpi8k58m5600iqzq4x2zcyn88f"))))
+            "1xhaadfmm6m37f79xv5020gc3np9wqza3bq95ymp522qpfsw02as"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote)
+        (("rust-bytes" ,rust-bytes)
+         ("rust-futures" ,rust-futures)
+         ("rust-mio" ,rust-mio)
+         ("rust-num-cpus" ,rust-num-cpus)
+         ("rust-tokio-codec" ,rust-tokio-codec)
+         ("rust-tokio-current-thread"
+          ,rust-tokio-current-thread)
+         ("rust-tokio-executor" ,rust-tokio-executor)
+         ("rust-tokio-fs" ,rust-tokio-fs)
+         ("rust-tokio-io" ,rust-tokio-io)
+         ("rust-tokio-reactor" ,rust-tokio-reactor)
+         ("rust-tokio-sync" ,rust-tokio-sync)
+         ("rust-tokio-tcp" ,rust-tokio-tcp)
+         ("rust-tokio-threadpool" ,rust-tokio-threadpool)
+         ("rust-tokio-timer" ,rust-tokio-timer)
+         ("rust-tokio-udp" ,rust-tokio-udp)
+         ("rust-tokio-uds" ,rust-tokio-uds)
+         ("rust-tracing-core" ,rust-tracing-core))
+        #:cargo-development-inputs
+        (("rust-env-logger" ,rust-env-logger)
+         ("rust-flate2" ,rust-flate2)
+         ("rust-futures-cpupool" ,rust-futures-cpupool)
+         ("rust-http" ,rust-http)
+         ("rust-httparse" ,rust-httparse)
+         ("rust-libc" ,rust-libc)
+         ("rust-num-cpus" ,rust-num-cpus)
          ("rust-serde" ,rust-serde)
          ("rust-serde-derive" ,rust-serde-derive)
-         ("rust-syn" ,rust-syn))))
-    (home-page "https://github.com/koute/stdweb")
-    (synopsis "Derive macros for the `stdweb` crate")
+         ("rust-serde-json" ,rust-serde-json)
+         ("rust-time" ,rust-time))))
+    (home-page "https://tokio.rs")
+    (synopsis
+      "An event-driven, non-blocking I/O platform for writing asynchronous I/O backed applications.")
     (description
-      "Derive macros for the `stdweb` crate")
-    (license (list license:asl2.0
-                   license:expat))))
+      "An event-driven, non-blocking I/O platform for writing asynchronous I/O backed applications.")
+    (license license:expat)))
 
-(define-public rust-stdweb-internal-macros
+(define-public rust-tokio-buf
   (package
-    (name "rust-stdweb-internal-macros")
-    (version "0.2.7")
+    (name "rust-tokio-buf")
+    (version "0.2.0-alpha.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "stdweb-internal-macros" version))
+        (uri (crate-uri "tokio-buf" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1yjrmkc6sb1035avic383pa3avk2s9k3n17yjcza8yb9nw47v3z6"))))
+            "1bz2yb77kxq4006j6cjdkl14n21pi0c0mdw20ywj9yd70y7lap2z"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-base-x" ,rust-base-x)
-         ("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote)
-         ("rust-serde" ,rust-serde)
-         ("rust-serde-derive" ,rust-serde-derive)
-         ("rust-serde-json" ,rust-serde-json)
-         ("rust-sha1" ,rust-sha1)
-         ("rust-syn" ,rust-syn))))
-    (home-page "https://github.com/koute/stdweb")
+        (("rust-bytes" ,rust-bytes)
+         ("rust-either" ,rust-either))
+        #:cargo-development-inputs
+        (("rust-tokio-mock-task" ,rust-tokio-mock-task))))
+    (home-page "https://tokio.rs")
     (synopsis
-      "Internal procedural macros for the `stdweb` crate")
+      "Asynchronous stream of byte buffers")
     (description
-      "Internal procedural macros for the `stdweb` crate")
-    (license (list license:asl2.0
-                   license:expat))))
+      "Asynchronous stream of byte buffers")
+    (license license:expat)))
+
+(define-public rust-tokio-codec
+  (package
+    (name "rust-tokio-codec")
+    (version "0.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "tokio-codec" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "17y3hi3dd0bdfkrzshx9qhwcf49xv9iynszj7iwy3w4nmz71wl2w"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-bytes" ,rust-bytes)
+         ("rust-futures" ,rust-futures)
+         ("rust-tokio-io" ,rust-tokio-io))))
+    (home-page "https://tokio.rs")
+    (synopsis
+      "Utilities for encoding and decoding frames.")
+    (description
+      "Utilities for encoding and decoding frames.")
+    (license license:expat)))
 
-(define-public rust-stdweb-internal-test-macro
+(define-public rust-tokio-core
   (package
-    (name "rust-stdweb-internal-test-macro")
-    (version "0.1.0")
+    (name "rust-tokio-core")
+    (version "0.1.17")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "stdweb-internal-test-macro" version))
+        (uri (crate-uri "tokio-core" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "12rrm7p77xnm3xacgn3rgniiyyjb4gq7902wpbljsvbx045z69l2"))))
+            "0wbgg59mxfvrhzv97y56nh3gmnmw3jj9dhgkmvz27410jjxzpvxf"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote))))
-    (home-page "https://github.com/koute/stdweb")
-    (synopsis "Internal crate of the `stdweb` crate")
+        (("rust-bytes" ,rust-bytes)
+         ("rust-futures" ,rust-futures)
+         ("rust-iovec" ,rust-iovec)
+         ("rust-log" ,rust-log)
+         ("rust-mio" ,rust-mio)
+         ("rust-scoped-tls" ,rust-scoped-tls)
+         ("rust-tokio" ,rust-tokio)
+         ("rust-tokio-executor" ,rust-tokio-executor)
+         ("rust-tokio-io" ,rust-tokio-io)
+         ("rust-tokio-reactor" ,rust-tokio-reactor)
+         ("rust-tokio-timer" ,rust-tokio-timer))
+        #:cargo-development-inputs
+        (("rust-env-logger" ,rust-env-logger)
+         ("rust-flate2" ,rust-flate2)
+         ("rust-futures-cpupool" ,rust-futures-cpupool)
+         ("rust-http" ,rust-http)
+         ("rust-httparse" ,rust-httparse)
+         ("rust-libc" ,rust-libc)
+         ("rust-num-cpus" ,rust-num-cpus)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-derive" ,rust-serde-derive)
+         ("rust-serde-json" ,rust-serde-json)
+         ("rust-time" ,rust-time))))
+    (home-page "https://tokio.rs")
+    (synopsis
+      "Core I/O and event loop primitives for asynchronous I/O in Rust. Foundation for
+      the rest of the tokio crates.")
     (description
-      "Internal crate of the `stdweb` crate")
+      "Core I/O and event loop primitives for asynchronous I/O in Rust.  Foundation for
+      the rest of the tokio crates.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-stream-cipher
+(define-public rust-tokio-current-thread
   (package
-    (name "rust-stream-cipher")
-    (version "0.3.0")
+    (name "rust-tokio-current-thread")
+    (version "0.1.6")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "stream-cipher" version))
+        (uri (crate-uri "tokio-current-thread" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1g1nd8r6pph70rzk5yyvg7a9ji7pkap9ddiqpp4v9xa9ys0bqqc8"))))
+            "0hx4c8v88kk0ih8x5s564gsgwwf8n11kryvxm72l1f7isz51fqni"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-blobby" ,rust-blobby)
-         ("rust-generic-array" ,rust-generic-array))))
-    (home-page
-      "https://github.com/RustCrypto/traits")
-    (synopsis "Stream cipher traits")
-    (description "Stream cipher traits")
-    (license (list license:asl2.0
-                   license:expat))))
+        (("rust-futures" ,rust-futures)
+         ("rust-tokio-executor" ,rust-tokio-executor))))
+    (home-page "https://github.com/tokio-rs/tokio")
+    (synopsis
+      "Single threaded executor which manage many tasks concurrently on the current thread.")
+    (description
+      "Single threaded executor which manage many tasks concurrently on the current thread.")
+    (license license:expat)))
 
-(define-public rust-streaming-stats
+(define-public rust-tokio-executor
   (package
-    (name "rust-streaming-stats")
-    (version "0.2.2")
+    (name "rust-tokio-executor")
+    (version "0.1.8")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "streaming-stats" version))
+        (uri (crate-uri "tokio-executor" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0l7xz4g6709s80zqpvlhrg0qhgz64r94cwhmfsg8xhabgznbp2px"))))
+            "1b5n6barppmhfyb1m2cvswp7nqvyrr3lb0kk545my75hdl7fw9qg"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-num-traits" ,rust-num-traits))))
-    (home-page
-      "https://github.com/BurntSushi/rust-stats")
-    (synopsis
-      "Experimental crate for computing basic statistics on streams.")
-    (description
-      "Experimental crate for computing basic statistics on streams.")
-    (license (list license:unlicense
-                   license:expat))))
-
-(define-public rust-strsim-0.8
-  (package
-    (inherit rust-strsim)
-    (name "rust-strsim")
-    (version "0.8.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "strsim" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0sjsm7hrvjdifz661pjxq5w4hf190hx53fra8dfvamacvff139cf"))))))
+        (("rust-crossbeam-utils" ,rust-crossbeam-utils)
+         ("rust-futures" ,rust-futures))
+        #:cargo-development-inputs
+        (("rust-tokio" ,rust-tokio))))
+    (home-page "https://github.com/tokio-rs/tokio")
+    (synopsis "Future execution primitives")
+    (description "Future execution primitives")
+    (license license:expat)))
 
-(define-public rust-structopt
+(define-public rust-tokio-fs
   (package
-    (name "rust-structopt")
-    (version "0.2.18")
+    (name "rust-tokio-fs")
+    (version "0.1.6")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "structopt" version))
+        (uri (crate-uri "tokio-fs" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "1mvfv1l8vp3y402fkl2wcl34hi7gmr4bqha13dfz2xf3kjzwvhhn"))))
+          (base32
+            "1bxp8585pi4j5g39ci2gkk99qnyilyhhila7cs8r6scdn0idrriz"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-clap" ,rust-clap)
-         ("rust-structopt-derive" ,rust-structopt-derive))))
-    (home-page
-      "https://github.com/TeXitoi/structopt")
-    (synopsis
-      "Parse command line argument by defining a struct.")
-    (description
-      "Parse command line argument by defining a struct.")
-    (license (list license:asl2.0
-                   license:expat))))
+        (("rust-futures" ,rust-futures)
+         ("rust-tokio-io" ,rust-tokio-io)
+         ("rust-tokio-threadpool" ,rust-tokio-threadpool))
+        #:cargo-development-inputs
+        (("rust-rand" ,rust-rand)
+         ("rust-tempdir" ,rust-tempdir)
+         ("rust-tempfile" ,rust-tempfile)
+         ("rust-tokio" ,rust-tokio)
+         ("rust-tokio-codec" ,rust-tokio-codec)
+         ("rust-tokio-io" ,rust-tokio-io))))
+    (home-page "https://tokio.rs")
+    (synopsis "Filesystem API for Tokio.")
+    (description "Filesystem API for Tokio.")
+    (license license:expat)))
 
-(define-public rust-structopt-derive
+(define-public rust-tokio-io
   (package
-    (name "rust-structopt-derive")
-    (version "0.2.18")
+    (name "rust-tokio-io")
+    (version "0.1.12")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "structopt-derive" version))
+        (uri (crate-uri "tokio-io" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "01sis9z5kqmyhvzbnmlzpdxcry99a0b9blypksgnhdsbm1hh40ak"))))
+            "09jrz1hh4h1vj45qy09y7m7m8jsy1hl6g32clnky25mdim3dp42h"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-heck" ,rust-heck)
-         ("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote)
-         ("rust-syn" ,rust-syn))))
-    (home-page
-      "https://github.com/TeXitoi/structopt")
+        (("rust-bytes" ,rust-bytes)
+         ("rust-futures" ,rust-futures)
+         ("rust-log" ,rust-log))
+        #:cargo-development-inputs
+        (("rust-tokio-current-thread"
+          ,rust-tokio-current-thread))))
+    (home-page "https://tokio.rs")
     (synopsis
-      "Parse command line argument by defining a struct, derive crate.")
+      "Core I/O primitives for asynchronous I/O in Rust.")
     (description
-      "Parse command line argument by defining a struct, derive crate.")
-    (license (list license:asl2.0
-                   license:expat))))
+      "Core I/O primitives for asynchronous I/O in Rust.")
+    (license license:expat)))
 
-(define-public rust-syn
+(define-public rust-tokio-io-pool
   (package
-    (name "rust-syn")
-    (version "0.15.42")
+    (name "rust-tokio-io-pool")
+    (version "0.1.6")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "syn" version))
+        (uri (crate-uri "tokio-io-pool" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0png5pz7jjjj39xy8w7qr65y3s9qam0jpz6nbmal06m5dhq0kp7a"))))
+            "17lrjj7lcw13wchpbvr8cynmypd29h40clf9qxabh6fxva40kwm5"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote)
-         ("rust-unicode-xid" ,rust-unicode-xid))
+        (("rust-futures" ,rust-futures)
+         ("rust-num-cpus" ,rust-num-cpus)
+         ("rust-tokio" ,rust-tokio)
+         ("rust-tokio-executor" ,rust-tokio-executor))
         #:cargo-development-inputs
-        (("rust-insta" ,rust-insta)
-         ("rust-rayon" ,rust-rayon)
-         ("rust-ref-cast" ,rust-ref-cast)
-         ("rust-regex" ,rust-regex)
-         ("rust-termcolor" ,rust-termcolor)
-         ("rust-walkdir" ,rust-walkdir))))
-    (home-page "https://github.com/dtolnay/syn")
-    (synopsis "Parser for Rust source code")
-    (description "Parser for Rust source code")
+        (("rust-tokio-current-thread"
+          ,rust-tokio-current-thread))))
+    (home-page
+      "https://github.com/jonhoo/tokio-io-pool")
+    (synopsis
+      "Alternative tokio thread pool for executing short, I/O-heavy futures efficiently")
+    (description
+      "Alternative tokio thread pool for executing short, I/O-heavy futures efficiently")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-synstructure
+(define-public rust-tokio-reactor
   (package
-    (name "rust-synstructure")
-    (version "0.11.0")
+    (name "rust-tokio-reactor")
+    (version "0.1.9")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "synstructure" version))
+        (uri (crate-uri "tokio-reactor" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1spqy31qcss57mciklc4nky4v778fvqs9qwdjgvnmf0hr5ichcca"))))
+            "1khip64cn63xvayq1db68kxcnhgw3cb449a4n2lbw4p1qzx6pwba"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote)
-         ("rust-syn" ,rust-syn)
-         ("rust-unicode-xid" ,rust-unicode-xid))
+        (("rust-crossbeam-utils" ,rust-crossbeam-utils)
+         ("rust-futures" ,rust-futures)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-log" ,rust-log)
+         ("rust-mio" ,rust-mio)
+         ("rust-num-cpus" ,rust-num-cpus)
+         ("rust-parking-lot" ,rust-parking-lot)
+         ("rust-slab" ,rust-slab)
+         ("rust-tokio-executor" ,rust-tokio-executor)
+         ("rust-tokio-io" ,rust-tokio-io)
+         ("rust-tokio-sync" ,rust-tokio-sync))
         #:cargo-development-inputs
-        (("rust-synstructure-test-traits"
-          ,rust-synstructure-test-traits))))
-    (home-page
-      "https://github.com/mystor/synstructure")
+        (("rust-num-cpus" ,rust-num-cpus)
+         ("rust-tokio" ,rust-tokio)
+         ("rust-tokio-io-pool" ,rust-tokio-io-pool))))
+    (home-page "https://tokio.rs")
     (synopsis
-      "Helper methods and macros for custom derives")
+      "Event loop that drives Tokio I/O resources.")
     (description
-      "Helper methods and macros for custom derives")
+      "Event loop that drives Tokio I/O resources.")
     (license license:expat)))
 
-(define-public rust-tempdir
+(define-public rust-tokio-mock-task
   (package
-    (name "rust-tempdir")
-    (version "0.3.7")
+    (name "rust-tokio-mock-task")
+    (version "0.1.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tempdir" version))
+        (uri (crate-uri "tokio-mock-task" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1n5n86zxpgd85y0mswrp5cfdisizq2rv3la906g6ipyc03xvbwhm"))))
+            "1y7q83qfk9ljjfvs82b453pmz9x1v3d6kr4x55j8mal01s6790dw"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-rand" ,rust-rand-0.4)
-         ("rust-remove-dir-all" ,rust-remove-dir-all))))
+      `(#:cargo-inputs (("rust-futures" ,rust-futures))))
     (home-page
-      "https://github.com/rust-lang/tempdir")
-    (synopsis
-      "A library for managing a temporary directory and deleting all contents when it's dropped.")
-    (description
-      "This package provides a library for managing a temporary directory and deleting all contents when it's dropped.")
-    (license (list license:asl2.0
-                   license:expat))))
+      "https://github.com/carllerche/tokio-mock-task")
+    (synopsis "Mock a Tokio task")
+    (description "Mock a Tokio task")
+    (license license:expat)))
 
-(define-public rust-tempfile
+(define-public rust-tokio-mockstream
   (package
-    (name "rust-tempfile")
-    (version "3.1.0")
+    (name "rust-tokio-mockstream")
+    (version "1.1.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tempfile" version))
+        (uri (crate-uri "tokio-mockstream" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1a9cfdqw70n7bcnkx05aih9xdba8lqazmqlkjpkmn2la6gcj8vks"))))
+            "0mg1i39cl8x32wxwbn74hlirks8a6f3g0gfzkb0n0zwbxwvc9gs1"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-cfg-if" ,rust-cfg-if)
-         ("rust-libc" ,rust-libc)
-         ("rust-rand" ,rust-rand)
-         ("rust-redox-syscall" ,rust-redox-syscall)
-         ("rust-remove-dir-all" ,rust-remove-dir-all)
-         ("rust-winapi" ,rust-winapi))))
+        (("rust-futures" ,rust-futures)
+         ("rust-tokio-io" ,rust-tokio-io))
+        #:cargo-development-inputs
+        (("rust-bytes" ,rust-bytes))))
     (home-page
-      "http://stebalien.com/projects/tempfile-rs")
+      "https://github.com/aatxe/tokio-mockstream")
     (synopsis
-      "A library for managing temporary files and directories.")
+      "A fake stream for testing network applications backed by buffers.")
     (description
-      "This package provides a library for managing temporary files and directories.")
+      "A fake stream for testing network applications backed by buffers.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-term
+(define-public rust-tokio-openssl
   (package
-    (name "rust-term")
-    (version "0.5.2")
+    (name "rust-tokio-openssl")
+    (version "0.4.0-alpha.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "term" version))
+        (uri (crate-uri "tokio-openssl" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0hkgjrfisj6zjwz525639pmsvzhlc48a0h65nw87qrdp6jihdlgd"))))
+            "0zzhb720bmjkcg5q53yp9mimx8frnbrk9il6rya16zc6pwmzbfw8"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-byteorder" ,rust-byteorder)
-         ("rust-dirs" ,rust-dirs)
-         ("rust-winapi" ,rust-winapi))))
-    (home-page "https://github.com/Stebalien/term")
-    (synopsis "A terminal formatting library")
+        (("rust-openssl" ,rust-openssl)
+         ("rust-tokio-io" ,rust-tokio-io))
+        #:cargo-development-inputs
+        (("rust-futures-preview" ,rust-futures-preview)
+         ("rust-tokio" ,rust-tokio))))
+    (home-page
+      "https://github.com/alexcrichton/tokio-openssl")
+    (synopsis
+      "An implementation of SSL streams for Tokio backed by OpenSSL")
     (description
-      "This package provides a terminal formatting library")
+      "An implementation of SSL streams for Tokio backed by OpenSSL")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-term-size
+(define-public rust-tokio-rustls
   (package
-    (name "rust-term-size")
-    (version "1.0.0-beta1")
+    (name "rust-tokio-rustls")
+    (version "0.12.0-alpha.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "term_size" version))
+        (uri (crate-uri "tokio-rustls" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "13w9cqjhzh3mmx6zami8lxyf42xx53yy866zxhxqcm71k637v8d8"))))
+            "0vmjqdpvvwi5xga8lrp9pr29i7jd77zzlbbv4vi2mnsqxjafdcji"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-clippy" ,rust-clippy)
-         ;("rust-kernel32-sys" ,rust-kernel32-sys) ; windows
-         ("rust-libc" ,rust-libc)
-         ("rust-winapi" ,rust-winapi))))
+        (("rust-futures-core-preview"
+          ,rust-futures-core-preview)
+         ("rust-rustls" ,rust-rustls)
+         ("rust-smallvec" ,rust-smallvec)
+         ("rust-tokio-io" ,rust-tokio-io)
+         ("rust-webpki" ,rust-webpki))
+        #:cargo-development-inputs
+        (("rust-futures-util-preview"
+          ,rust-futures-util-preview)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-tokio" ,rust-tokio)
+         ("rust-webpki-roots" ,rust-webpki-roots))))
     (home-page
-      "https://github.com/kbknapp/term_size-rs.git")
+      "https://github.com/quininer/tokio-rustls")
     (synopsis
-      "functions for determining terminal sizes and dimensions")
+      "Asynchronous TLS/SSL streams for Tokio using Rustls.")
     (description
-      "functions for determining terminal sizes and dimensions")
+      "Asynchronous TLS/SSL streams for Tokio using Rustls.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-termcolor
-  (package
-    (name "rust-termcolor")
-    (version "1.0.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "termcolor" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0vjfsn1a8zvqhnrbygrz1id6yckwv1dncw3w4zj65qdx0f00kmln"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-wincolor" ,rust-wincolor))))
-    (home-page "https://github.com/BurntSushi/termcolor")
-    (synopsis "Library for writing colored text to a terminal")
-    (description "This package provides a simple cross platform library for
-writing colored text to a terminal.")
-    (license (list license:unlicense
-                   license:expat))))
-
-(define-public rust-termios
+(define-public rust-tokio-sync
   (package
-    (name "rust-termios")
-    (version "0.3.1")
+    (name "rust-tokio-sync")
+    (version "0.1.6")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "termios" version))
+        (uri (crate-uri "tokio-sync" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "09any1p4jp4bphvb5ikagnvwjc3xn2djchy96nkpa782xb2j1dkj"))))
+            "1ryalh7dcmnz46xj1va8aaw3if6vd4mj87r67dqvrqhpyf7j8qi1"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs (("rust-libc" ,rust-libc))))
-    (home-page
-      "https://github.com/dcuddeback/termios-rs")
-    (synopsis
-      "Safe bindings for the termios library.")
-    (description
-      "Safe bindings for the termios library.")
+      `(#:cargo-inputs
+        (("rust-fnv" ,rust-fnv)
+         ("rust-futures" ,rust-futures))
+        #:cargo-development-inputs
+        (("rust-env-logger" ,rust-env-logger)
+         ("rust-loom" ,rust-loom)
+         ("rust-tokio" ,rust-tokio)
+         ("rust-tokio-mock-task" ,rust-tokio-mock-task))))
+    (home-page "https://tokio.rs")
+    (synopsis "Synchronization utilities.")
+    (description "Synchronization utilities.")
     (license license:expat)))
 
-(define-public rust-textwrap
+(define-public rust-tokio-tcp
   (package
-    (name "rust-textwrap")
-    (version "0.11.0")
+    (name "rust-tokio-tcp")
+    (version "0.1.3")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "textwrap" version))
+        (uri (crate-uri "tokio-tcp" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0q5hky03ik3y50s9sz25r438bc4nwhqc6dqwynv4wylc807n29nk"))))
+            "06a15vg8bcd33ng3h9ldzlq7wl4jsw0p9qpy7v22ls5yah3b250x"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-hyphenation" ,rust-hyphenation)
-         ("rust-term-size" ,rust-term-size)
-         ("rust-unicode-width" ,rust-unicode-width))
+        (("rust-bytes" ,rust-bytes)
+         ("rust-futures" ,rust-futures)
+         ("rust-iovec" ,rust-iovec)
+         ("rust-mio" ,rust-mio)
+         ("rust-tokio-io" ,rust-tokio-io)
+         ("rust-tokio-reactor" ,rust-tokio-reactor))
         #:cargo-development-inputs
-        (("rust-lipsum" ,rust-lipsum)
-         ("rust-rand" ,rust-rand)
-         ("rust-rand-xorshift" ,rust-rand-xorshift)
-         ("rust-version-sync" ,rust-version-sync))))
-    (home-page
-      "https://github.com/mgeisler/textwrap")
-    (synopsis
-      "Textwrap is a small library for word wrapping, indenting, and
-      dedenting strings.
-
-      You can use it to format strings (such as help and error messages) for
-      display in commandline applications. It is designed to be efficient
-      and handle Unicode characters correctly.")
-    (description
-      "Textwrap is a small library for word wrapping, indenting, and
-      dedenting strings.
-
-      You can use it to format strings (such as help and error messages) for
-      display in commandline applications.  It is designed to be efficient
-      and handle Unicode characters correctly.")
+        (("rust-env-logger" ,rust-env-logger)
+         ("rust-tokio" ,rust-tokio))))
+    (home-page "https://tokio.rs")
+    (synopsis "TCP bindings for tokio.")
+    (description "TCP bindings for tokio.")
     (license license:expat)))
 
-(define-public rust-thread-local
+(define-public rust-tokio-threadpool
   (package
-    (name "rust-thread-local")
-    (version "0.3.6")
+    (name "rust-tokio-threadpool")
+    (version "0.1.15")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "thread_local" version))
+        (uri (crate-uri "tokio-threadpool" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6"))))
+            "06av6vdkgb48v6xaaci5agfydg9fsj9c338y01m3f7paklqh3jlh"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-lazy-static" ,rust-lazy-static))))
-    (home-page
-      "https://github.com/Amanieu/thread_local-rs")
-    (synopsis "Per-object thread-local storage")
-    (description "Per-object thread-local storage")
-    (license (list license:asl2.0
-                   license:expat))))
+        (("rust-crossbeam-deque" ,rust-crossbeam-deque)
+         ("rust-crossbeam-queue" ,rust-crossbeam-queue)
+         ("rust-crossbeam-utils" ,rust-crossbeam-utils)
+         ("rust-futures" ,rust-futures)
+         ("rust-log" ,rust-log)
+         ("rust-num-cpus" ,rust-num-cpus)
+         ("rust-rand" ,rust-rand)
+         ("rust-slab" ,rust-slab)
+         ("rust-tokio-executor" ,rust-tokio-executor))
+        #:cargo-development-inputs
+        (("rust-env-logger" ,rust-env-logger)
+         ("rust-futures-cpupool" ,rust-futures-cpupool)
+         ("rust-threadpool" ,rust-threadpool))))
+    (home-page "https://github.com/tokio-rs/tokio")
+    (synopsis
+      "A task scheduler backed by a work-stealing thread pool.")
+    (description
+      "This package provides a task scheduler backed by a work-stealing thread pool.")
+    (license license:expat)))
 
-(define-public rust-time
+(define-public rust-tokio-timer
   (package
-    (name "rust-time")
-    (version "0.1.42")
+    (name "rust-tokio-timer")
+    (version "0.2.11")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "time" version))
+        (uri (crate-uri "tokio-timer" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0vsbvsz0ryxb35dy9j4anxvy8zlaplmjmi0a4z4l64bc135cz3fv"))))
+            "03m68ainkdy3b5pf20rjyknhk2ppx35bjdc2yfj2bv80sl96h47j"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-libc" ,rust-libc)
-         ("rust-redox-syscall" ,rust-redox-syscall)
-         ("rust-rustc-serialize" ,rust-rustc-serialize)
-         ("rust-winapi" ,rust-winapi))
+        (("rust-crossbeam-utils" ,rust-crossbeam-utils)
+         ("rust-futures" ,rust-futures)
+         ("rust-slab" ,rust-slab)
+         ("rust-tokio-executor" ,rust-tokio-executor))
         #:cargo-development-inputs
-        (("rust-log" ,rust-log)
-         ("rust-winapi" ,rust-winapi))))
-    (home-page "https://github.com/rust-lang/time")
-    (synopsis
-      "Utilities for working with time-related functions in Rust.")
-    (description
-      "Utilities for working with time-related functions in Rust.")
-    (license (list license:asl2.0
-                   license:expat))))
+        (("rust-rand" ,rust-rand)
+         ("rust-tokio" ,rust-tokio)
+         ("rust-tokio-mock-task" ,rust-tokio-mock-task))))
+    (home-page "https://github.com/tokio-rs/tokio")
+    (synopsis "Timer facilities for Tokio")
+    (description "Timer facilities for Tokio")
+    (license license:expat)))
 
-(define-public rust-tokio
+(define-public rust-tokio-tls
   (package
-    (name "rust-tokio")
-    (version "0.1.22")
+    (name "rust-tokio-tls")
+    (version "0.3.0-alpha.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio" version))
+        (uri (crate-uri "tokio-tls" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1xhaadfmm6m37f79xv5020gc3np9wqza3bq95ymp522qpfsw02as"))))
+            "1z9bbxkd646lsn1fr1a5znxdz8afbpy31iq1knxd424v57lxf29p"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-bytes" ,rust-bytes)
-         ("rust-futures" ,rust-futures)
-         ("rust-mio" ,rust-mio)
-         ("rust-num-cpus" ,rust-num-cpus)
-         ("rust-tokio-codec" ,rust-tokio-codec)
-         ("rust-tokio-current-thread"
-          ,rust-tokio-current-thread)
-         ("rust-tokio-executor" ,rust-tokio-executor)
-         ("rust-tokio-fs" ,rust-tokio-fs)
-         ("rust-tokio-io" ,rust-tokio-io)
-         ("rust-tokio-reactor" ,rust-tokio-reactor)
-         ("rust-tokio-sync" ,rust-tokio-sync)
-         ("rust-tokio-tcp" ,rust-tokio-tcp)
-         ("rust-tokio-threadpool" ,rust-tokio-threadpool)
-         ("rust-tokio-timer" ,rust-tokio-timer)
-         ("rust-tokio-udp" ,rust-tokio-udp)
-         ("rust-tokio-uds" ,rust-tokio-uds)
-         ("rust-tracing-core" ,rust-tracing-core))
-        #:cargo-development-inputs
-        (("rust-env-logger" ,rust-env-logger)
-         ("rust-flate2" ,rust-flate2)
-         ("rust-futures-cpupool" ,rust-futures-cpupool)
-         ("rust-http" ,rust-http)
-         ("rust-httparse" ,rust-httparse)
-         ("rust-libc" ,rust-libc)
-         ("rust-num-cpus" ,rust-num-cpus)
-         ("rust-serde" ,rust-serde)
-         ("rust-serde-derive" ,rust-serde-derive)
-         ("rust-serde-json" ,rust-serde-json)
-         ("rust-time" ,rust-time))))
+        (("rust-native-tls" ,rust-native-tls)
+         ("rust-tokio-io" ,rust-tokio-io))))
     (home-page "https://tokio.rs")
     (synopsis
-      "An event-driven, non-blocking I/O platform for writing asynchronous I/O backed applications.")
+      "An implementation of TLS/SSL streams for Tokio giving an implementation of TLS for nonblocking I/O streams.")
     (description
-      "An event-driven, non-blocking I/O platform for writing asynchronous I/O backed applications.")
+      "An implementation of TLS/SSL streams for Tokio giving an implementation of TLS for nonblocking I/O streams.")
     (license license:expat)))
 
-(define-public rust-tokio-codec
+(define-public rust-tokio-udp
   (package
-    (name "rust-tokio-codec")
-    (version "0.1.1")
+    (name "rust-tokio-udp")
+    (version "0.1.3")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio-codec" version))
+        (uri (crate-uri "tokio-udp" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "17y3hi3dd0bdfkrzshx9qhwcf49xv9iynszj7iwy3w4nmz71wl2w"))))
+            "14kfj35s465czcspayacnzlxrazfvxzhhggq1rqlljhgp1sqa9k6"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
         (("rust-bytes" ,rust-bytes)
          ("rust-futures" ,rust-futures)
-         ("rust-tokio-io" ,rust-tokio-io))))
+         ("rust-log" ,rust-log)
+         ("rust-mio" ,rust-mio)
+         ("rust-tokio-codec" ,rust-tokio-codec)
+         ("rust-tokio-io" ,rust-tokio-io)
+         ("rust-tokio-reactor" ,rust-tokio-reactor))
+        #:cargo-development-inputs
+        (("rust-env-logger" ,rust-env-logger))))
     (home-page "https://tokio.rs")
-    (synopsis
-      "Utilities for encoding and decoding frames.")
-    (description
-      "Utilities for encoding and decoding frames.")
+    (synopsis "UDP bindings for tokio.")
+    (description "UDP bindings for tokio.")
     (license license:expat)))
 
-(define-public rust-tokio-current-thread
+(define-public rust-tokio-uds
   (package
-    (name "rust-tokio-current-thread")
-    (version "0.1.6")
+    (name "rust-tokio-uds")
+    (version "0.2.5")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio-current-thread" version))
+        (uri (crate-uri "tokio-uds" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0hx4c8v88kk0ih8x5s564gsgwwf8n11kryvxm72l1f7isz51fqni"))))
+            "0i94kxma6l7iy5hd5k7nvn7v9pnyw0s54bm9mjs0lap1l0xzqzq3"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-futures" ,rust-futures)
-         ("rust-tokio-executor" ,rust-tokio-executor))))
+        (("rust-bytes" ,rust-bytes)
+         ("rust-futures" ,rust-futures)
+         ("rust-iovec" ,rust-iovec)
+         ("rust-libc" ,rust-libc)
+         ("rust-log" ,rust-log)
+         ("rust-mio" ,rust-mio)
+         ("rust-mio-uds" ,rust-mio-uds)
+         ("rust-tokio-codec" ,rust-tokio-codec)
+         ("rust-tokio-io" ,rust-tokio-io)
+         ("rust-tokio-reactor" ,rust-tokio-reactor))
+        #:cargo-development-inputs
+        (("rust-tempfile" ,rust-tempfile)
+         ("rust-tokio" ,rust-tokio))))
     (home-page "https://github.com/tokio-rs/tokio")
-    (synopsis
-      "Single threaded executor which manage many tasks concurrently on the current thread.")
-    (description
-      "Single threaded executor which manage many tasks concurrently on the current thread.")
+    (synopsis "Unix Domain sockets for Tokio")
+    (description "Unix Domain sockets for Tokio")
     (license license:expat)))
 
-(define-public rust-tokio-executor
+(define-public rust-toml
   (package
-    (name "rust-tokio-executor")
-    (version "0.1.8")
+    (name "rust-toml")
+    (version "0.5.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio-executor" version))
+        (uri (crate-uri "toml" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1b5n6barppmhfyb1m2cvswp7nqvyrr3lb0kk545my75hdl7fw9qg"))))
+            "0fdhfyv20qn29cxq1f9j9wav92c3qhxdm71sxfyzhzpsfdw6vjdq"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-crossbeam-utils" ,rust-crossbeam-utils)
-         ("rust-futures" ,rust-futures))
+        (("rust-linked-hash-map" ,rust-linked-hash-map)
+         ("rust-serde" ,rust-serde))
         #:cargo-development-inputs
-        (("rust-tokio" ,rust-tokio))))
-    (home-page "https://github.com/tokio-rs/tokio")
-    (synopsis "Future execution primitives")
-    (description "Future execution primitives")
-    (license license:expat)))
+        (("rust-serde-derive" ,rust-serde-derive)
+         ("rust-serde-json" ,rust-serde-json))))
+    (home-page
+      "https://github.com/alexcrichton/toml-rs")
+    (synopsis
+      "A native Rust encoder and decoder of TOML-formatted files and streams. Provides implementations of the standard Serialize/Deserialize traits for TOML data to facilitate deserializing and serializing Rust structures.")
+    (description
+      "A native Rust encoder and decoder of TOML-formatted files and streams. Provides implementations of the standard Serialize/Deserialize traits for TOML data to facilitate deserializing and serializing Rust structures.")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-tokio-fs
+(define-public rust-tracing-core
   (package
-    (name "rust-tokio-fs")
-    (version "0.1.6")
+    (name "rust-tracing-core")
+    (version "0.1.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio-fs" version))
+        (uri (crate-uri "tracing-core" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1bxp8585pi4j5g39ci2gkk99qnyilyhhila7cs8r6scdn0idrriz"))))
+            "01fa73wzw2m5ybi3kkd52dgrw97mgc3i6inmhwys46ab28giwnxi"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-futures" ,rust-futures)
-         ("rust-tokio-io" ,rust-tokio-io)
-         ("rust-tokio-threadpool" ,rust-tokio-threadpool))
-        #:cargo-development-inputs
-        (("rust-rand" ,rust-rand)
-         ("rust-tempdir" ,rust-tempdir)
-         ("rust-tempfile" ,rust-tempfile)
-         ("rust-tokio" ,rust-tokio)
-         ("rust-tokio-codec" ,rust-tokio-codec)
-         ("rust-tokio-io" ,rust-tokio-io))))
+        (("rust-lazy-static" ,rust-lazy-static))))
     (home-page "https://tokio.rs")
-    (synopsis "Filesystem API for Tokio.")
-    (description "Filesystem API for Tokio.")
-    (license license:expat)))
+    (synopsis
+      "Core primitives for application-level tracing.")
+    (description
+      "Core primitives for application-level tracing.")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-tokio-io
+(define-public rust-trust-dns-https
   (package
-    (name "rust-tokio-io")
-    (version "0.1.12")
+    (name "rust-trust-dns-https")
+    (version "0.4.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio-io" version))
+        (uri (crate-uri "trust-dns-https" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "09jrz1hh4h1vj45qy09y7m7m8jsy1hl6g32clnky25mdim3dp42h"))))
+            "1ypkbgm5p7smjfkca3gaszhvknbr2ykf8skw8pyvpn0sq95lv5ia"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
         (("rust-bytes" ,rust-bytes)
+         ("rust-data-encoding" ,rust-data-encoding)
+         ("rust-failure" ,rust-failure)
          ("rust-futures" ,rust-futures)
-         ("rust-log" ,rust-log))
+         ("rust-h2" ,rust-h2)
+         ("rust-http" ,rust-http)
+         ("rust-log" ,rust-log)
+         ("rust-rustls" ,rust-rustls)
+         ("rust-tokio-executor" ,rust-tokio-executor)
+         ("rust-tokio-reactor" ,rust-tokio-reactor)
+         ("rust-tokio-rustls" ,rust-tokio-rustls)
+         ("rust-tokio-tcp" ,rust-tokio-tcp)
+         ("rust-trust-dns-proto" ,rust-trust-dns-proto)
+         ("rust-trust-dns-rustls" ,rust-trust-dns-rustls)
+         ("rust-tokio-executor" ,rust-tokio-executor)
+         ("rust-tokio-reactor" ,rust-tokio-reactor)
+         ("rust-tokio-rustls" ,rust-tokio-rustls)
+         ("rust-tokio-tcp" ,rust-tokio-tcp)
+         ("rust-trust-dns-proto" ,rust-trust-dns-proto)
+         ("rust-trust-dns-rustls" ,rust-trust-dns-rustls)
+         ("rust-typed-headers" ,rust-typed-headers)
+         ("rust-webpki" ,rust-webpki)
+         ("rust-webpki-roots" ,rust-webpki-roots))
         #:cargo-development-inputs
-        (("rust-tokio-current-thread"
-          ,rust-tokio-current-thread))))
-    (home-page "https://tokio.rs")
+        (("rust-env-logger" ,rust-env-logger)
+         ("rust-tokio" ,rust-tokio))))
+    (home-page "http://www.trust-dns.org/index.html")
     (synopsis
-      "Core I/O primitives for asynchronous I/O in Rust.")
+      "Trust-DNS is a safe and secure DNS library. This is an extension for the Trust-DNS client to use DNS over HTTPS.")
     (description
-      "Core I/O primitives for asynchronous I/O in Rust.")
-    (license license:expat)))
+      "Trust-DNS is a safe and secure DNS library.  This is an extension for the Trust-DNS client to use DNS over HTTPS.")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-tokio-reactor
+(define-public rust-trust-dns-native-tls
   (package
-    (name "rust-tokio-reactor")
-    (version "0.1.9")
+    (name "rust-trust-dns-native-tls")
+    (version "0.7.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio-reactor" version))
+        (uri (crate-uri "trust-dns-native-tls" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1khip64cn63xvayq1db68kxcnhgw3cb449a4n2lbw4p1qzx6pwba"))))
+            "0dkwfqxjjmbikm3mav71zjymgy8wmqr4mca64x49qzknvc4qwy6z"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-crossbeam-utils" ,rust-crossbeam-utils)
-         ("rust-futures" ,rust-futures)
-         ("rust-lazy-static" ,rust-lazy-static)
-         ("rust-log" ,rust-log)
-         ("rust-mio" ,rust-mio)
-         ("rust-num-cpus" ,rust-num-cpus)
-         ("rust-parking-lot" ,rust-parking-lot)
-         ("rust-slab" ,rust-slab)
-         ("rust-tokio-executor" ,rust-tokio-executor)
-         ("rust-tokio-io" ,rust-tokio-io)
-         ("rust-tokio-sync" ,rust-tokio-sync))
+        (("rust-futures" ,rust-futures)
+         ("rust-native-tls" ,rust-native-tls)
+         ("rust-tokio-tcp" ,rust-tokio-tcp)
+         ("rust-tokio-tls" ,rust-tokio-tls)
+         ("rust-trust-dns-proto" ,rust-trust-dns-proto))
         #:cargo-development-inputs
-        (("rust-num-cpus" ,rust-num-cpus)
-         ("rust-tokio" ,rust-tokio)
-         ("rust-tokio-io-pool" ,rust-tokio-io-pool))))
-    (home-page "https://tokio.rs")
+        (("rust-tokio" ,rust-tokio))))
+    (home-page "http://www.trust-dns.org/index.html")
     (synopsis
-      "Event loop that drives Tokio I/O resources.")
+      "Trust-DNS is a safe and secure DNS library. This is an extension for the Trust-DNS client to use native-tls for TLS.")
     (description
-      "Event loop that drives Tokio I/O resources.")
-    (license license:expat)))
+      "Trust-DNS is a safe and secure DNS library.  This is an extension for the Trust-DNS client to use native-tls for TLS.")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-tokio-mock-task
+(define-public rust-trust-dns-openssl
   (package
-    (name "rust-tokio-mock-task")
-    (version "0.1.1")
+    (name "rust-trust-dns-openssl")
+    (version "0.7.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio-mock-task" version))
+        (uri (crate-uri "trust-dns-openssl" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1y7q83qfk9ljjfvs82b453pmz9x1v3d6kr4x55j8mal01s6790dw"))))
+            "19qxi4y33wd2g55r4v9d6b06d20bdhqhvsrsmbpz5ir3i7l5psp7"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs (("rust-futures" ,rust-futures))))
-    (home-page
-      "https://github.com/carllerche/tokio-mock-task")
-    (synopsis "Mock a Tokio task")
-    (description "Mock a Tokio task")
-    (license license:expat)))
+      `(#:cargo-inputs
+        (("rust-futures" ,rust-futures)
+         ("rust-openssl" ,rust-openssl)
+         ("rust-tokio-openssl" ,rust-tokio-openssl)
+         ("rust-tokio-tcp" ,rust-tokio-tcp)
+         ("rust-trust-dns-proto" ,rust-trust-dns-proto))
+        #:cargo-development-inputs
+        (("rust-openssl" ,rust-openssl)
+         ("rust-tokio" ,rust-tokio))))
+    (home-page "http://www.trust-dns.org/index.html")
+    (synopsis
+      "Trust-DNS is a safe and secure DNS library. This is an extension for the Trust-DNS client to use tokio-openssl for TLS.")
+    (description
+      "Trust-DNS is a safe and secure DNS library.  This is an extension for the Trust-DNS client to use tokio-openssl for TLS.")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-tokio-sync
+(define-public rust-trust-dns-proto
   (package
-    (name "rust-tokio-sync")
-    (version "0.1.6")
+    (name "rust-trust-dns-proto")
+    (version "0.8.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio-sync" version))
+        (uri (crate-uri "trust-dns-proto" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1ryalh7dcmnz46xj1va8aaw3if6vd4mj87r67dqvrqhpyf7j8qi1"))))
+            "1f9xjyz7fsa83dj00zif7lmljd4x420c0vmniinhb7c35777wi85"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-fnv" ,rust-fnv)
-         ("rust-futures" ,rust-futures))
+        (("rust-data-encoding" ,rust-data-encoding)
+         ("rust-enum-as-inner" ,rust-enum-as-inner)
+         ("rust-failure" ,rust-failure)
+         ("rust-futures" ,rust-futures)
+         ("rust-idna" ,rust-idna)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-log" ,rust-log)
+         ("rust-openssl" ,rust-openssl)
+         ("rust-rand" ,rust-rand)
+         ("rust-ring" ,rust-ring)
+         ("rust-serde" ,rust-serde)
+         ("rust-smallvec" ,rust-smallvec)
+         ("rust-socket2" ,rust-socket2)
+         ("rust-tokio-executor" ,rust-tokio-executor)
+         ("rust-tokio-io" ,rust-tokio-io)
+         ("rust-tokio-reactor" ,rust-tokio-reactor)
+         ("rust-tokio-tcp" ,rust-tokio-tcp)
+         ("rust-tokio-timer" ,rust-tokio-timer)
+         ("rust-tokio-udp" ,rust-tokio-udp)
+         ("rust-url" ,rust-url))
         #:cargo-development-inputs
         (("rust-env-logger" ,rust-env-logger)
-         ("rust-loom" ,rust-loom)
-         ("rust-tokio" ,rust-tokio)
-         ("rust-tokio-mock-task" ,rust-tokio-mock-task))))
-    (home-page "https://tokio.rs")
-    (synopsis "Synchronization utilities.")
-    (description "Synchronization utilities.")
-    (license license:expat)))
+         ("rust-tokio" ,rust-tokio))))
+    (home-page "http://www.trust-dns.org/index.html")
+    (synopsis
+      "Trust-DNS is a safe and secure DNS library. This is the foundational DNS protocol library for all Trust-DNS projects.")
+    (description
+      "Trust-DNS is a safe and secure DNS library.  This is the foundational DNS protocol library for all Trust-DNS projects.")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-tokio-tcp
+(define-public rust-trust-dns-resolver
   (package
-    (name "rust-tokio-tcp")
-    (version "0.1.3")
+    (name "rust-trust-dns-resolver")
+    (version "0.12.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio-tcp" version))
+        (uri (crate-uri "trust-dns-resolver" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "06a15vg8bcd33ng3h9ldzlq7wl4jsw0p9qpy7v22ls5yah3b250x"))))
+            "0cjkz3rcisk7v354l5hqb3j5x9x389pjqd6da6h8skvqxr0kl6yb"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-bytes" ,rust-bytes)
+        (("rust-cfg-if" ,rust-cfg-if)
+         ("rust-failure" ,rust-failure)
          ("rust-futures" ,rust-futures)
-         ("rust-iovec" ,rust-iovec)
-         ("rust-mio" ,rust-mio)
-         ("rust-tokio-io" ,rust-tokio-io)
-         ("rust-tokio-reactor" ,rust-tokio-reactor))
+         ("rust-ipconfig" ,rust-ipconfig)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-log" ,rust-log)
+         ("rust-lru-cache" ,rust-lru-cache)
+         ("rust-resolv-conf" ,rust-resolv-conf)
+         ("rust-rustls" ,rust-rustls)
+         ("rust-serde" ,rust-serde)
+         ("rust-smallvec" ,rust-smallvec)
+         ("rust-tokio" ,rust-tokio)
+         ("rust-tokio-executor" ,rust-tokio-executor)
+         ("rust-tokio-tcp" ,rust-tokio-tcp)
+         ("rust-tokio-udp" ,rust-tokio-udp)
+         ("rust-trust-dns-https" ,rust-trust-dns-https)
+         ("rust-trust-dns-native-tls"
+          ,rust-trust-dns-native-tls)
+         ("rust-trust-dns-openssl"
+          ,rust-trust-dns-openssl)
+         ("rust-trust-dns-proto" ,rust-trust-dns-proto)
+         ("rust-trust-dns-rustls" ,rust-trust-dns-rustls)
+         ("rust-webpki-roots" ,rust-webpki-roots))
         #:cargo-development-inputs
         (("rust-env-logger" ,rust-env-logger)
-         ("rust-tokio" ,rust-tokio))))
-    (home-page "https://tokio.rs")
-    (synopsis "TCP bindings for tokio.")
-    (description "TCP bindings for tokio.")
-    (license license:expat)))
+         ("rust-tokio" ,rust-tokio)
+         ("rust-tokio-io" ,rust-tokio-io))))
+    (home-page "http://www.trust-dns.org/index.html")
+    (synopsis
+      "Trust-DNS is a safe and secure DNS library. This Resolver library  uses the Client library to perform all DNS queries. The Resolver is intended to be a high-level library for any DNS record resolution see Resolver and AsyncResolver for supported resolution types. The Client can be used for other queries.
+      ")
+         (description
+           "Trust-DNS is a safe and secure DNS library.  This Resolver library  uses the Client library to perform all DNS queries.  The Resolver is intended to be a high-level library for any DNS record resolution see Resolver and AsyncResolver for supported resolution types.  The Client can be used for other queries.
+           ")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-tokio-threadpool
+(define-public rust-trust-dns-rustls
   (package
-    (name "rust-tokio-threadpool")
-    (version "0.1.15")
+    (name "rust-trust-dns-rustls")
+    (version "0.7.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio-threadpool" version))
+        (uri (crate-uri "trust-dns-rustls" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "06av6vdkgb48v6xaaci5agfydg9fsj9c338y01m3f7paklqh3jlh"))))
+            "0glpggq31764q7lp19h5l6implsr7ik015qkm5rg7pqwy93krsb3"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-crossbeam-deque" ,rust-crossbeam-deque)
-         ("rust-crossbeam-queue" ,rust-crossbeam-queue)
-         ("rust-crossbeam-utils" ,rust-crossbeam-utils)
-         ("rust-futures" ,rust-futures)
+        (("rust-futures" ,rust-futures)
          ("rust-log" ,rust-log)
-         ("rust-num-cpus" ,rust-num-cpus)
-         ("rust-rand" ,rust-rand)
-         ("rust-slab" ,rust-slab)
-         ("rust-tokio-executor" ,rust-tokio-executor))
+         ("rust-rustls" ,rust-rustls)
+         ("rust-tokio-rustls" ,rust-tokio-rustls)
+         ("rust-tokio-tcp" ,rust-tokio-tcp)
+         ("rust-trust-dns-proto" ,rust-trust-dns-proto)
+         ("rust-webpki" ,rust-webpki))
         #:cargo-development-inputs
-        (("rust-env-logger" ,rust-env-logger)
-         ("rust-futures-cpupool" ,rust-futures-cpupool)
-         ("rust-threadpool" ,rust-threadpool))))
-    (home-page "https://github.com/tokio-rs/tokio")
+        (("rust-openssl" ,rust-openssl)
+         ("rust-tokio" ,rust-tokio))))
+    (home-page "http://www.trust-dns.org/index.html")
     (synopsis
-      "A task scheduler backed by a work-stealing thread pool.")
+      "Trust-DNS is a safe and secure DNS library. This is an extension for the Trust-DNS client to use rustls for TLS.")
     (description
-      "This package provides a task scheduler backed by a work-stealing thread pool.")
-    (license license:expat)))
+      "Trust-DNS is a safe and secure DNS library.  This is an extension for the Trust-DNS client to use rustls for TLS.")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-tokio-timer
+(define-public rust-try-from
   (package
-    (name "rust-tokio-timer")
-    (version "0.2.11")
+    (name "rust-try-from")
+    (version "0.3.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio-timer" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "try_from" version))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "03m68ainkdy3b5pf20rjyknhk2ppx35bjdc2yfj2bv80sl96h47j"))))
+         (base32
+          "12wdd4ja7047sd3rx70hv2056hyc8gcdllcx3a41g1rnw64kng98"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-crossbeam-utils" ,rust-crossbeam-utils)
-         ("rust-futures" ,rust-futures)
-         ("rust-slab" ,rust-slab)
-         ("rust-tokio-executor" ,rust-tokio-executor))
-        #:cargo-development-inputs
-        (("rust-rand" ,rust-rand)
-         ("rust-tokio" ,rust-tokio)
-         ("rust-tokio-mock-task" ,rust-tokio-mock-task))))
-    (home-page "https://github.com/tokio-rs/tokio")
-    (synopsis "Timer facilities for Tokio")
-    (description "Timer facilities for Tokio")
+     `(#:cargo-inputs
+      (("rust-cfg-if" ,rust-cfg-if))))
+    (home-page "https://github.com/derekjw/try_from")
+    (synopsis
+      "TryFrom and TryInto traits for failable conversions that return a Result.")
+    (description
+      "TryFrom and TryInto traits for failable conversions that return a Result.")
     (license license:expat)))
 
-(define-public rust-tokio-udp
+(define-public rust-try-lock
   (package
-    (name "rust-tokio-udp")
-    (version "0.1.3")
+    (name "rust-try-lock")
+    (version "0.2.2")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio-udp" version))
+        (uri (crate-uri "try-lock" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "14kfj35s465czcspayacnzlxrazfvxzhhggq1rqlljhgp1sqa9k6"))))
+            "10p36rx6pqi9d0zr876xa8vksx2m66ha45myakl50rn08dxyn176"))))
     (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-bytes" ,rust-bytes)
-         ("rust-futures" ,rust-futures)
-         ("rust-log" ,rust-log)
-         ("rust-mio" ,rust-mio)
-         ("rust-tokio-codec" ,rust-tokio-codec)
-         ("rust-tokio-io" ,rust-tokio-io)
-         ("rust-tokio-reactor" ,rust-tokio-reactor))
-        #:cargo-development-inputs
-        (("rust-env-logger" ,rust-env-logger))))
-    (home-page "https://tokio.rs")
-    (synopsis "UDP bindings for tokio.")
-    (description "UDP bindings for tokio.")
+    (home-page
+      "https://github.com/seanmonstar/try-lock")
+    (synopsis "A lightweight atomic lock.")
+    (description
+      "This package provides a lightweight atomic lock.")
     (license license:expat)))
 
-(define-public rust-tokio-uds
+(define-public rust-trybuild
   (package
-    (name "rust-tokio-uds")
-    (version "0.2.5")
+    (name "rust-trybuild")
+    (version "1.0.9")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tokio-uds" version))
+        (uri (crate-uri "trybuild" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0i94kxma6l7iy5hd5k7nvn7v9pnyw0s54bm9mjs0lap1l0xzqzq3"))))
+            "0df6ipayif05xn61iavdb0dcshm9y6wmcd140pp7dl91mirygs7j"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-bytes" ,rust-bytes)
-         ("rust-futures" ,rust-futures)
-         ("rust-iovec" ,rust-iovec)
-         ("rust-libc" ,rust-libc)
-         ("rust-log" ,rust-log)
-         ("rust-mio" ,rust-mio)
-         ("rust-mio-uds" ,rust-mio-uds)
-         ("rust-tokio-codec" ,rust-tokio-codec)
-         ("rust-tokio-io" ,rust-tokio-io)
-         ("rust-tokio-reactor" ,rust-tokio-reactor))
-        #:cargo-development-inputs
-        (("rust-tempfile" ,rust-tempfile)
-         ("rust-tokio" ,rust-tokio))))
-    (home-page "https://github.com/tokio-rs/tokio")
-    (synopsis "Unix Domain sockets for Tokio")
-    (description "Unix Domain sockets for Tokio")
-    (license license:expat)))
+        (("rust-glob" ,rust-glob)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-json" ,rust-serde-json)
+         ("rust-termcolor" ,rust-termcolor)
+         ("rust-toml" ,rust-toml))))
+    (home-page "https://github.com/dtolnay/trybuild")
+    (synopsis
+      "Test harness for ui tests of compiler diagnostics")
+    (description
+      "Test harness for ui tests of compiler diagnostics")
+    (license (list license:asl2.0
+                   license:expat))))
 
-(define-public rust-toml
+(define-public rust-typed-arena
   (package
-    (name "rust-toml")
-    (version "0.5.1")
+    (name "rust-typed-arena")
+    (version "1.5.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "toml" version))
+        (uri (crate-uri "typed-arena" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0fdhfyv20qn29cxq1f9j9wav92c3qhxdm71sxfyzhzpsfdw6vjdq"))))
+            "0im62vrmyzbr8xq66bcyr86ka4z2x8psn9z4982bq4fc8v1zaw3z"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-linked-hash-map" ,rust-linked-hash-map)
-         ("rust-serde" ,rust-serde))
-        #:cargo-development-inputs
-        (("rust-serde-derive" ,rust-serde-derive)
-         ("rust-serde-json" ,rust-serde-json))))
+      `(#:cargo-development-inputs
+        (("rust-criterion" ,rust-byteorder))))
     (home-page
-      "https://github.com/alexcrichton/toml-rs")
+      "https://github.com/SimonSapin/rust-typed-arena")
     (synopsis
-      "A native Rust encoder and decoder of TOML-formatted files and streams. Provides implementations of the standard Serialize/Deserialize traits for TOML data to facilitate deserializing and serializing Rust structures.")
+      "The arena, a fast but limited type of allocator")
     (description
-      "A native Rust encoder and decoder of TOML-formatted files and streams. Provides implementations of the standard Serialize/Deserialize traits for TOML data to facilitate deserializing and serializing Rust structures.")
-    (license (list license:asl2.0
-                   license:expat))))
+      "The arena, a fast but limited type of allocator")
+    (license license:expat)))
 
-(define-public rust-tracing-core
+(define-public rust-typed-headers
   (package
-    (name "rust-tracing-core")
-    (version "0.1.2")
+    (name "rust-typed-headers")
+    (version "0.1.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "tracing-core" version))
+        (uri (crate-uri "typed-headers" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "01fa73wzw2m5ybi3kkd52dgrw97mgc3i6inmhwys46ab28giwnxi"))))
+            "0g40nlq5iw0zxhwb7nfmfbr9m86abgwwhxwhzrm10nfq6bsmlvxx"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-lazy-static" ,rust-lazy-static))))
-    (home-page "https://tokio.rs")
+        (("rust-base64" ,rust-base64)
+         ("rust-bytes" ,rust-bytes)
+         ("rust-chrono" ,rust-chrono)
+         ("rust-http" ,rust-http)
+         ("rust-mime" ,rust-mime))))
+    (home-page "https://github.com/sfackler/typed-headers")
     (synopsis
-      "Core primitives for application-level tracing.")
+      "Typed HTTP header serialization and deserialization.")
     (description
-      "Core primitives for application-level tracing.")
+      "Typed HTTP header serialization and deserialization.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-trybuild
+(define-public rust-typemap
   (package
-    (name "rust-trybuild")
-    (version "1.0.9")
+    (name "rust-typemap")
+    (version "0.3.3")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "trybuild" version))
+        (uri (crate-uri "typemap" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0df6ipayif05xn61iavdb0dcshm9y6wmcd140pp7dl91mirygs7j"))))
+         (base32
+          "1xm1gbvz9qisj1l6d36hrl9pw8imr8ngs6qyanjnsad3h0yfcfv5"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-glob" ,rust-glob)
-         ("rust-lazy-static" ,rust-lazy-static)
-         ("rust-serde" ,rust-serde)
-         ("rust-serde-json" ,rust-serde-json)
-         ("rust-termcolor" ,rust-termcolor)
-         ("rust-toml" ,rust-toml))))
-    (home-page "https://github.com/dtolnay/trybuild")
+        (("rust-unsafe-any" ,rust-base64))))
+    (home-page "https://github.com/reem/rust-typemap")
     (synopsis
-      "Test harness for ui tests of compiler diagnostics")
+      "A typesafe store for many value types.")
     (description
-      "Test harness for ui tests of compiler diagnostics")
-    (license (list license:asl2.0
-                   license:expat))))
+      "A typesafe store for many value types.")
+    (license license:expat)))
 
 (define-public rust-ucd-trie
   (package
@@ -7150,6 +10949,61 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-unicase
+  (package
+    (name "rust-unicase")
+    (version "2.4.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "unicase" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1xmpmkakhhblq7dzab1kwyv925kv7fqjkjsxjspg6ix9n88makm8"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs (("rust-version-check" ,rust-version-check))))
+    (home-page
+      "https://github.com/seanmonstar/unicase")
+    (synopsis
+      "A case-insensitive wrapper around strings.")
+    (description
+      "A case-insensitive wrapper around strings.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-unicode-bidi
+  (package
+    (name "rust-unicode-bidi")
+    (version "0.3.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "unicode-bidi" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1malx8ljgm7v1gbaazkn7iicy5wj0bwcyadj3l727a38ch6bvwj9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-matches" ,rust-matches)
+        ("rust-flame" ,rust-flame)
+        ("rust-flamer" ,rust-flamer)
+        ("rust-serde" ,rust-serde))
+       #:cargo-development-inputs
+       (("rust-serde-test" ,rust-serde-test))))
+    (home-page "https://github.com/servo/unicode-bidi")
+    (synopsis
+      "Implementation of the Unicode Bidirectional Algorithm")
+    (description
+      "Implementation of the Unicode Bidirectional Algorithm")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-unicode-normalization
   (package
     (name "rust-unicode-normalization")
@@ -7204,6 +11058,27 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-untrusted
+  (package
+    (name "rust-untrusted")
+    (version "0.7.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "untrusted" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1kmfykcwif6ashkwg54gcnhxj03kpba2i9vc7z5rpr0xlgvrwdk0"))))
+    (build-system cargo-build-system)
+    (home-page
+      "https://github.com/briansmith/untrusted")
+    (synopsis
+      "Safe, fast, zero-panic, zero-crashing, zero-allocation parsing of untrusted inputs in Rust.")
+    (description
+      "Safe, fast, zero-panic, zero-crashing, zero-allocation parsing of untrusted inputs in Rust.")
+    (license license:isc)))
+
 (define-public rust-url
   (package
     (name "rust-url")
@@ -7236,6 +11111,33 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-urlencoded
+  (package
+    (name "rust-urlencoded")
+    (version "0.6.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "urlencoded" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1qrkblcj3gpz256d5fci9g9ig20mxlavy25gj6p612qi740zalha"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-bodyparser" ,rust-bodyparser)
+         ("rust-iron" ,rust-iron)
+         ("rust-plugin" ,rust-plugin)
+         ("rust-url" ,rust-url))))
+    (home-page "https://github.com/iron/urlencoded")
+    (synopsis
+      "URL Encoded middleware for the Iron web framework. Decode URL Encoded data from GET request queries and POST request bodies.")
+    (description
+      "URL Encoded middleware for the Iron web framework. Decode URL Encoded data from GET request queries and POST request bodies.")
+    (license license:expat)))
+
 (define-public rust-utf8-ranges
   (package
     (name "rust-utf8-ranges")
@@ -7350,6 +11252,28 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-version-check
+  (package
+    (name "rust-version-check")
+    (version "0.9.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "version_check" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1kikqlnggii1rvnxrbls55sc46lxvinz5k3giscgncjj4p87b1q7"))))
+    (build-system cargo-build-system)
+    (home-page
+      "https://github.com/SergioBenitez/version_check")
+    (synopsis
+      "This tiny crate checks that the running or installed rustc meets some version requirements. The version is queried by calling the Rust compiler with --version. The path to the compiler is determined first via the RUSTC environment variable. If it is not set, then rustc is used. If that fails, no determination is made, and calls return None.")
+    (description
+      "This tiny crate checks that the running or installed rustc meets some version requirements. The version is queried by calling the Rust compiler with --version. The path to the compiler is determined first via the RUSTC environment variable. If it is not set, then rustc is used. If that fails, no determination is made, and calls return None.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-version-sync
   (package
     (name "rust-version-sync")
@@ -7377,11 +11301,32 @@ writing colored text to a terminal.")
     (home-page
       "https://github.com/mgeisler/version-sync")
     (synopsis
-      "Simple crate for ensuring that version numbers in README files are
-      updated when the crate version changes.")
+      "Simple crate for ensuring that version numbers in README files are
+      updated when the crate version changes.")
+    (description
+      "Simple crate for ensuring that version numbers in README files are
+      updated when the crate version changes.")
+    (license license:expat)))
+
+(define-public rust-void
+  (package
+    (name "rust-void")
+    (version "1.0.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "void" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0zc8f0ksxvmhvgx4fdg0zyn6vdnbxd2xv9hfx4nhzg6kbs4f80ka"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/reem/rust-void.git")
+    (synopsis
+      "The uninhabited void type for use in statically impossible cases.")
     (description
-      "Simple crate for ensuring that version numbers in README files are
-      updated when the crate version changes.")
+      "The uninhabited void type for use in statically impossible cases.")
     (license license:expat)))
 
 (define-public rust-walkdir
@@ -7412,6 +11357,34 @@ writing colored text to a terminal.")
     (license (list license:unlicense
                    license:expat))))
 
+(define-public rust-want
+  (package
+    (name "rust-want")
+    (version "0.3.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "want" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "181b2zmwfq389x9n2g1n37cvcvvdand832zz6v8i1l8wrdlaks0w"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-log" ,rust-bytes)
+         ("rust-try-lock" ,rust-try-lock))
+        #:cargo-development-inputs
+        (("rust-tokio-executor" ,rust-tokio-executor)
+         ("rust-tokio-sync" ,rust-tokio-sync))))
+    (home-page "https://github.com/seanmonstar/want")
+    (synopsis
+      "Detect when another Future wants a result.")
+    (description
+      "Detect when another Future wants a result.")
+    (license license:expat)))
+
 (define-public rust-wasm-bindgen
   (package
     (name "rust-wasm-bindgen")
@@ -7473,6 +11446,44 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-wasm-bindgen-futures
+  (package
+    (name "rust-wasm-bindgen-futures")
+    (version "0.3.27")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "wasm-bindgen-futures" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "073p71skp91d9v2wczl6k7z9p0w25vn43br2v2g1ncbc6hvhnhl3"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-cfg-if" ,rust-cfg-if)
+         ("rust-futures" ,rust-futures)
+         ("rust-futures-channel-preview"
+          ,rust-futures-channel-preview)
+         ("rust-futures-util-preview"
+          ,rust-futures-util-preview)
+         ("rust-js-sys" ,rust-js-sys)
+         ("rust-lazy-static" ,rust-lazy-static)
+         ("rust-wasm-bindgen" ,rust-wasm-bindgen)
+         ("rust-web-sys" ,rust-web-sys))
+        #:cargo-development-inputs
+        (("rust-wasm-bindgen-test"
+          ,rust-wasm-bindgen-test))))
+    (home-page
+      "https://rustwasm.github.io/wasm-bindgen/")
+    (synopsis
+      "Bridging the gap between Rust Futures and JavaScript Promises")
+    (description
+      "Bridging the gap between Rust Futures and JavaScript Promises")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-wasm-bindgen-macro
   (package
     (name "rust-wasm-bindgen-macro")
@@ -7598,6 +11609,128 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-wasm-bindgen-webidl
+  (package
+    (name "rust-wasm-bindgen-webidl")
+    (version "0.2.50")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "wasm-bindgen-webidl" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "057zak44nyrawipgi37m451fjkxz6ix5rzcw11d699rgpy4x4lxy"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-failure" ,rust-failure)
+         ("rust-heck" ,rust-heck)
+         ("rust-log" ,rust-log)
+         ("rust-proc-macro2" ,rust-proc-macro2)
+         ("rust-quote" ,rust-quote)
+         ("rust-syn" ,rust-syn)
+         ("rust-wasm-bindgen-backend"
+          ,rust-wasm-bindgen-backend)
+         ("rust-weedle" ,rust-weedle))))
+    (home-page
+      "https://rustwasm.github.io/wasm-bindgen/")
+    (synopsis
+      "Support for parsing WebIDL specific to wasm-bindgen")
+    (description
+      "Support for parsing WebIDL specific to wasm-bindgen")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-web-sys
+  (package
+    (name "rust-web-sys")
+    (version "0.3.27")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "web-sys" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0lccdl3ihqh70s48dzvzpm09gpwvdjyw4wksk848dm0a41vw8db4"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-js-sys" ,rust-js-sys)
+         ("rust-wasm-bindgen" ,rust-wasm-bindgen))
+        #:cargo-development-inputs
+        (("rust-env-logger" ,rust-env-logger)
+         ("rust-failure" ,rust-failure)
+         ("rust-futures" ,rust-futures)
+         ("rust-sourcefile" ,rust-sourcefile)
+         ("rust-wasm-bindgen-futures"
+          ,rust-wasm-bindgen-futures)
+         ("rust-wasm-bindgen-test"
+          ,rust-wasm-bindgen-test)
+         ("rust-wasm-bindgen-webidl"
+          ,rust-wasm-bindgen-webidl))))
+    (home-page
+      "https://rustwasm.github.io/wasm-bindgen/web-sys/index.html")
+    (synopsis
+      "Bindings for all Web APIs, a procedurally generated crate from WebIDL")
+    (description
+      "Bindings for all Web APIs, a procedurally generated crate from WebIDL")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-webpki
+  (package
+    (name "rust-webpki")
+    (version "0.21.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "webpki" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1d41gfai89q7drm92mgmh6fk57nikv2vqsa773i100dcf3kn9rnp"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-ring" ,rust-ring)
+         ("rust-untrusted" ,rust-untrusted))
+        #:cargo-development-inputs
+        (("rust-base64" ,rust-base64))))
+    (home-page "https://github.com/briansmith/webpki")
+    (synopsis
+      "webpki is a library that validates Web PKI (TLS/SSL) certificates. webpki is designed to provide a full implementation of the client side of the Web PKI to a diverse range of applications and devices, including embedded (IoT) applications, mobile apps, desktop applications, and server infrastructure. webpki is intended to not only be the best implementation of the Web PKI, but to also precisely define what the Web PKI is.")
+    (description
+      "webpki is a library that validates Web PKI (TLS/SSL) certificates. webpki is designed to provide a full implementation of the client side of the Web PKI to a diverse range of applications and devices, including embedded (IoT) applications, mobile apps, desktop applications, and server infrastructure. webpki is intended to not only be the best implementation of the Web PKI, but to also precisely define what the Web PKI is.")
+    (license license:isc))) ; I think
+
+(define-public rust-webpki-roots
+  (package
+    (name "rust-webpki-roots")
+    (version "0.17.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "webpki-roots" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "12vi8dh0yik0h4f0b9dnlw5i3gxyky7iblbksh6zcq4xvlvswqm2"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs (("rust-webpki" ,rust-webpki))))
+    (home-page "https://github.com/ctz/webpki-roots")
+    (synopsis
+      "Mozilla's CA root certificates for use with webpki")
+    (description
+      "Mozilla's CA root certificates for use with webpki")
+    (license license:mpl2.0)))
+
 (define-public rust-which
   (package
     (name "rust-which")
@@ -7626,6 +11759,49 @@ writing colored text to a terminal.")
       "This package provides a Rust equivalent of Unix command \"which\".  Locate installed execuable in cross platforms.")
     (license license:expat)))
 
+(define-public rust-widestring
+  (package
+    (name "rust-widestring")
+    (version "0.4.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "widestring" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1dhx6dndjsz1y7c9w06922412kdxyrrkqblvggm76mh8z17hxz7g"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-development-inputs
+        (("rust-winapi" ,rust-winapi))))
+    (home-page "https://github.com/starkat99/widestring-rs.git")
+    (synopsis
+      "A wide string Rust FFI library for converting to and from wide strings, such as those often used in Windows API or other FFI libaries. Both UTF-16 and UTF-32 types are provided, including support for malformed encoding.")
+    (description
+      "A wide string Rust FFI library for converting to and from wide strings, such as those often used in Windows API or other FFI libaries. Both UTF-16 and UTF-32 types are provided, including support for malformed encoding.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-winapi-build
+  (package
+    (name "rust-winapi-build")
+    (version "0.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "winapi-build" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1g4rqsgjky0a7530qajn2bbfcrl2v0zb39idgdws9b1l7gp5wc9d"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/retep998/winapi-rs")
+    (synopsis "Common code for build.rs in WinAPI -sys crates")
+    (description
+      "Common code for build.rs in WinAPI -sys crates.")
+    (license license:expat)))
+
 (define-public rust-winapi-util
   (package
     (name "rust-winapi-util")
@@ -7674,6 +11850,108 @@ winapi.")
     (license (list license:unlicense
                    license:expat))))
 
+(define-public rust-winreg
+  (package
+    (name "rust-winreg")
+    (version "0.6.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "winreg" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1jdcqr6zmvwyrp87h48miasfdvv16gjsb60rc8dy2kqwb3mnv65j"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-winapi" ,rust-winapi)
+         ("rust-chrono" ,rust-chrono)
+         ("rust-serde" ,rust-serde))
+        #:cargo-development-inputs
+        (("rust-rand" ,rust-rand-0.3)
+         ("rust-serde-derive" ,rust-serde-derive))))
+    (home-page "https://github.com/gentoo90/winreg-rs")
+    (synopsis
+      "Rust bindings to MS Windows Registry API.")
+    (description
+      "Rust bindings to MS Windows Registry API.")
+    (license license:expat)))
+
+(define-public rust-winutil
+  (package
+    (name "rust-winutil")
+    (version "0.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "winutil" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0vkyl3fbbf05n5ph5yz8sfaccrk9x3qsr25560w6w68ldf5i7bvx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-winapi" ,rust-winapi))))
+    (home-page "https://bitbucket.org/DaveLancaster/winutil")
+    (synopsis "A simple library wrapping a handful of useful winapi functions.")
+    (description
+      "A simple library wrapping a handful of useful winapi functions.")
+    (license license:expat)))
+
+(define-public rust-ws2-32-sys
+  (package
+    (name "rust-ws2-32-sys")
+    (version "0.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "ws2_32-sys" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0ppscg5qfqaw0gzwv2a4nhn5bn01ff9iwn6ysqnzm4n8s3myz76m"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-winapi" ,rust-winapi)
+         ("rust-winapi-build" ,rust-winapi-build))))
+    (home-page "https://github.com/retep998/winapi-rs")
+    (synopsis
+      "Contains function definitions for the Windows API library ws2_32.")
+    (description
+      "Contains function definitions for the Windows API library ws2_32.")
+    (license license:expat)))
+
+(define-public rust-xattr
+  (package
+    (name "rust-xattr")
+    (version "0.2.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "xattr" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0k556fb6f5jc907975j9c8iynl2fqz3rf0w6fiig83i4yi0kfk14"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-libc" ,rust-libc))
+        #:cargo-development-inputs
+        (("rust-tempfile" ,rust-tempfile))))
+    (home-page
+      "https://github.com/Stebalien/xattr")
+    (synopsis "unix extended filesystem attributes")
+    (description "unix extended filesystem attributes")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-xdg
   (package
     (name "rust-xdg")
@@ -7697,6 +11975,40 @@ winapi.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-xz2
+  (package
+    (name "rust-xz2")
+    (version "0.1.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "xz2" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0v4jb0193gx8s1kvd2ajsgh0ffmwhqhfmrrw1n1h2z7w6jgqcyf1"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-futures" ,rust-futures)
+         ("rust-lzma-sys" ,rust-lzma-sys)
+         ("rust-tokio-io" ,rust-tokio-io))
+        #:cargo-development-inputs
+        (("rust-quickcheck" ,rust-quickcheck)
+         ("rust-rand" ,rust-rand)
+         ("rust-tokio-core" ,rust-tokio-core))))
+    (home-page
+      "https://github.com/alexcrichton/xz2-rs")
+    (synopsis
+      "Rust bindings to liblzma providing Read/Write streams as well as low-level
+      in-memory encoding/decoding.")
+    (description
+      "Rust bindings to liblzma providing Read/Write streams as well as low-level
+      in-memory encoding/decoding.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-yaml-rust
   (package
     (name "rust-yaml-rust")
diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm
index 7773fa5..dbd3abc 100644
--- a/gn/packages/genenetwork.scm
+++ b/gn/packages/genenetwork.scm
@@ -248,11 +248,11 @@ location of a putative QTL.")
     (license license:gpl2+))))
 
 (define-public rust-qtlreaper
-  (let ((commit "eacf6ff1c3d1cd16084a70a7a425bd77080c15de")
+  (let ((commit "2e7fed6d45b0b602d80fa2a55835f96ef1cba9e3")
         (revision "1"))
     (package
       (name "rust-qtlreaper")
-      (version (git-version "0.1.3" revision commit))
+      (version "0.1.4")
       (source
         (origin
           (method git-fetch)
@@ -262,7 +262,7 @@ location of a putative QTL.")
           (file-name (git-file-name name version))
           (sha256
            (base32
-            "0gr2z54i11zz94ra4w06fhfnwnmmhl5xyc8qhlk0v2qq18yfi7ji"))))
+            "0h70aalsplmc6xn1w7ha102n3bsi3gqkbnbrjvjm2za37c07gv0g"))))
       (build-system cargo-build-system)
       (arguments
        `(#:cargo-inputs
@@ -270,7 +270,8 @@ location of a putative QTL.")
           ("rust-structopt" ,rust-structopt)
           ("rust-rayon" ,rust-rayon-1.0)
           ("rust-serde" ,rust-serde)
-          ("rust-serde-json" ,rust-serde-json))))
+          ("rust-serde-json" ,rust-serde-json)
+          ("rust-ndarray" ,rust-ndarray))))
       (home-page "https://github.com/chfi/rust-qtlreaper")
       (synopsis "Reimplementation of genenetwork/QTLReaper in Rust")
       (description "Reimplementation of genenetwork/QTLReaper in Rust")
-- 
cgit v1.2.3


From 5ceeeec3b50018cde68725ae604c53e30c07cada Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Mon, 26 Aug 2019 08:09:32 -0500
Subject: gn: Updates to crates

---
 gn/packages/crates-io.scm | 712 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 603 insertions(+), 109 deletions(-)

(limited to 'gn/packages/crates-io.scm')

diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index 098e279..9a6ad48 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -5,7 +5,16 @@
   #:use-module (guix download)
   #:use-module (guix utils)
   #:use-module (guix build-system cargo)
-  #:use-module (gnu packages crates-io))
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages crates-io)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages jemalloc)
+  #:use-module (gnu packages llvm)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages ssh)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control))
 
 ;; Please keep these packages sorted alphabetically
 
@@ -651,7 +660,7 @@
                         (string-append clang "/lib")))
               #t)))))
     (inputs
-     `(("libclang" ,(@ (gnu packages llvm) clang))))
+     `(("libclang" ,clang)))
     (home-page
       "https://rust-lang.github.io/rust-bindgen/")
     (synopsis
@@ -729,6 +738,28 @@
          (base32
           "0l9c1gjhld3ajalak1ipklxfjvwqyy3l7xl019spdbqlrk8r9f57"))))))
 
+(define-public rust-blas-sys
+  (package
+    (name "rust-blas-sys")
+    (version "0.7.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "blas-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0h14zjycwc76v15h8qll9z1xiryvmpvsb5gam97pqpdjrrwv5c8k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-libc" ,rust-libc))))
+    (home-page "https://github.com/blas-lapack-rs/blas-sys")
+    (synopsis "Bindings to BLAS (Fortran).")
+    (description
+     "Ths package provides bindings to BLAS (Fortran).")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-blobby
   (package
     (name "rust-blobby")
@@ -983,7 +1014,7 @@
                         (string-append clang "/lib")))
               #t)))))
     (inputs
-     `(("libclang" ,(@ (gnu packages llvm) clang))))
+     `(("libclang" ,clang)))
     (home-page
       "https://github.com/jethrogb/rust-cexpr")
     (synopsis "A C expression parser and evaluator")
@@ -1084,7 +1115,7 @@
                         (string-append clang "/lib")))
               #t)))))
     (inputs
-     `(("libclang" ,(@ (gnu packages llvm) clang))))
+     `(("libclang" ,clang)))
     (home-page
       "https://github.com/KyleMayes/clang-sys")
     (synopsis "Rust bindings for libclang.")
@@ -1387,6 +1418,34 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-cookie-store-0.7
+  (package
+    (inherit rust-cookie-store)
+    (name "rust-cookie-store")
+    (version "0.7.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "cookie_store" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "174i9k9g62pfx7y1nqynywdpjplkl3j4hi3ck6bz2r996qzhnxa6"))))
+    (arguments
+      `(#:cargo-inputs
+        (("rust-cookie" ,rust-cookie)
+         ("rust-idna" ,rust-idna)
+         ("rust-log" ,rust-log)
+         ("rust-publicsuffix" ,rust-publicsuffix)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-json" ,rust-serde-json)
+         ("rust-time" ,rust-time)
+         ("rust-try-from" ,rust-try-from)
+         ("rust-url" ,rust-url))
+        #:cargo-development-inputs
+        (("rust-env-logger" ,rust-env-logger)
+         ("rust-pretty-assertions" ,rust-pretty-assertions))))))
+
 (define-public rust-core-arch
   (package
     (name "rust-core-arch")
@@ -2204,6 +2263,187 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-encoding
+  (package
+    (name "rust-encoding")
+    (version "0.2.33")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "encoding" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1v1ndmkarh9z3n5hk53da4z56hgk9wa5kcsm7cnx345raqw983bb"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-encoding-index-japanese"
+          ,rust-encoding-index-japanese)
+         ("rust-encoding-index-korean"
+          ,rust-encoding-index-korean)
+         ("rust-encoding-index-simpchinese"
+          ,rust-encoding-index-simpchinese)
+         ("rust-encoding-index-singlebyte"
+          ,rust-encoding-index-singlebyte)
+         ("rust-encoding-index-tradchinese"
+          ,rust-encoding-index-tradchinese))
+        #:cargo-development-inputs
+        (("rust-getopts" ,rust-getopts))))
+    (home-page
+      "https://github.com/lifthrasiir/rust-encoding")
+    (synopsis "Character encoding support for Rust")
+    (description
+      "Character encoding support for Rust")
+    (license license:expat)))
+
+(define-public rust-encoding-index-japanese
+  (package
+    (name "rust-encoding-index-japanese")
+    (version "1.20141219.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "encoding_index_japanese" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "148c1lmd640p1d7fzk0nv7892mbyavvwddgqvcsm78798bzv5s04"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-encoding-index-tests"
+          ,rust-encoding-index-tests))))
+    (home-page
+      "https://github.com/lifthrasiir/rust-encoding")
+    (synopsis "Index tables for Japanese character encodings")
+    (description
+      "Index tables for Japanese character encodings")
+    (license license:cc0)))
+
+(define-public rust-encoding-index-korean
+  (package
+    (name "rust-encoding-index-korean")
+    (version "1.20141219.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "encoding_index_korean" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "10cxabp5ppygbq4y6y680856zl9zjvq7ahpiw8zj3fmwwsw3zhsd"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-encoding-index-tests"
+          ,rust-encoding-index-tests))))
+    (home-page
+      "https://github.com/lifthrasiir/rust-encoding")
+    (synopsis "Index tables for Korean character encodings")
+    (description
+      "Index tables for Korean character encodings")
+    (license license:cc0)))
+
+(define-public rust-encoding-index-simpchinese
+  (package
+    (name "rust-encoding-index-simpchinese")
+    (version "1.20141219.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "encoding_index_simpchinese" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1xria2i7mc5dqdrpqxasdbxv1qx46jjbm53if3y1i4cvj2a72ynq"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-encoding-index-tests"
+          ,rust-encoding-index-tests))))
+    (home-page
+      "https://github.com/lifthrasiir/rust-encoding")
+    (synopsis "Index tables for simple Chienese character encodings")
+    (description
+      "Index tables for simple Chienese character encodings")
+    (license license:cc0)))
+
+(define-public rust-encoding-index-singlebyte
+  (package
+    (name "rust-encoding-index-singlebyte")
+    (version "1.20141219.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "encoding_index_singlebyte" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0jp85bz2pprzvg9m95w4q0vibh67b6w3bx35lafay95jzyndal9k"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-encoding-index-tests"
+          ,rust-encoding-index-tests))))
+    (home-page
+      "https://github.com/lifthrasiir/rust-encoding")
+    (synopsis "Index tables for various single-byte character encodings")
+    (description
+      "Index tables for various single-byte character encodings")
+    (license license:cc0)))
+
+(define-public rust-encoding-index-tests
+  (package
+    (name "rust-encoding-index-tests")
+    (version "0.1.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "encoding_index_tests" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0s85y091gl17ixass49bzaivng7w8p82p6nyvz2r3my9w4mxhim2"))))
+    (build-system cargo-build-system)
+    (home-page
+      "https://github.com/lifthrasiir/rust-encoding")
+    (synopsis "Helper macros used to test index tables for character encodings")
+    (description
+      "Helper macros used to test index tables for character encodings.")
+    (license license:cc0)))
+
+(define-public rust-encoding-index-tradchinese
+  (package
+    (name "rust-encoding-index-tradchinese")
+    (version "1.20141219.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "encoding_index_tradchinese" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "060ci4iz6xfvzk38syfbjvs7pix5hch3mvxkksswmqwcd3aj03px"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-encoding-index-tests"
+          ,rust-encoding-index-tests))))
+    (home-page
+      "https://github.com/lifthrasiir/rust-encoding")
+    (synopsis "Index tables for traditional Chienese character encodings")
+    (description
+      "Index tables for traditional Chienese character encodings")
+    (license license:cc0)))
+
 (define-public rust-encoding-rs
   (package
     (name "rust-encoding-rs")
@@ -2450,7 +2690,7 @@
         (("rust-proc-macro2" ,rust-proc-macro2)
          ("rust-quote" ,rust-quote)
          ("rust-syn" ,rust-syn)
-         ("rust-synstructure" ,rust-synstructure))
+         ("rust-synstructure" ,rust-synstructure-0.10))
         #:cargo-development-inputs
         (("rust-failure" ,rust-failure))))
     (home-page
@@ -3324,8 +3564,8 @@ pseudorandom number generator")
              (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
              #t)))))
     (inputs
-     `(("libgit" ,(@ (gnu packages version-control) libgit2))
-       ("openssl" ,(@ (gnu packages tls) openssl))))
+     `(("libgit" ,libgit2)
+       ("openssl" ,openssl)))
     (home-page
       "https://github.com/rust-lang/git2-rs")
     (synopsis
@@ -4173,27 +4413,27 @@ pseudorandom number generator")
       (origin
         (method url-fetch)
         (uri (crate-uri "intel-mkl-src" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "16kq725cl4rnvfpwq9x4rl83ylcqs7d0xryagx8ijm6bdblbfabc"))))
+         (base32
+          "16kq725cl4rnvfpwq9x4rl83ylcqs7d0xryagx8ijm6bdblbfabc"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-failure" ,rust-failure)
-         ("rust-pkg-config" ,rust-pkg-config)
-         ("rust-reqwest" ,rust-reqwest)
-         ("rust-tar" ,rust-tar)
-         ("rust-xz2" ,rust-xz2))
-        #:cargo-development-inputs
-        (("rust-libc" ,rust-libc))))
-    (home-page
-      "https://github.com/termoshtt/rust-intel-mkl")
-    (synopsis
-      "Redistribution of Intel MKL as a crate.")
+     `(#:cargo-inputs
+       (("rust-failure" ,rust-failure)
+        ("rust-pkg-config" ,rust-pkg-config)
+        ("rust-reqwest" ,rust-reqwest)
+        ("rust-tar" ,rust-tar)
+        ("rust-xz2" ,rust-xz2))
+       #:cargo-development-inputs
+       (("rust-libc" ,rust-libc))))
+    (inputs
+     `(("pkg-config" ,pkg-config)
+       ("xz" ,xz)))
+    (home-page "https://github.com/termoshtt/rust-intel-mkl")
+    (synopsis "Redistribution of Intel MKL as a crate")
     (description
-      "Redistribution of Intel MKL as a crate.")
+     "Redistribution of Intel @acronym{MKL, Math Kernel Library} as a crate.")
     (license (list license:non-copyleft "Intel Simplified Software License"
                    license:expat)))) ; some wrapper codes
 
@@ -4272,7 +4512,7 @@ pseudorandom number generator")
     (arguments
       `(#:cargo-inputs
         (("rust-libc" ,rust-libc)
-         ("rust-winapi" ,rust-winapi))))
+         ("rust-winapi" ,rust-winapi-0.2))))
     (home-page "https://github.com/carllerche/iovec")
     (synopsis
       "Portable buffer type for scatter/gather I/O operations")
@@ -4390,7 +4630,7 @@ pseudorandom number generator")
                        (string-append jemalloc "/lib/libjemalloc_pic.a")))
              #t)))))
     (inputs
-     `(("jemalloc" ,(@ (gnu packages jemalloc) jemalloc))))
+     `(("jemalloc" ,jemalloc)))
     (home-page "https://github.com/gnzlbg/jemallocator")
     (synopsis
       "A safe wrapper over jemalloc's control and introspection APIs")
@@ -4432,7 +4672,7 @@ pseudorandom number generator")
                        (string-append jemalloc "/lib/libjemalloc_pic.a")))
              #t)))))
     (inputs
-     `(("jemalloc" ,(@ (gnu packages jemalloc) jemalloc))))
+     `(("jemalloc" ,jemalloc)))
     (home-page "https://github.com/gnzlbg/jemallocator")
     (synopsis "Rust FFI bindings to jemalloc")
     (description "Rust FFI bindings to jemalloc")
@@ -4468,7 +4708,7 @@ pseudorandom number generator")
                        (string-append jemalloc "/lib/libjemalloc_pic.a")))
              #t)))))
     (inputs
-     `(("jemalloc" ,(@ (gnu packages jemalloc) jemalloc))))
+     `(("jemalloc" ,jemalloc)))
     (home-page "https://github.com/gnzlbg/jemallocator")
     (synopsis "A Rust allocator backed by jemalloc")
     (description
@@ -4711,10 +4951,10 @@ pseudorandom number generator")
              (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
              #t)))))
     (inputs
-     `(("libgit" ,(@ (gnu packages version-control) libgit2))
-       ("openssl" ,(@ (gnu packages tls) openssl))
-       ("pkg-config" ,(@ (gnu packages pkg-config) pkg-config))
-       ("zlib" ,(@ (gnu packages compression) zlib))))
+     `(("libgit" ,libgit2)
+       ("openssl" ,openssl)
+       ("pkg-config" ,pkg-config)
+       ("zlib" ,zlib)))
     (home-page
       "https://github.com/rust-lang/git2-rs")
     (synopsis
@@ -4789,10 +5029,10 @@ pseudorandom number generator")
              (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
              #t)))))
     (inputs
-     `(("libssh2" ,(@ (gnu packages ssh) libssh2))
-       ("openssl" ,(@ (gnu packages tls) openssl))
-       ("pkg-config" ,(@ (gnu packages pkg-config) pkg-config))
-       ("zlib" ,(@ (gnu packages compression) zlib))))
+     `(("libssh2" ,libssh2)
+       ("openssl" ,openssl)
+       ("pkg-config" ,pkg-config)
+       ("zlib" ,zlib)))
     (home-page
       "https://github.com/alexcrichton/ssh2-rs")
     (synopsis
@@ -4835,8 +5075,8 @@ pseudorandom number generator")
              (delete-file-recursively "src/zlib")
              #t)))))
     (inputs
-     `(("pkg-config" ,(@ (gnu packages pkg-config) pkg-config))
-       ("zlib" ,(@ (gnu packages compression) zlib))))
+     `(("pkg-config" ,pkg-config)
+       ("zlib" ,zlib)))
     (home-page "https://github.com/alexcrichton/libz-sys")
     (synopsis "Bindings to the system libz library (also known as zlib).")
     (description
@@ -4936,6 +5176,24 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-lock-api-0.1
+  (package
+    (inherit rust-lock-api)
+    (name "rust-lock-api")
+    (version "0.1.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "lock_api" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0b24q9mh258xa52ap636q1sxz0j5vrnp0hwbbh7ddjka3wwz3sv2"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-owning-ref" ,rust-owning-ref)
+        ("rust-scopeguard" ,rust-scopeguard-0.3))))))
+
 (define-public rust-log
   (package
     (name "rust-log")
@@ -5045,30 +5303,31 @@ pseudorandom number generator")
       (origin
         (method url-fetch)
         (uri (crate-uri "lzma-sys" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "14gyj256yh0wm77jbvmlc39v7lfn0navpfrja4alczarzlc8ir2k"))))
+         (base32
+          "14gyj256yh0wm77jbvmlc39v7lfn0navpfrja4alczarzlc8ir2k"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-libc" ,rust-libc))
-        #:cargo-development-inputs
-        (("rust-cc" ,rust-cc)
-         ("rust-pkg-config" ,rust-pkg-config))))
-    (home-page
-      "https://github.com/alexcrichton/xz2-rs")
-    (synopsis
-      "Raw bindings to liblzma which contains an implementation of LZMA and xz stream
-      encoding/decoding.
-
-      High level Rust bindings are available in the `xz2` crate.")
+     `(#:cargo-inputs
+       (("rust-cc" ,rust-cc)
+        ("rust-libc" ,rust-libc)
+        ("rust-pkg-config" ,rust-pkg-config))
+        #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'unbundle-xz
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((xz (assoc-ref inputs "xz")))
+               (delete-file-recursively "xz-5.2"))
+             #t)))))
+    (inputs
+     `(("pkg-config" ,pkg-config)
+       ("xz" ,xz)))
+    (home-page "https://github.com/alexcrichton/xz2-rs")
+    (synopsis "Bindings to liblzma for lzma and xz stream encoding/decoding")
     (description
-        "Raw bindings to liblzma which contains an implementation of LZMA and xz stream
-        encoding/decoding.
-
-        High level Rust bindings are available in the `xz2` crate.")
+     "Raw bindings to liblzma which contains an implementation of LZMA and xz
+stream encoding/decoding.")
     (license (list license:asl2.0
                    license:expat))))
 
@@ -5335,7 +5594,7 @@ pseudorandom number generator")
          ("rust-kernel32-sys" ,rust-kernel32-sys)
          ("rust-libc" ,rust-libc)
          ("rust-log" ,rust-log)
-         ("rust-miow" ,rust-miow)
+         ("rust-miow" ,rust-miow-0.2)
          ("rust-net2" ,rust-net2)
          ("rust-slab" ,rust-slab)
          ("rust-winapi" ,rust-winapi))
@@ -5407,6 +5666,28 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-miow-0.2
+  (package
+    (inherit rust-miow)
+    (name "rust-miow")
+    (version "0.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "miow" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "06g9b8sqlh5gxakwqq4rrib07afwanfnxgxajrldwcgk3hxjy7wc"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-kernel32-sys" ,rust-kernel32-sys)
+        ("rust-net2" ,rust-net2)
+        ("rust-winapi" ,rust-winapi-0.2)
+        ("rust-ws2-32-sys" ,rust-ws2-32-sys))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.3))))))
+
 (define-public rust-modifier
   (package
     (name "rust-modifier")
@@ -5535,16 +5816,27 @@ pseudorandom number generator")
       (origin
         (method url-fetch)
         (uri (crate-uri "netlib-src" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "112hwfw1zzdj10h3j213xxqjrq38iygb3nb3ijay65ycmrg819s4"))))
+         (base32
+          "112hwfw1zzdj10h3j213xxqjrq38iygb3nb3ijay65ycmrg819s4"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-development-inputs
-        (("rust-cmake" ,rust-cmake)
-         ("rust-libc" ,rust-libc))))
+     `(#:cargo-development-inputs
+       (("rust-cmake" ,rust-cmake)
+        ("rust-libc" ,rust-libc))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'use-system-lapack
+           (lambda _
+             (delete-file-recursively "source")
+             (substitute* "Cargo.toml"
+               (("default .*")
+                "default = [\"system\"]\n"))
+             #t)))))
+    (inputs
+     `(("gfortran:lib" ,gfortran "lib")
+       ("lapack" ,lapack)))
     (home-page "https://github.com/cmr/netlib-src")
     (synopsis
       "The package provides a source of BLAS and LAPACK via Netlib.")
@@ -5870,7 +6162,7 @@ implementation (which is unstable / requires nightly).")
                (setenv "OPENSSL_DIR" openssl))
              #t)))))
     (inputs
-     `(("openssl" ,(@ (gnu packages tls) openssl))))
+     `(("openssl" ,openssl)))
     (home-page
       "https://github.com/sfackler/rust-openssl")
     (synopsis "OpenSSL bindings")
@@ -5957,8 +6249,8 @@ implementation (which is unstable / requires nightly).")
                (setenv "OPENSSL_DIR" openssl))
              #t)))))
     (inputs
-     `(("openssl" ,(@ (gnu packages tls) openssl))
-       ("pkg-config" ,(@ (gnu packages pkg-config) pkg-config))))
+     `(("openssl" ,openssl)
+       ("pkg-config" ,pkg-config)))
     (home-page
       "https://github.com/sfackler/rust-openssl")
     (synopsis "FFI bindings to OpenSSL")
@@ -5984,9 +6276,9 @@ implementation (which is unstable / requires nightly).")
        (("rust-serde" ,rust-serde))
        #:cargo-development-inputs
        (("rust-fnv" ,rust-fnv)
-        ("rust-itertools" ,rust-itertools)
+        ("rust-itertools" ,rust-itertools-0.7)
         ("rust-lazy-static" ,rust-lazy-static)
-        ("rust-quickcheck" ,rust-quickcheck)
+        ("rust-quickcheck" ,rust-quickcheck-0.6)
         ("rust-rand" ,rust-rand-0.4)
         ("rust-serde-test" ,rust-serde-test))))
     (home-page "https://github.com/bluss/ordermap")
@@ -5998,6 +6290,30 @@ implementation (which is unstable / requires nightly).")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-ordermap-0.3
+  (package
+    (inherit rust-ordermap)
+    (name "rust-ordermap")
+    (version "0.3.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "ordermap" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0qr0a50l0qakbjcck93qdayd0xl8gzpp42x0n7b75cs4ybsx6vm8"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-serde" ,rust-serde))
+       #:cargo-development-inputs
+       (("rust-fnv" ,rust-fnv)
+        ("rust-itertools" ,rust-itertools-0.7)
+        ("rust-lazy-static" ,rust-lazy-static)
+        ("rust-quickcheck" ,rust-quickcheck-0.6)
+        ("rust-rand" ,rust-rand-0.4)
+        ("rust-serde-test" ,rust-serde-test))))))
+
 (define-public rust-owning-ref
   (package
     (name "rust-owning-ref")
@@ -6212,6 +6528,26 @@ implementation (which is unstable / requires nightly).")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-parking-lot-0.7
+  (package
+    (inherit rust-parking-lot)
+    (name "rust-parking-lot")
+    (version "0.7.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "parking_lot" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0dz32cqx9200n1lk3kwyb599vabfid3f8sj1aq85sw42s2pb8hdb"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-lock-api" ,rust-lock-api-0.1)
+        ("rust-parking-lot-core" ,rust-parking-lot-core-0.4))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.6))))))
+
 (define-public rust-parking-lot-core
   (package
     (name "rust-parking-lot-core")
@@ -6248,6 +6584,29 @@ implementation (which is unstable / requires nightly).")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-parking-lot-core-0.4
+  (package
+    (inherit rust-parking-lot-core)
+    (name "rust-parking-lot-core")
+    (version "0.4.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "parking_lot_core" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1jcq8aq4wv9y5fip7jg12jdwjd5g5r3x857xdma8vcin769cgj4l"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc)
+        ("rust-rand" ,rust-rand-0.6)
+        ("rust-rustc-version" ,rust-rustc-version)
+        ("rust-winapi" ,rust-winapi)
+        ("rust-backtrace" ,rust-backtrace)
+        ("rust-petgraph" ,rust-petgraph)
+        ("rust-thread-id" ,rust-thread-id))))))
+
 (define-public rust-paste
   (package
     (name "rust-paste")
@@ -6467,7 +6826,7 @@ implementation (which is unstable / requires nightly).")
     (arguments
       `(#:cargo-inputs
         (("rust-fixedbitset" ,rust-fixedbitset)
-         ("rust-ordermap" ,rust-ordermap)
+         ("rust-ordermap" ,rust-ordermap-0.3)
          ("rust-quickcheck" ,rust-quickcheck)
          ("rust-serde" ,rust-serde)
          ("rust-serde-derive" ,rust-serde-derive))
@@ -6528,7 +6887,7 @@ implementation (which is unstable / requires nightly).")
      `(#:cargo-development-inputs
        (("rust-lazy-static" ,rust-lazy-static))))
     (inputs
-     `(("pkg-config" ,(@ (gnu packages pkg-config) pkg-config))))
+     `(("pkg-config" ,pkg-config)))
     (home-page
       "https://github.com/alexcrichton/pkg-config-rs")
     (synopsis
@@ -7866,7 +8225,7 @@ system calls.")
         (("rust-base64" ,rust-base64)
          ("rust-bytes" ,rust-bytes)
          ("rust-cookie" ,rust-cookie)
-         ("rust-cookie-store" ,rust-cookie-store)
+         ("rust-cookie-store" ,rust-cookie-store-0.7)
          ("rust-encoding-rs" ,rust-encoding-rs)
          ("rust-flate2" ,rust-flate2)
          ("rust-futures" ,rust-futures)
@@ -7877,7 +8236,7 @@ system calls.")
          ("rust-mime-guess" ,rust-mime-guess)
          ("rust-serde" ,rust-serde)
          ("rust-serde-json" ,rust-serde-json)
-         ("rust-serde-urlencoded" ,rust-urlencoded)
+         ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.5)
          ("rust-time" ,rust-time)
          ("rust-tokio" ,rust-tokio)
          ("rust-tokio-executor" ,rust-tokio-executor)
@@ -8227,6 +8586,20 @@ system calls.")
       "Rust bindings to the Windows SChannel APIs providing TLS client and server functionality.")
     (license license:expat)))
 
+(define-public rust-scoped-tls-0.1
+  (package
+    (inherit rust-scoped-tls)
+    (name "rust-scoped-tls")
+    (version "0.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "scoped-tls" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk"))))))
+
 (define-public rust-scopeguard-0.3
   (package
     (inherit rust-scopeguard)
@@ -8724,6 +9097,57 @@ function with proven statistical guarantees.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-serde-urlencoded
+  (package
+    (name "rust-serde-urlencoded")
+    (version "0.6.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde_urlencoded" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "15rcwfkff0md5i231m2ym5756ksw1mkh5b5g2rw72wsc5mzdgicy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-dtoa" ,rust-dtoa)
+        ("rust-itoa" ,rust-itoa)
+        ("rust-serde" ,rust-serde)
+        ("rust-url" ,rust-url))
+       #:cargo-development-inputs
+       (("rust-serde-derive" ,rust-serde-derive))))
+    (home-page "https://serde.rs")
+    (synopsis
+      "`x-www-form-urlencoded` meets Serde")
+    (description
+      "`x-www-form-urlencoded` meets Serde")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-serde-urlencoded-0.5
+  (package
+    (inherit rust-serde-urlencoded)
+    (name "rust-serde-urlencoded")
+    (version "0.5.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde_urlencoded" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0nhnzllx5xrij4x17g351n14md691r95mxr7sbpz4sl80n8xcbb4"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-dtoa" ,rust-dtoa)
+        ("rust-itoa" ,rust-itoa)
+        ("rust-serde" ,rust-serde)
+        ("rust-url" ,rust-url-1))
+       #:cargo-development-inputs
+       (("rust-serde-derive" ,rust-serde-derive))))))
+
 (define-public rust-serde-yaml
   (package
     (name "rust-serde-yaml")
@@ -9405,6 +9829,29 @@ function with proven statistical guarantees.")
       "Helper methods and macros for custom derives")
     (license license:expat)))
 
+(define-public rust-synstructure-0.10
+  (package
+    (inherit rust-synstructure)
+    (name "rust-synstructure")
+    (version "0.10.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "synstructure" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0grirdkgh2wl4hf9a3nbiazpgccxgq54kn52ms0xrr6njvgkwd82"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2)
+        ("rust-quote" ,rust-quote)
+        ("rust-syn" ,rust-syn)
+        ("rust-unicode-xid" ,rust-unicode-xid))
+       #:cargo-development-inputs
+       (("rust-synstructure-test-traits"
+         ,rust-synstructure-test-traits))))))
+
 (define-public rust-tar
   (package
     (name "rust-tar")
@@ -9931,7 +10378,7 @@ writing colored text to a terminal.")
          ("rust-iovec" ,rust-iovec)
          ("rust-log" ,rust-log)
          ("rust-mio" ,rust-mio)
-         ("rust-scoped-tls" ,rust-scoped-tls)
+         ("rust-scoped-tls" ,rust-scoped-tls-0.1)
          ("rust-tokio" ,rust-tokio)
          ("rust-tokio-executor" ,rust-tokio-executor)
          ("rust-tokio-io" ,rust-tokio-io)
@@ -10123,7 +10570,7 @@ writing colored text to a terminal.")
          ("rust-log" ,rust-log)
          ("rust-mio" ,rust-mio)
          ("rust-num-cpus" ,rust-num-cpus)
-         ("rust-parking-lot" ,rust-parking-lot)
+         ("rust-parking-lot" ,rust-parking-lot-0.7)
          ("rust-slab" ,rust-slab)
          ("rust-tokio-executor" ,rust-tokio-executor)
          ("rust-tokio-io" ,rust-tokio-io)
@@ -11111,6 +11558,34 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-url-1
+  (package
+    (inherit rust-url)
+    (name "rust-url")
+    (version "1.7.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "url" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0nim1c90mxpi9wgdw2xh8dqd72vlklwlzam436akcrhjac6pqknx"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-idna" ,rust-idna)
+        ("rust-matches" ,rust-matches)
+        ("rust-percent-encoding" ,rust-percent-encoding)
+        ("rust-encoding" ,rust-encoding)
+        ("rust-heapsize" ,rust-heapsize)
+        ("rust-rustc-serialize" ,rust-rustc-serialize)
+        ("rust-serde" ,rust-serde))
+       #:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher)
+        ("rust-rustc-serialize" ,rust-rustc-test)
+        ("rust-rustc-test" ,rust-rustc-test)
+        ("rust-serde-json" ,rust-serde-json))))))
+
 (define-public rust-urlencoded
   (package
     (name "rust-urlencoded")
@@ -11783,6 +12258,27 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-winapi-0.2
+  (package
+    (inherit rust-winapi)
+    (name "rust-winapi")
+    (version "0.2.8")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "winapi" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0yh816lh6lf56dpsgxy189c2ai1z3j8mw9si6izqb6wsjkbcjz8n"))))
+    ;; We do not want to package 48 -sys crates for a package we do not want.
+    ;; They are all dev dependencies, so we skip building and testing.
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'build))))))
+
 (define-public rust-winapi-build
   (package
     (name "rust-winapi-build")
@@ -11828,7 +12324,7 @@ winapi.")
 (define-public rust-wincolor
   (package
     (name "rust-wincolor")
-    (version "1.0.1")
+    (version "1.0.2")
     (source
       (origin
         (method url-fetch)
@@ -11836,17 +12332,17 @@ winapi.")
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1fp9sxq63kw3vjjcjrl3f7px082pplzxcr3qza2n2pa6mq0xj7jn"))))
+          "1agaf3hcav113i86912ajnw6jxcy4rvkrgyf8gdj8kc031mh3xcn"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-winapi" ,rust-winapi)
         ("rust-winapi-util" ,rust-winapi-util))))
     (home-page "https://github.com/BurntSushi/termcolor/tree/master/wincolor")
-    (synopsis
-      "A simple Windows specific API for controlling text color in a Windows console.")
+    (synopsis "Windows API for controlling text color in a Windows console")
     (description
-      "This package provides a simple Windows specific API for controlling text color in a Windows console.")
+     "This package provides a simple Windows specific API for controlling text
+color in a Windows console.")
     (license (list license:unlicense
                    license:expat))))
 
@@ -11909,16 +12405,15 @@ winapi.")
       (origin
         (method url-fetch)
         (uri (crate-uri "ws2_32-sys" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0ppscg5qfqaw0gzwv2a4nhn5bn01ff9iwn6ysqnzm4n8s3myz76m"))))
+         (base32
+          "0ppscg5qfqaw0gzwv2a4nhn5bn01ff9iwn6ysqnzm4n8s3myz76m"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-winapi" ,rust-winapi)
-         ("rust-winapi-build" ,rust-winapi-build))))
+     `(#:cargo-inputs
+       (("rust-winapi" ,rust-winapi-0.2)
+        ("rust-winapi-build" ,rust-winapi-build))))
     (home-page "https://github.com/retep998/winapi-rs")
     (synopsis
       "Contains function definitions for the Windows API library ws2_32.")
@@ -11983,29 +12478,28 @@ winapi.")
       (origin
         (method url-fetch)
         (uri (crate-uri "xz2" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0v4jb0193gx8s1kvd2ajsgh0ffmwhqhfmrrw1n1h2z7w6jgqcyf1"))))
+         (base32
+          "0v4jb0193gx8s1kvd2ajsgh0ffmwhqhfmrrw1n1h2z7w6jgqcyf1"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-futures" ,rust-futures)
-         ("rust-lzma-sys" ,rust-lzma-sys)
-         ("rust-tokio-io" ,rust-tokio-io))
-        #:cargo-development-inputs
-        (("rust-quickcheck" ,rust-quickcheck)
-         ("rust-rand" ,rust-rand)
-         ("rust-tokio-core" ,rust-tokio-core))))
-    (home-page
-      "https://github.com/alexcrichton/xz2-rs")
-    (synopsis
-      "Rust bindings to liblzma providing Read/Write streams as well as low-level
-      in-memory encoding/decoding.")
+     `(#:cargo-inputs
+       (("rust-futures" ,rust-futures)
+        ("rust-lzma-sys" ,rust-lzma-sys)
+        ("rust-tokio-io" ,rust-tokio-io))
+       #:cargo-development-inputs
+       (("rust-quickcheck" ,rust-quickcheck-0.7)
+        ("rust-rand" ,rust-rand-0.5)
+        ("rust-tokio-core" ,rust-tokio-core))))
+    (inputs
+     `(("pkg-config" ,pkg-config)
+       ("xz" ,xz)))
+    (home-page "https://github.com/alexcrichton/xz2-rs")
+    (synopsis "Rust bindings to liblzma providing Read/Write streams")
     (description
-      "Rust bindings to liblzma providing Read/Write streams as well as low-level
-      in-memory encoding/decoding.")
+     "Rust bindings to liblzma providing Read/Write streams as well as low-level
+in-memory encoding/decoding.")
     (license (list license:asl2.0
                    license:expat))))
 
@@ -12027,7 +12521,7 @@ winapi.")
       `(#:cargo-inputs
         (("rust-linked-hash-map" ,rust-linked-hash-map))
         #:cargo-development-inputs
-        (("rust-quickcheck" ,rust-quickcheck))))
+        (("rust-quickcheck" ,rust-quickcheck-0.7))))
     (home-page
       "http://chyh1990.github.io/yaml-rust/")
     (synopsis "The missing YAML 1.2 parser for rust")
-- 
cgit v1.2.3


From 15d97b549a20de4bc97b8b0b2a77da47b6287ce0 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Wed, 28 Aug 2019 05:27:29 -0500
Subject: gn: Update some crates

---
 gn/packages/crates-io.scm | 429 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 334 insertions(+), 95 deletions(-)

(limited to 'gn/packages/crates-io.scm')

diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index 9a6ad48..1e64e46 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -26,17 +26,19 @@
       (origin
         (method url-fetch)
         (uri (crate-uri "accelerate-src" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "17fiqyq7f9k41pbsyrvk9pxyx9z6fw399wq036cvwkbmb14xcpj1"))))
+         (base32
+          "17fiqyq7f9k41pbsyrvk9pxyx9z6fw399wq036cvwkbmb14xcpj1"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-development-inputs
-        (("rust-libc" ,rust-libc))))
-    (home-page
-      "https://github.com/blas-lapack-rs/accelerate-src")
+     `(#:cargo-development-inputs
+       (("rust-libc" ,rust-libc))
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'build)))) ; only available for macOS
+    (home-page "https://github.com/blas-lapack-rs/accelerate-src")
     (synopsis
       "The package provides a source of BLAS and LAPACK via the Accelerate framework.")
     (description
@@ -82,6 +84,37 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-addr2line-0.9
+  (package
+    (inherit rust-addr2line)
+    (name "rust-addr2line")
+    (version "0.9.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "addr2line" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "17rlf04nx3g3rcy661v24ksnmpk6vqn680g5b5sp8lk20iih2xnx"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cpp-demangle" ,rust-cpp-demangle)
+        ("rust-fallible-iterator"
+         ,rust-fallible-iterator)
+        ("rust-gimli" ,rust-gimli)
+        ("rust-intervaltree" ,rust-intervaltree)
+        ("rust-lazycell" ,rust-lazycell)
+        ("rust-object" ,rust-object)
+        ("rust-rustc-demangle" ,rust-rustc-demangle)
+        ("rust-smallvec" ,rust-smallvec))
+       #:cargo-development-inputs
+       (("rust-backtrace" ,rust-backtrace)
+        ("rust-clap" ,rust-clap)
+        ("rust-findshlibs" ,rust-findshlibs)
+        ("rust-memmap" ,rust-memmap)
+        ("rust-rustc-test" ,rust-rustc-test))))))
+
 (define-public rust-adler32
   (package
     (name "rust-adler32")
@@ -290,19 +323,17 @@
       (origin
         (method url-fetch)
         (uri (crate-uri "ascii" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "1mn5az4hkxgjhwy157pr1nrfdb3qjpw8jw8v91m2i8wg59b21qwi"))))
+         (base32
+          "1mn5az4hkxgjhwy157pr1nrfdb3qjpw8jw8v91m2i8wg59b21qwi"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-quickcheck" ,rust-quickcheck)
-         ("rust-serde" ,rust-serde)
-         ("rust-serde-test" ,rust-serde-test))))
-    (home-page
-      "https://github.com/tomprogrammer/rust-ascii")
+     `(#:cargo-inputs
+       (("rust-quickcheck" ,rust-quickcheck-0.6)
+        ("rust-serde" ,rust-serde)
+        ("rust-serde-test" ,rust-serde-test))))
+    (home-page "https://github.com/tomprogrammer/rust-ascii")
     (synopsis
       "ASCII-only equivalents to `char`, `str` and `String`.")
     (description
@@ -465,35 +496,30 @@
       (origin
         (method url-fetch)
         (uri (crate-uri "backtrace" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0mfwbb6832rh1za304w8x37bvs9fjbybpmmz0iksqfzsaf108w8k"))))
+         (base32
+          "0mfwbb6832rh1za304w8x37bvs9fjbybpmmz0iksqfzsaf108w8k"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-addr2line" ,rust-addr2line)
-         ("rust-backtrace-sys" ,rust-backtrace-sys)
-         ("rust-cfg-if" ,rust-cfg-if)
-         ("rust-compiler-builtins"
-          ,rust-compiler-builtins)
-         ("rust-cpp-demangle" ,rust-cpp-demangle)
-         ("rust-findshlibs" ,rust-findshlibs)
-         ("rust-goblin" ,rust-goblin)
-         ("rust-goblin" ,rust-goblin)
-         ("rust-goblin" ,rust-goblin)
-         ("rust-goblin" ,rust-goblin)
-         ("rust-libc" ,rust-libc)
-         ("rust-memmap" ,rust-memmap)
-         ("rust-rustc-demangle" ,rust-rustc-demangle)
-         ("rust-rustc-serialize" ,rust-rustc-serialize)
-         ("rust-rustc-std-workspace-core"
-          ,rust-rustc-std-workspace-core)
-         ("rust-serde" ,rust-serde)
-         ("rust-winapi" ,rust-winapi))))
-    (home-page
-      "https://github.com/rust-lang/backtrace-rs")
+     `(#:cargo-inputs
+       (("rust-addr2line" ,rust-addr2line-0.9)
+        ("rust-backtrace-sys" ,rust-backtrace-sys)
+        ("rust-cfg-if" ,rust-cfg-if)
+        ("rust-compiler-builtins"
+         ,rust-compiler-builtins)
+        ("rust-cpp-demangle" ,rust-cpp-demangle)
+        ("rust-findshlibs" ,rust-findshlibs)
+        ("rust-goblin" ,rust-goblin)
+        ("rust-libc" ,rust-libc)
+        ("rust-memmap" ,rust-memmap)
+        ("rust-rustc-demangle" ,rust-rustc-demangle)
+        ("rust-rustc-serialize" ,rust-rustc-serialize)
+        ("rust-rustc-std-workspace-core"
+         ,rust-rustc-std-workspace-core)
+        ("rust-serde" ,rust-serde)
+        ("rust-winapi" ,rust-winapi))))
+    (home-page "https://github.com/rust-lang/backtrace-rs")
     (synopsis
       "A library to acquire a stack trace (backtrace) at runtime in a Rust program.")
     (description
@@ -541,17 +567,16 @@
       (origin
         (method url-fetch)
         (uri (crate-uri "base-x" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0hv4y5cdhv6bk0ghk2434clw8v4mmk5cc9lsh6qrpri92zlfmx3n"))))
+         (base32
+          "0hv4y5cdhv6bk0ghk2434clw8v4mmk5cc9lsh6qrpri92zlfmx3n"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-development-inputs
-        (("rust-bencher" ,rust-bencher)
-         ("rust-json" ,rust-json)
-         ("rust-rand" ,rust-rand))))
+     `(#:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher)
+        ("rust-json" ,rust-json)
+        ("rust-rand" ,rust-rand-0.3))))
     (home-page "https://github.com/OrKoN/base-x-rs")
     (synopsis "Encode/decode any base")
     (description "Encode/decode any base")
@@ -586,6 +611,26 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-base64-0.9
+  (package
+    (inherit rust-base64)
+    (name "rust-base64")
+    (version "0.9.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "base64" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0hs62r35bgxslawyrn1vp9rmvrkkm76fqv0vqcwd048vs876r7a8"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder))
+       #:cargo-development-inputs
+       (("rust-safemem" ,rust-safemem)
+        ("rust-rand" ,rust-rand-0.4))))))
+
 (define-public rust-bincode
   (package
     (name "rust-bincode")
@@ -796,21 +841,20 @@
       (origin
         (method url-fetch)
         (uri (crate-uri "bodyparser" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0c1gynj9l7wv3mjrzr5jifmy0pjdwachfqz09aygdmmab3xan8zh"))))
+         (base32
+          "0c1gynj9l7wv3mjrzr5jifmy0pjdwachfqz09aygdmmab3xan8zh"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-iron" ,rust-iron)
-         ("rust-persistent" ,rust-persistent)
-         ("rust-plugin" ,rust-plugin)
-         ("rust-serde" ,rust-serde)
-         ("rust-serde-json" ,rust-serde-json))
-        #:cargo-development-inputs
-        (("rust-serde-derive" ,rust-serde-derive))))
+     `(#:cargo-inputs
+       (("rust-iron" ,rust-iron)
+        ("rust-persistent" ,rust-persistent)
+        ("rust-plugin" ,rust-plugin)
+        ("rust-serde" ,rust-serde)
+        ("rust-serde-json" ,rust-serde-json))
+       #:cargo-development-inputs
+       (("rust-serde-derive" ,rust-serde-derive))))
     (home-page "https://github.com/iron/body-parser")
     (synopsis "Body parsing middleware for Iron.")
     (description "Body parsing middleware for Iron.")
@@ -2988,7 +3032,7 @@
     (arguments
       `(#:cargo-inputs
         (("rust-byteorder" ,rust-byteorder)
-         ("rust-memmap" ,rust-memmap))
+         ("rust-memmap" ,rust-memmap-0.6))
         #:cargo-development-inputs
         (("rust-fnv" ,rust-fnv)
          ("rust-fst-levenshtein" ,rust-fst-levenshtein)
@@ -3047,7 +3091,7 @@
     (arguments
       `(#:cargo-inputs
         (("rust-fst" ,rust-fst)
-         ("rust-regex-syntax" ,rust-regex-syntax)
+         ("rust-regex-syntax" ,rust-regex-syntax-0.3)
          ("rust-utf8-ranges" ,rust-utf8-ranges))))
     (home-page "https://github.com/BurntSushi/fst")
     (synopsis
@@ -3759,6 +3803,22 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-heapsize-0.3
+  (package
+    (inherit rust-heapsize)
+    (name "rust-heapsize")
+    (version "0.3.9")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "heapsize" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0dmwc37vgsdjzk10443dj4f23439i9gch28jcwzmry3chrwx8v2m"))))
+    (arguments
+     `(#:cargo-inputs (("rust-kernel32-sys" ,rust-kernel32-sys))))))
+
 (define-public rust-heapsize-plugin
   (package
     (name "rust-heapsize-plugin")
@@ -3941,7 +4001,7 @@ pseudorandom number generator")
         #:cargo-development-inputs
         (("rust-doc-comment" ,rust-doc-comment)
          ("rust-indexmap" ,rust-indexmap)
-         ("rust-quickcheck" ,rust-quickcheck)
+         ("rust-quickcheck" ,rust-quickcheck-0.6)
          ("rust-rand" ,rust-rand-0.4)
          ("rust-seahash" ,rust-seahash)
          ("rust-serde" ,rust-serde)
@@ -4095,6 +4155,35 @@ pseudorandom number generator")
       "This package provides a fast and correct HTTP library.")
     (license license:expat)))
 
+(define-public rust-hyper-0.10
+  (package
+    (inherit rust-hyper)
+    (name "rust-hyper")
+    (version "0.10.16")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "hyper" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0wwjh9p3mzvg3fss2lqz5r7ddcgl1fh9w6my2j69d6k0lbcm41ha"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-base64" ,rust-base64-0.9)
+        ("rust-httparse" ,rust-httparse)
+        ("rust-language-tags" ,rust-language-tags)
+        ("rust-log" ,rust-log-0.3)
+        ("rust-mime" ,rust-mime-0.2)
+        ("rust-num-cpus" ,rust-num-cpus)
+        ("rust-time" ,rust-time)
+        ("rust-traitobject" ,rust-traitobject)
+        ("rust-typeable" ,rust-typeable)
+        ("rust-unicase" ,rust-unicase)
+        ("rust-url" ,rust-url))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger))))))
+
 (define-public rust-hyper-old-types
   (package
     (name "rust-hyper-old-types")
@@ -4339,9 +4428,9 @@ pseudorandom number generator")
         (("rust-serde" ,rust-serde))
         #:cargo-development-inputs
         (("rust-fnv" ,rust-fnv)
-         ("rust-itertools" ,rust-itertools)
+         ("rust-itertools" ,rust-itertools-0.7)
          ("rust-lazy-static" ,rust-lazy-static)
-         ("rust-quickcheck" ,rust-quickcheck)
+         ("rust-quickcheck" ,rust-quickcheck-0.6)
          ("rust-rand" ,rust-rand)
          ("rust-serde-test" ,rust-serde-test))))
     (home-page "https://github.com/bluss/indexmap")
@@ -4478,7 +4567,7 @@ pseudorandom number generator")
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-hyper" ,rust-hyper)
+        (("rust-hyper" ,rust-hyper-0.10)
          ("rust-log" ,rust-log)
          ("rust-mime-guess" ,rust-mime-guess)
          ("rust-modifier" ,rust-modifier)
@@ -4569,8 +4658,8 @@ pseudorandom number generator")
         (("rust-either" ,rust-either))
         #:cargo-development-inputs
         (("rust-permutohedron" ,rust-permutohedron)
-         ("rust-quickcheck" ,rust-quickcheck)
-         ("rust-rand" ,rust-rand))))
+         ("rust-quickcheck" ,rust-quickcheck-0.7)
+         ("rust-rand" ,rust-rand-0.6))))
     (home-page
       "https://github.com/bluss/rust-itertools")
     (synopsis
@@ -4763,7 +4852,7 @@ pseudorandom number generator")
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-winapi" ,rust-winapi)
+       (("rust-winapi" ,rust-winapi-0.2)
         ("rust-winapi-build" ,rust-winapi-build))))
     (home-page "https://github.com/retep998/winapi-rs")
     (synopsis "Contains function definitions for the Windows API library kernel32")
@@ -5063,9 +5152,8 @@ pseudorandom number generator")
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-libc" ,rust-libc))
-       #:cargo-development-inputs
-       (("rust-cc" ,rust-cc)
+       (("rust-libc" ,rust-libc)
+        ("rust-cc" ,rust-cc)
         ("rust-pkg-config" ,rust-pkg-config)
         ("rust-vcpkg" ,rust-vcpkg))
        #:phases
@@ -5432,6 +5520,26 @@ stream encoding/decoding.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-memmap-0.6
+  (package
+    (inherit rust-memmap)
+    (name "rust-memmap")
+    (version "0.6.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "memmap" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1zy6s0ni0lx9rjzq3gq2zz9r8zgjmbp02332g3gsj4fyhv4s5zz2"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc)
+        ("rust-winapi" ,rust-winapi))
+       #:cargo-development-inputs
+       (("rust-tempdir" ,rust-tempdir))))))
+
 (define-public rust-memoffset
   (package
     (name "rust-memoffset")
@@ -5495,6 +5603,27 @@ stream encoding/decoding.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-mime-0.2
+  (package
+    (inherit rust-mime)
+    (name "rust-mime")
+    (version "0.2.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "mime" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1q1s1ax1gaz8ld3513nvhidfwnik5asbs1ma3hp6inp5dn56nqms"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-log" ,rust-log-0.3)
+        ("rust-heapsize" ,rust-heapsize-0.3)
+        ("rust-serde" ,rust-serde-0.8))
+       #:cargo-development-inputs
+       (("rust-serde-json" ,rust-serde-json-0.8))))))
+
 (define-public rust-mime-guess
   (package
     (name "rust-mime-guess")
@@ -5656,7 +5785,7 @@ stream encoding/decoding.")
         (("rust-socket2" ,rust-socket2)
          ("rust-winapi" ,rust-winapi))
         #:cargo-development-inputs
-        (("rust-rand" ,rust-rand))))
+        (("rust-rand" ,rust-rand-0.4))))
     (home-page
       "https://github.com/alexcrichton/miow")
     (synopsis
@@ -5724,19 +5853,28 @@ stream encoding/decoding.")
             "0ki7cj4wzyd2nach4qdjly69sp7rs0yz3n3z2ii4mm1gqajg2bab"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-lazy-static" ,rust-lazy-static)
-         ("rust-libc" ,rust-libc)
-         ("rust-log" ,rust-log)
-         ("rust-openssl" ,rust-openssl)
-         ("rust-openssl-probe" ,rust-openssl-probe)
-         ("rust-openssl-sys" ,rust-openssl-sys)
-         ("rust-schannel" ,rust-schannel)
-         ("rust-security-framework" ,rust-security-framework)
-         ("rust-security-framework-sys" ,rust-security-framework-sys)
-         ("rust-tempfile" ,rust-tempfile))
-        #:cargo-development-inputs
-        (("rust-hex" ,rust-hex))))
+     `(#:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static)
+        ("rust-libc" ,rust-libc)
+        ("rust-log" ,rust-log)
+        ("rust-openssl" ,rust-openssl)
+        ("rust-openssl-probe" ,rust-openssl-probe)
+        ("rust-openssl-sys" ,rust-openssl-sys)
+        ("rust-schannel" ,rust-schannel)
+        ("rust-security-framework" ,rust-security-framework)
+        ("rust-security-framework-sys" ,rust-security-framework-sys)
+        ("rust-tempfile" ,rust-tempfile))
+       #:cargo-development-inputs
+       (("rust-hex" ,rust-hex))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'find-openssl
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((openssl (assoc-ref inputs "openssl")))
+               (setenv "OPENSSL_DIR" openssl))
+             #t)))))
+    (inputs
+     `(("openssl" ,openssl)))
     (home-page "https://github.com/sfackler/rust-native-tls")
     (synopsis
       "An abstraction over platform-specific TLS implementations.")
@@ -8178,6 +8316,25 @@ system calls.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-regex-syntax-0.3
+  (package
+    (inherit rust-regex-syntax)
+    (name "rust-regex-syntax")
+    (version "0.3.9")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "regex-syntax" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0ms9hgdhhsxw9w920i7gipydvagf100bb56jbs192rz86ln01v7r"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-quickcheck" ,rust-quickcheck-0.5) ; 0.2
+        ("rust-rand", rust-rand-0.3))))))
+
 (define-public rust-remove-dir-all
   (package
     (name "rust-remove-dir-all")
@@ -8535,6 +8692,27 @@ system calls.")
     (license (list license:asl2.0
                    license:boost1.0))))
 
+(define-public rust-safemem
+  (package
+    (name "rust-safemem")
+    (version "0.3.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "safemem" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1l1ljkm4lpyryrv2ndaxi1f7z1f3v9bwy1rzl9f9mbhx04iq9c6j"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/abonander/safemem")
+    (synopsis
+      "Safe wrappers for memory-accessing functions, like `std::ptr::copy()`.")
+    (description
+      "Safe wrappers for memory-accessing functions, like `std::ptr::copy()`.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-same-file
   (package
     (name "rust-same-file")
@@ -8879,6 +9057,23 @@ function with proven statistical guarantees.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-serde-0.8
+  (package
+    (inherit rust-serde)
+    (name "rust-serde")
+    (version "0.8.23")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1j4ajipn0sf4ya0crgcb94s848qp7mfc35n6d0q2rf8rk5skzbcx"))))
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-clippy" ,rust-clippy))))))
+
 (define-public rust-serde-big-array
   (package
     (name "rust-serde-big-array")
@@ -9025,20 +9220,27 @@ function with proven statistical guarantees.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-serde-json-1.0.39
+(define-public rust-serde-json-0.8
   (package
     (inherit rust-serde-json)
     (name "rust-serde-json")
-    (version "1.0.39")
+    (version "0.8.6")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "serde_json" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "03fl9l680gij0hrsr2csfm8nm858igvfy05czbdkzm54siqsl8ss"))))))
+          "0k3bclzbvzhiscjydqzym887i8mkh726xkf8isf3lln3xplx5xv7"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-dtoa" ,rust-dtoa-0.2)
+        ("rust-itoa" ,rust-itoa)
+        ("rust-num-traits" ,rust-num-traits)
+        ("rust-serde" ,rust-serde-0.8)
+        ("rust-clippy" ,rust-clippy)
+        ("rust-linked-hash-map" ,rust-linked-hash-map))))))
 
 (define-public rust-serde-stacker
   (package
@@ -10971,6 +11173,25 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-traitobject
+  (package
+    (name "rust-traitobject")
+    (version "0.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "traitobject" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0yb0n8822mr59j200fyr2fxgzzgqljyxflx9y8bdy3rlaqngilgg"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/reem/rust-traitobject.git")
+    (synopsis "Unsafe helpers for dealing with raw trait objects.")
+    (description "Unsafe helpers for dealing with raw trait objects.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-trust-dns-https
   (package
     (name "rust-trust-dns-https")
@@ -11292,6 +11513,24 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-typeable
+  (package
+    (name "rust-typeable")
+    (version "0.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "typeable" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "11w8dywgnm32hb291izjvh4zjd037ccnkk77ahk63l913zwzc40l"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/reem/rust-typeable")
+    (synopsis "Exposes Typeable, for getting TypeIds at runtime.")
+    (description "Exposes Typeable, for getting TypeIds at runtime.")
+    (license license:expat)))
+
 (define-public rust-typed-arena
   (package
     (name "rust-typed-arena")
-- 
cgit v1.2.3


From a367554ba4c79baabdeffd06ad6f614c8e1533f3 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Wed, 28 Aug 2019 16:53:13 +0300
Subject: gn: Remove upstreamed crates

---
 gn/packages/crates-io.scm | 1262 ++-------------------------------------------
 1 file changed, 40 insertions(+), 1222 deletions(-)

(limited to 'gn/packages/crates-io.scm')

diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index 1e64e46..b91a2b4 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -264,27 +264,6 @@
       `(#:cargo-inputs
         (("rust-winapi" ,rust-winapi))))))
 
-(define-public rust-antidote
-  (package
-    (name "rust-antidote")
-    (version "1.0.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "antidote" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "19g2sw2qa2ibnh4x7j1snk46593jgx6y7rnvva496ynq61af5z9l"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/sfackler/rust-antidote")
-    (synopsis
-      "Poison-free versions of the Rust standard library Mutex and RwLock types.")
-    (description
-      "Poison-free versions of the Rust standard library Mutex and RwLock types.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-arrayvec
   (package
     (name "rust-arrayvec")
@@ -372,7 +351,7 @@
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-atty
+(define-public rust-atty ; guix candidate, fails tests
   (package
     (name "rust-atty")
     (version "0.2.13")
@@ -380,20 +359,19 @@
       (origin
         (method url-fetch)
         (uri (crate-uri "atty" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "140sswp1bwqwc4zk80bxkbnfb3g936hgrb77g9g0k1zcld3wc0qq"))))
+         (base32
+          "140sswp1bwqwc4zk80bxkbnfb3g936hgrb77g9g0k1zcld3wc0qq"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-libc" ,rust-libc)
-         ("rust-winapi" ,rust-winapi))))
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc)
+        ("rust-winapi" ,rust-winapi))))
     (home-page "https://github.com/softprops/atty")
     (synopsis "A simple interface for querying atty")
     (description
-      "This package provides a simple interface for querying atty")
+     "This package provides a simple interface for querying atty.")
     (license license:expat)))
 
 (define-public rust-automod
@@ -783,28 +761,6 @@
          (base32
           "0l9c1gjhld3ajalak1ipklxfjvwqyy3l7xl019spdbqlrk8r9f57"))))))
 
-(define-public rust-blas-sys
-  (package
-    (name "rust-blas-sys")
-    (version "0.7.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "blas-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0h14zjycwc76v15h8qll9z1xiryvmpvsb5gam97pqpdjrrwv5c8k"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-libc" ,rust-libc))))
-    (home-page "https://github.com/blas-lapack-rs/blas-sys")
-    (synopsis "Bindings to BLAS (Fortran).")
-    (description
-     "Ths package provides bindings to BLAS (Fortran).")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-blobby
   (package
     (name "rust-blobby")
@@ -973,31 +929,6 @@
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-cblas-sys
-  (package
-    (name "rust-cblas-sys")
-    (version "0.1.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "cblas-sys" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0rgsn3klhhh09d8qf3b87zl4rwk93l2g0qzh9hhb0lff5kcfrzmn"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs (("rust-libc" ,rust-libc))))
-    (home-page
-      "https://github.com/blas-lapack-rs/cblas-sys")
-    (synopsis
-      "The package provides bindings to CBLAS (C).")
-    (description
-      "The package provides bindings to CBLAS (C).")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-cc
   (package
     (name "rust-cc")
@@ -1257,30 +1188,6 @@
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-cloudabi
-  (package
-    (name "rust-cloudabi")
-    (version "0.0.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "cloudabi" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0kxcg83jlihy0phnd2g8c2c303px3l2p3pkjz357ll6llnd5pz6x"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-bitflags" ,rust-bitflags))))
-    (home-page "https://nuxi.nl/cloudabi/")
-    (synopsis
-      "Low level interface to CloudABI. Contains all syscalls and related types.")
-    (description
-      "Low level interface to CloudABI.  Contains all syscalls and related types.")
-    (license license:bsd-2)))
-
 (define-public rust-cmake
   (package
     (name "rust-cmake")
@@ -1547,26 +1454,6 @@
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-core-foundation-sys
-  (package
-    (name "rust-core-foundation-sys")
-    (version "0.6.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "core-foundation-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0fzsw1j9g1x598yhwklg59l15hwzc0pyvs01w9fg2kin4598mjp7"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/servo/core-foundation-rs")
-    (synopsis "Bindings to Core Foundation for OS X")
-    (description
-      "Bindings to Core Foundation for OS X")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-cpp-demangle
   (package
     (name "rust-cpp-demangle")
@@ -2017,59 +1904,6 @@
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-data-encoding
-  (package
-    (name "rust-data-encoding")
-    (version "2.1.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "data-encoding" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "15xd6afhsjl08285piwczrafmckpp8i29padj8v12xhahshprx7l"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/ia0/data-encoding")
-    (synopsis
-      "This library provides the following common encodings")
-    (description
-      "This library provides the following common encodings")
-    (license license:expat)))
-
-(define-public rust-defmac
-  (package
-    (name "rust-defmac")
-    (version "0.2.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "defmac" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "01ff3jdmcc5waffkwllndnx5hsn414r7x1rq4ib73n7awsyzxkxv"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/bluss/defmac")
-    (synopsis "A macro to define lambda-like macros inline.")
-    (description "A macro to define lambda-like macros inline.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-defmac-0.1
-  (package
-    (inherit rust-defmac)
-    (name "rust-defmac")
-    (version "0.1.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "defmac" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "17giv0n0n1r64z0dahfvkjy3ys517jxyhs8sd9lmgvcljpjyryxa"))))))
-
 (define-public rust-demo-hack
   (package
     (name "rust-demo-hack")
@@ -2775,53 +2609,6 @@
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-findshlibs
-  (package
-    (name "rust-findshlibs")
-    (version "0.5.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "findshlibs" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1n2vagn0q5yim32hxkwi1cjgp3yn1dm45p7z8nw6lapywihhs9mi"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-lazy-static" ,rust-lazy-static)
-         ("rust-libc" ,rust-libc))))
-    (home-page
-      "https://github.com/gimli-rs/findshlibs")
-    (synopsis
-      "Find the set of shared libraries loaded in the current process with a cross platform API")
-    (description
-      "Find the set of shared libraries loaded in the current process with a cross platform API")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-fixedbitset
-  (package
-    (name "rust-fixedbitset")
-    (version "0.1.9")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "fixedbitset" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/bluss/fixedbitset")
-    (synopsis "FixedBitSet is a simple bitset collection")
-    (description "FixedBitSet is a simple bitset collection")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-flame
   (package
     (name "rust-flame")
@@ -2995,26 +2782,6 @@
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-foreign-types-shared
-  (package
-    (name "rust-foreign-types-shared")
-    (version "0.2.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "foreign-types-shared" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0kanxlif1vp0ffh2r9l610jqbkmb3183yqykxq1z5w1vay2rn7y6"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/sfackler/foreign-types")
-    (synopsis "An internal crate used by foreign-types")
-    (description
-     "An internal crate used by foreign-types.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-fst
   (package
     (name "rust-fst")
@@ -3268,26 +3035,6 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-futures-io-preview ; guix upstreamable
-  (package
-    (name "rust-futures-io-preview")
-    (version "0.3.0-alpha.17")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "futures-io-preview" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0fhvwhdb8ywjjbfng0ra1r8yyc9yzpyxg9sv3spb3f7w0lk40bh8"))))
-    (build-system cargo-build-system)
-    (home-page "https://rust-lang-nursery.github.io/futures-rs/")
-    (synopsis "Async read and write traits for the futures library")
-    (description "This crate provides the @code{AsyncRead} and
-@code{AsyncWrite} traits for the @code{futures-rs} library.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-futures-preview
   (package
     (name "rust-futures-preview")
@@ -4584,32 +4331,6 @@ pseudorandom number generator")
     (description "Extensible, Concurrency Focused Web Development in Rust.")
     (license license:expat)))
 
-(define-public rust-iovec
-  (package
-    (name "rust-iovec")
-    (version "0.1.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "iovec" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "025vi072m22299z3fg73qid188z2iip7k41ba6v5v5yhwwby9rnv"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-libc" ,rust-libc)
-         ("rust-winapi" ,rust-winapi-0.2))))
-    (home-page "https://github.com/carllerche/iovec")
-    (synopsis
-      "Portable buffer type for scatter/gather I/O operations")
-    (description
-      "Portable buffer type for scatter/gather I/O operations")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-ipconfig
   (package
     (name "rust-ipconfig")
@@ -4886,31 +4607,6 @@ pseudorandom number generator")
       "Language tags for Rust")
     (license license:expat)))
 
-(define-public rust-lazy-static
-  (package
-    (name "rust-lazy-static")
-    (version "1.3.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "lazy_static" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "052ac27w189hrf1j3hz7sga46rp84zl2hqnzyihxv78mgzr2jmxw"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs (("rust-spin" ,rust-spin))))
-    (home-page
-      "https://github.com/rust-lang-nursery/lazy-static.rs")
-    (synopsis
-      "A macro for declaring lazily evaluated statics in Rust.")
-    (description
-      "This package provides a macro for declaring lazily evaluated statics in Rust.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-lazycell
   (package
     (name "rust-lazycell")
@@ -5817,27 +5513,6 @@ stream encoding/decoding.")
        #:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.3))))))
 
-(define-public rust-modifier
-  (package
-    (name "rust-modifier")
-    (version "0.1.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "modifier" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0n3fmgli1nsskl0whrfzm1gk0rmwwl6pw1q4nb9sqqmn5h8wkxa1"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/reem/rust-modifier")
-    (synopsis
-      "Chaining APIs for both self -> Self and &mut self methods.")
-    (description
-      "Chaining APIs for both self -> Self and &mut self methods.")
-    (license license:expat)))
-
 (define-public rust-native-tls
   (package
     (name "rust-native-tls")
@@ -5918,34 +5593,6 @@ stream encoding/decoding.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-net2
-  (package
-    (name "rust-net2")
-    (version "0.2.33")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "net2" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "126g3fgfxp06zimc1l9iyxnn9cif1hjsg7sd81nlls5nnyghsma2"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-cfg-if" ,rust-cfg-if)
-         ("rust-libc" ,rust-libc)
-         ("rust-winapi" ,rust-winapi))))
-    (home-page
-      "https://github.com/rust-lang-nursery/net2-rs")
-    (synopsis
-      "Extensions to the standard library's networking types as proposed in RFC 1158.")
-    (description
-      "Extensions to the standard library's networking types as proposed in RFC 1158.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-netlib-src
   (package
     (name "rust-netlib-src")
@@ -6118,53 +5765,26 @@ implementation (which is unstable / requires nightly).")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-num-cpus
+(define-public rust-num-iter
   (package
-    (name "rust-num-cpus")
-    (version "1.10.1")
+    (name "rust-num-iter")
+    (version "0.1.39")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "num_cpus" version))
+        (uri (crate-uri "num-iter" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0wrj3zvj6h3q26sqj9zxpd59frjb54n7jhjwf307clq31ic47vxw"))))
+            "0bhk2qbr3261r6zvfc58lz4spfqjhvdripxgz5mks5rd85r55gbn"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-libc" ,rust-libc))
+        (("rust-num-integer" ,rust-num-integer)
+         ("rust-num-traits" ,rust-num-traits))
         #:cargo-development-inputs
-        (("rust-doc-comment" ,rust-doc-comment))))
-    (home-page
-      "https://github.com/seanmonstar/num_cpus")
-    (synopsis "Get the number of CPUs on a machine.")
-    (description
-      "Get the number of CPUs on a machine.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-num-iter
-  (package
-    (name "rust-num-iter")
-    (version "0.1.39")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "num-iter" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0bhk2qbr3261r6zvfc58lz4spfqjhvdripxgz5mks5rd85r55gbn"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-num-integer" ,rust-num-integer)
-         ("rust-num-traits" ,rust-num-traits))
-        #:cargo-development-inputs
-        (("rust-autocfg" ,rust-autocfg))))
+        (("rust-autocfg" ,rust-autocfg))))
     (home-page
       "https://github.com/rust-num/num-iter")
     (synopsis
@@ -6527,25 +6147,6 @@ implementation (which is unstable / requires nightly).")
         ("rust-wasm-bindgen" ,rust-wasm-bindgen)
         ("rust-winapi" ,rust-winapi))))))
 
-(define-public rust-rawpointer
-  (package
-    (name "rust-rawpointer")
-    (version "0.1.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "rawpointer" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "06ghpm9y7gacks78s3maakha07kbnwrxif5q37r2l7z1sali3b7b"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/bluss/rawpointer/")
-    (synopsis "Extra methods for raw pointers. For example `.post_inc()` and `.pre_dec()` (c.f. `ptr++` and `--ptr`) and `ptrdistance`.")
-    (description "Extra methods for raw pointers. For example `.post_inc()` and `.pre_dec()` (c.f. `ptr++` and `--ptr`) and `ptrdistance`.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-rspec
   (package
     (name "rust-rspec")
@@ -6799,29 +6400,6 @@ implementation (which is unstable / requires nightly).")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-permutohedron
-  (package
-    (name "rust-permutohedron")
-    (version "0.2.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "permutohedron" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0b1pzh48j86v46wxngch6k1kx9cdw3jr3lwa86gd6jd4bmxzz1xn"))))
-    (build-system cargo-build-system)
-    (home-page
-      "https://github.com/bluss/permutohedron")
-    (synopsis
-      "Generate permutations of sequences. Either lexicographical order permutations, or a minimal swaps permutation sequence implemented using Heap's algorithm.")
-    (description
-      "Generate permutations of sequences. Either lexicographical order permutations, or a minimal swaps permutation sequence implemented using Heap's algorithm.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-persistent
   (package
     (name "rust-persistent")
@@ -7007,34 +6585,6 @@ implementation (which is unstable / requires nightly).")
       "Bindings to the PicoHTTPParser.")
     (license license:expat)))
 
-(define-public rust-pkg-config
-  (package
-    (name "rust-pkg-config")
-    (version "0.3.14")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "pkg-config" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "135ia995lqzr0gxpk85h0bjxf82kj6hbxdx924sh9jdln6r8wvk7"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-development-inputs
-       (("rust-lazy-static" ,rust-lazy-static))))
-    (inputs
-     `(("pkg-config" ,pkg-config)))
-    (home-page
-      "https://github.com/alexcrichton/pkg-config-rs")
-    (synopsis
-      "A library to run the pkg-config system tool at build time in order to be used in Cargo build scripts.")
-    (description
-      "A library to run the pkg-config system tool at build time in order to be used in Cargo build scripts.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-plugin
   (package
     (name "rust-plugin")
@@ -8292,30 +7842,6 @@ system calls.")
          ("rust-quickcheck" ,rust-quickcheck-0.6)
          ("rust-rand" ,rust-rand-0.4))))))
 
-(define-public rust-regex-syntax
-  (package
-    (name "rust-regex-syntax")
-    (version "0.6.10")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "regex-syntax" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0p47lf38yj2g2fnmvnraccqlxwk35zr76hlnqi8yva932nzqam6d"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-ucd-util" ,rust-ucd-util))))
-    (home-page "https://github.com/rust-lang/regex")
-    (synopsis "A regular expression parser.")
-    (description
-      "This package provides a regular expression parser.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-regex-syntax-0.3
   (package
     (inherit rust-regex-syntax)
@@ -8329,10 +7855,9 @@ system calls.")
         (sha256
          (base32
           "0ms9hgdhhsxw9w920i7gipydvagf100bb56jbs192rz86ln01v7r"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
-       (("rust-quickcheck" ,rust-quickcheck-0.5) ; 0.2
+       (("rust-quickcheck" ,rust-quickcheck) ; 0.2
         ("rust-rand", rust-rand-0.3))))))
 
 (define-public rust-remove-dir-all
@@ -8692,107 +8217,6 @@ system calls.")
     (license (list license:asl2.0
                    license:boost1.0))))
 
-(define-public rust-safemem
-  (package
-    (name "rust-safemem")
-    (version "0.3.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "safemem" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1l1ljkm4lpyryrv2ndaxi1f7z1f3v9bwy1rzl9f9mbhx04iq9c6j"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/abonander/safemem")
-    (synopsis
-      "Safe wrappers for memory-accessing functions, like `std::ptr::copy()`.")
-    (description
-      "Safe wrappers for memory-accessing functions, like `std::ptr::copy()`.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-same-file
-  (package
-    (name "rust-same-file")
-    (version "1.0.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "same-file" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "08a4zy10pjindf2rah320s6shgswk13mqw7s61m8i1y1xpf8spjq"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-winapi-util" ,rust-winapi-util))))
-    (home-page
-      "https://github.com/BurntSushi/same-file")
-    (synopsis
-      "A simple crate for determining whether two file paths point to the same file.")
-    (description
-      "This package provides a simple crate for determining whether two file paths point to the same file.")
-    (license (list license:unlicense
-                   license:expat))))
-
-(define-public rust-schannel
-  (package
-    (name "rust-schannel")
-    (version "0.1.15")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "schannel" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0f9k4pm8yc3z0n1n8hazvnrvg52f0sfxjc91bhf3r76rb3rapxpj"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-lazy-static" ,rust-lazy-static)
-         ("rust-winapi" ,rust-winapi))))
-    (home-page "https://github.com/steffengy/schannel-rs")
-    (synopsis
-      "Rust bindings to the Windows SChannel APIs providing TLS client and server functionality.")
-    (description
-      "Rust bindings to the Windows SChannel APIs providing TLS client and server functionality.")
-    (license license:expat)))
-
-(define-public rust-scoped-tls-0.1
-  (package
-    (inherit rust-scoped-tls)
-    (name "rust-scoped-tls")
-    (version "0.1.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "scoped-tls" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk"))))))
-
-(define-public rust-scopeguard-0.3
-  (package
-    (inherit rust-scopeguard)
-    (name "rust-scopeguard")
-    (version "0.3.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "scopeguard" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl"))))))
-
 (define-public rust-scroll
   (package
     (name "rust-scroll")
@@ -8930,33 +8354,6 @@ function with proven statistical guarantees.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-security-framework-sys
-  (package
-    (name "rust-security-framework-sys")
-    (version "0.3.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "security-framework-sys" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0mlsakq9kmqyc0fg2hcbgm6rjk55mb0rhjw2wid3hqdzkjcghdln"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-core-foundation-sys"
-          ,rust-core-foundation-sys))))
-    (home-page
-      "https://lib.rs/crates/security-framework-sys")
-    (synopsis
-      "Apple `Security.framework` low-level FFI bindings")
-    (description
-      "Apple `Security.framework` low-level FFI bindings")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-select-rustc
   (package
     (name "rust-select-rustc")
@@ -9634,29 +9031,6 @@ function with proven statistical guarantees.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-stable-deref-trait
-  (package
-    (name "rust-stable-deref-trait")
-    (version "1.1.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "stable_deref_trait" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1j2lkgakksmz4vc5hfawcch2ipiskrhjs1sih0f3br7s7rys58fv"))))
-    (build-system cargo-build-system)
-    (home-page
-      "https://github.com/storyyeller/stable_deref_trait0")
-    (synopsis
-      "This crate defines an unsafe marker trait, StableDeref, for container types which deref to a fixed address which is valid even when the containing type is moved. For example, Box, Vec, Rc, Arc and String implement this trait. Additionally, it defines CloneStableDeref for types like Rc where clones deref to the same address.")
-    (description
-      "This crate defines an unsafe marker trait, StableDeref, for container types which deref to a fixed address which is valid even when the containing type is moved. For example, Box, Vec, Rc, Arc and String implement this trait. Additionally, it defines CloneStableDeref for types like Rc where clones deref to the same address.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-stacker
   (package
     (name "rust-stacker")
@@ -9798,31 +9172,6 @@ function with proven statistical guarantees.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-stdweb-internal-test-macro
-  (package
-    (name "rust-stdweb-internal-test-macro")
-    (version "0.1.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "stdweb-internal-test-macro" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "12rrm7p77xnm3xacgn3rgniiyyjb4gq7902wpbljsvbx045z69l2"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote))))
-    (home-page "https://github.com/koute/stdweb")
-    (synopsis "Internal crate of the `stdweb` crate")
-    (description
-      "Internal crate of the `stdweb` crate")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-stream-cipher
   (package
     (name "rust-stream-cipher")
@@ -9848,32 +9197,6 @@ function with proven statistical guarantees.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-streaming-stats
-  (package
-    (name "rust-streaming-stats")
-    (version "0.2.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "streaming-stats" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0l7xz4g6709s80zqpvlhrg0qhgz64r94cwhmfsg8xhabgznbp2px"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-num-traits" ,rust-num-traits))))
-    (home-page
-      "https://github.com/BurntSushi/rust-stats")
-    (synopsis
-      "Experimental crate for computing basic statistics on streams.")
-    (description
-      "Experimental crate for computing basic statistics on streams.")
-    (license (list license:unlicense
-                   license:expat))))
-
 (define-public rust-string
   (package
     (name "rust-string")
@@ -10230,91 +9553,44 @@ function with proven statistical guarantees.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-termcolor
+(define-public rust-test-assembler
   (package
-    (name "rust-termcolor")
-    (version "1.0.5")
+    (name "rust-test-assembler")
+    (version "0.1.5")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "termcolor" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+        (uri (crate-uri "test-assembler" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "0vjfsn1a8zvqhnrbygrz1id6yckwv1dncw3w4zj65qdx0f00kmln"))))
+          (base32
+            "1sdx9hk0dk3z9crm8834ysyxsi92chls8arpd0gs796kis6lik2w"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-wincolor" ,rust-wincolor))))
-    (home-page "https://github.com/BurntSushi/termcolor")
-    (synopsis "Library for writing colored text to a terminal")
-    (description "This package provides a simple cross platform library for
-writing colored text to a terminal.")
-    (license (list license:unlicense
-                   license:expat))))
+      `(#:cargo-inputs
+        (("rust-byteorder" ,rust-byteorder))))
+    (home-page
+      "https://github.com/luser/rust-test-assembler")
+    (synopsis
+      "A set of types for building complex binary streams.")
+    (description
+      "This package provides a set of types for building complex binary streams.")
+    (license license:expat)))
 
-(define-public rust-termios
+(define-public rust-textwrap
   (package
-    (name "rust-termios")
-    (version "0.3.1")
+    (name "rust-textwrap")
+    (version "0.11.0")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "termios" version))
+        (uri (crate-uri "textwrap" version))
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "09any1p4jp4bphvb5ikagnvwjc3xn2djchy96nkpa782xb2j1dkj"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs (("rust-libc" ,rust-libc))))
-    (home-page
-      "https://github.com/dcuddeback/termios-rs")
-    (synopsis
-      "Safe bindings for the termios library.")
-    (description
-      "Safe bindings for the termios library.")
-    (license license:expat)))
-
-(define-public rust-test-assembler
-  (package
-    (name "rust-test-assembler")
-    (version "0.1.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "test-assembler" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1sdx9hk0dk3z9crm8834ysyxsi92chls8arpd0gs796kis6lik2w"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-byteorder" ,rust-byteorder))))
-    (home-page
-      "https://github.com/luser/rust-test-assembler")
-    (synopsis
-      "A set of types for building complex binary streams.")
-    (description
-      "This package provides a set of types for building complex binary streams.")
-    (license license:expat)))
-
-(define-public rust-textwrap
-  (package
-    (name "rust-textwrap")
-    (version "0.11.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "textwrap" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0q5hky03ik3y50s9sz25r438bc4nwhqc6dqwynv4wylc807n29nk"))))
+            "0q5hky03ik3y50s9sz25r438bc4nwhqc6dqwynv4wylc807n29nk"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
@@ -10372,56 +9648,6 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-thread-local
-  (package
-    (name "rust-thread-local")
-    (version "0.3.6")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "thread_local" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-lazy-static" ,rust-lazy-static))))
-    (home-page
-      "https://github.com/Amanieu/thread_local-rs")
-    (synopsis "Per-object thread-local storage")
-    (description "Per-object thread-local storage")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-threadpool
-  (package
-    (name "rust-threadpool")
-    (version "1.7.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "threadpool" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0rd89n1q7vy47w4c32cnynibffv9kj3jy3dwr0536n9lbw5ckw72"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-num-cpus" ,rust-num-cpus))))
-    (home-page
-      "https://github.com/rust-threadpool/rust-threadpool")
-    (synopsis
-      "A thread pool for running a number of jobs on a fixed set of worker threads.")
-    (description
-      "This package provides a thread pool for running a number of jobs on a fixed set of worker threads.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-time
   (package
     (name "rust-time")
@@ -10788,28 +10014,6 @@ writing colored text to a terminal.")
       "Event loop that drives Tokio I/O resources.")
     (license license:expat)))
 
-(define-public rust-tokio-mock-task
-  (package
-    (name "rust-tokio-mock-task")
-    (version "0.1.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "tokio-mock-task" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1y7q83qfk9ljjfvs82b453pmz9x1v3d6kr4x55j8mal01s6790dw"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs (("rust-futures" ,rust-futures))))
-    (home-page
-      "https://github.com/carllerche/tokio-mock-task")
-    (synopsis "Mock a Tokio task")
-    (description "Mock a Tokio task")
-    (license license:expat)))
-
 (define-public rust-tokio-mockstream
   (package
     (name "rust-tokio-mockstream")
@@ -11148,50 +10352,6 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-tracing-core
-  (package
-    (name "rust-tracing-core")
-    (version "0.1.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "tracing-core" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "01fa73wzw2m5ybi3kkd52dgrw97mgc3i6inmhwys46ab28giwnxi"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-lazy-static" ,rust-lazy-static))))
-    (home-page "https://tokio.rs")
-    (synopsis
-      "Core primitives for application-level tracing.")
-    (description
-      "Core primitives for application-level tracing.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-traitobject
-  (package
-    (name "rust-traitobject")
-    (version "0.1.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "traitobject" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0yb0n8822mr59j200fyr2fxgzzgqljyxflx9y8bdy3rlaqngilgg"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/reem/rust-traitobject.git")
-    (synopsis "Unsafe helpers for dealing with raw trait objects.")
-    (description "Unsafe helpers for dealing with raw trait objects.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-trust-dns-https
   (package
     (name "rust-trust-dns-https")
@@ -11439,50 +10599,6 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-try-from
-  (package
-    (name "rust-try-from")
-    (version "0.3.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "try_from" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "12wdd4ja7047sd3rx70hv2056hyc8gcdllcx3a41g1rnw64kng98"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-      (("rust-cfg-if" ,rust-cfg-if))))
-    (home-page "https://github.com/derekjw/try_from")
-    (synopsis
-      "TryFrom and TryInto traits for failable conversions that return a Result.")
-    (description
-      "TryFrom and TryInto traits for failable conversions that return a Result.")
-    (license license:expat)))
-
-(define-public rust-try-lock
-  (package
-    (name "rust-try-lock")
-    (version "0.2.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "try-lock" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "10p36rx6pqi9d0zr876xa8vksx2m66ha45myakl50rn08dxyn176"))))
-    (build-system cargo-build-system)
-    (home-page
-      "https://github.com/seanmonstar/try-lock")
-    (synopsis "A lightweight atomic lock.")
-    (description
-      "This package provides a lightweight atomic lock.")
-    (license license:expat)))
-
 (define-public rust-trybuild
   (package
     (name "rust-trybuild")
@@ -11513,24 +10629,6 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-typeable
-  (package
-    (name "rust-typeable")
-    (version "0.1.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "typeable" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "11w8dywgnm32hb291izjvh4zjd037ccnkk77ahk63l913zwzc40l"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/reem/rust-typeable")
-    (synopsis "Exposes Typeable, for getting TypeIds at runtime.")
-    (description "Exposes Typeable, for getting TypeIds at runtime.")
-    (license license:expat)))
-
 (define-public rust-typed-arena
   (package
     (name "rust-typed-arena")
@@ -11547,7 +10645,7 @@ writing colored text to a terminal.")
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-development-inputs
-        (("rust-criterion" ,rust-byteorder))))
+        (("rust-criterion" ,rust-criterion))))
     (home-page
       "https://github.com/SimonSapin/rust-typed-arena")
     (synopsis
@@ -11609,32 +10707,6 @@ writing colored text to a terminal.")
       "A typesafe store for many value types.")
     (license license:expat)))
 
-(define-public rust-ucd-trie
-  (package
-    (name "rust-ucd-trie")
-    (version "0.1.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "ucd-trie" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1hh6kyzh5xygwy96wfmsf8v8czlzhps2lgbcyhj1xzy1w1xys04g"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-development-inputs
-        (("rust-lazy-static" ,rust-lazy-static))))
-    (home-page
-      "https://github.com/BurntSushi/ucd-generate")
-    (synopsis
-      "A trie for storing Unicode codepoint sets and maps.")
-    (description
-      "This package provides a trie for storing Unicode codepoint sets and maps.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-unicase
   (package
     (name "rust-unicase")
@@ -11744,27 +10816,6 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-untrusted
-  (package
-    (name "rust-untrusted")
-    (version "0.7.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "untrusted" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1kmfykcwif6ashkwg54gcnhxj03kpba2i9vc7z5rpr0xlgvrwdk0"))))
-    (build-system cargo-build-system)
-    (home-page
-      "https://github.com/briansmith/untrusted")
-    (synopsis
-      "Safe, fast, zero-panic, zero-crashing, zero-allocation parsing of untrusted inputs in Rust.")
-    (description
-      "Safe, fast, zero-panic, zero-crashing, zero-allocation parsing of untrusted inputs in Rust.")
-    (license license:isc)))
-
 (define-public rust-url
   (package
     (name "rust-url")
@@ -11966,28 +11017,6 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-version-check
-  (package
-    (name "rust-version-check")
-    (version "0.9.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "version_check" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1kikqlnggii1rvnxrbls55sc46lxvinz5k3giscgncjj4p87b1q7"))))
-    (build-system cargo-build-system)
-    (home-page
-      "https://github.com/SergioBenitez/version_check")
-    (synopsis
-      "This tiny crate checks that the running or installed rustc meets some version requirements. The version is queried by calling the Rust compiler with --version. The path to the compiler is determined first via the RUSTC environment variable. If it is not set, then rustc is used. If that fails, no determination is made, and calls return None.")
-    (description
-      "This tiny crate checks that the running or installed rustc meets some version requirements. The version is queried by calling the Rust compiler with --version. The path to the compiler is determined first via the RUSTC environment variable. If it is not set, then rustc is used. If that fails, no determination is made, and calls return None.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-version-sync
   (package
     (name "rust-version-sync")
@@ -12022,55 +11051,6 @@ writing colored text to a terminal.")
       updated when the crate version changes.")
     (license license:expat)))
 
-(define-public rust-void
-  (package
-    (name "rust-void")
-    (version "1.0.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "void" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0zc8f0ksxvmhvgx4fdg0zyn6vdnbxd2xv9hfx4nhzg6kbs4f80ka"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/reem/rust-void.git")
-    (synopsis
-      "The uninhabited void type for use in statically impossible cases.")
-    (description
-      "The uninhabited void type for use in statically impossible cases.")
-    (license license:expat)))
-
-(define-public rust-walkdir
-  (package
-    (name "rust-walkdir")
-    (version "2.2.9")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "walkdir" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "07ppalpvxkf8cnqr64np422792y4z5bs9m8b4nrflh5rm17wjn4n"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-same-file" ,rust-same-file)
-         ("rust-winapi" ,rust-winapi)
-         ("rust-winapi-util" ,rust-winapi-util))
-        #:cargo-development-inputs
-        (("rust-doc-comment" ,rust-doc-comment))))
-    (home-page
-      "https://github.com/BurntSushi/walkdir")
-    (synopsis "Recursively walk a directory.")
-    (description "Recursively walk a directory.")
-    (license (list license:unlicense
-                   license:expat))))
-
 (define-public rust-want
   (package
     (name "rust-want")
@@ -12296,33 +11276,6 @@ writing colored text to a terminal.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-wasm-bindgen-test-macro
-  (package
-    (name "rust-wasm-bindgen-test-macro")
-    (version "0.2.48")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "wasm-bindgen-test-macro" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0n28mr6vncf1k1qr2b5bvfxq4jvqkjdzq0z0ab6w2f5d6v8q3q3l"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2)
-         ("rust-quote" ,rust-quote))))
-    (home-page
-      "https://github.com/rustwasm/wasm-bindgen")
-    (synopsis
-      "Internal testing macro for wasm-bindgen")
-    (description
-      "Internal testing macro for wasm-bindgen")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-wasm-bindgen-webidl
   (package
     (name "rust-wasm-bindgen-webidl")
@@ -12473,118 +11426,6 @@ writing colored text to a terminal.")
       "This package provides a Rust equivalent of Unix command \"which\".  Locate installed execuable in cross platforms.")
     (license license:expat)))
 
-(define-public rust-widestring
-  (package
-    (name "rust-widestring")
-    (version "0.4.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "widestring" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1dhx6dndjsz1y7c9w06922412kdxyrrkqblvggm76mh8z17hxz7g"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-development-inputs
-        (("rust-winapi" ,rust-winapi))))
-    (home-page "https://github.com/starkat99/widestring-rs.git")
-    (synopsis
-      "A wide string Rust FFI library for converting to and from wide strings, such as those often used in Windows API or other FFI libaries. Both UTF-16 and UTF-32 types are provided, including support for malformed encoding.")
-    (description
-      "A wide string Rust FFI library for converting to and from wide strings, such as those often used in Windows API or other FFI libaries. Both UTF-16 and UTF-32 types are provided, including support for malformed encoding.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-winapi-0.2
-  (package
-    (inherit rust-winapi)
-    (name "rust-winapi")
-    (version "0.2.8")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winapi" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0yh816lh6lf56dpsgxy189c2ai1z3j8mw9si6izqb6wsjkbcjz8n"))))
-    ;; We do not want to package 48 -sys crates for a package we do not want.
-    ;; They are all dev dependencies, so we skip building and testing.
-    (arguments
-     `(#:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'build))))))
-
-(define-public rust-winapi-build
-  (package
-    (name "rust-winapi-build")
-    (version "0.1.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winapi-build" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1g4rqsgjky0a7530qajn2bbfcrl2v0zb39idgdws9b1l7gp5wc9d"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/retep998/winapi-rs")
-    (synopsis "Common code for build.rs in WinAPI -sys crates")
-    (description
-      "Common code for build.rs in WinAPI -sys crates.")
-    (license license:expat)))
-
-(define-public rust-winapi-util
-  (package
-    (name "rust-winapi-util")
-    (version "0.1.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winapi-util" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1j839dc6y8vszvrsb7yk0qvs0w6asnahxzbyans37vnsw6vbls3i"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-winapi" ,rust-winapi))))
-    (home-page "https://github.com/BurntSushi/winapi-util")
-    (synopsis "Dumping ground for high level safe wrappers over winapi")
-    (description
-     "This package provides a dumping ground for high level safe wrappers over
-winapi.")
-    (license (list license:unlicense
-                   license:expat))))
-
-(define-public rust-wincolor
-  (package
-    (name "rust-wincolor")
-    (version "1.0.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "wincolor" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1agaf3hcav113i86912ajnw6jxcy4rvkrgyf8gdj8kc031mh3xcn"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-winapi" ,rust-winapi)
-        ("rust-winapi-util" ,rust-winapi-util))))
-    (home-page "https://github.com/BurntSushi/termcolor/tree/master/wincolor")
-    (synopsis "Windows API for controlling text color in a Windows console")
-    (description
-     "This package provides a simple Windows specific API for controlling text
-color in a Windows console.")
-    (license (list license:unlicense
-                   license:expat))))
-
 (define-public rust-winreg
   (package
     (name "rust-winreg")
@@ -12686,29 +11527,6 @@ color in a Windows console.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-xdg
-  (package
-    (name "rust-xdg")
-    (version "2.2.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "xdg" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0mws8a0fr3cqk5nh7aq9lmkmhzghvasqy4mhw6nnza06l4d6i2fh"))))
-    (build-system cargo-build-system)
-    (home-page
-      "https://github.com/whitequark/rust-xdg")
-    (synopsis
-      "A library for storing and retrieving files according to XDG Base Directory specification")
-    (description
-      "This package provides a library for storing and retrieving files according to XDG Base Directory specification")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-xz2
   (package
     (name "rust-xz2")
-- 
cgit v1.2.3


From 5482718d1996fed14d8c73829837380715ccd725 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Thu, 29 Aug 2019 15:06:08 +0300
Subject: gn: Remove upstreamed crates

---
 gn/packages/crates-io.scm | 505 ++--------------------------------------------
 1 file changed, 15 insertions(+), 490 deletions(-)

(limited to 'gn/packages/crates-io.scm')

diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index b91a2b4..37cbf33 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -351,29 +351,6 @@
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-atty ; guix candidate, fails tests
-  (package
-    (name "rust-atty")
-    (version "0.2.13")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "atty" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "140sswp1bwqwc4zk80bxkbnfb3g936hgrb77g9g0k1zcld3wc0qq"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc)
-        ("rust-winapi" ,rust-winapi))))
-    (home-page "https://github.com/softprops/atty")
-    (synopsis "A simple interface for querying atty")
-    (description
-     "This package provides a simple interface for querying atty.")
-    (license license:expat)))
-
 (define-public rust-automod
   (package
     (name "rust-automod")
@@ -1134,34 +1111,6 @@
       "This package provides a simple to use, efficient, and full-featured Command Line Argument Parser")
     (license license:expat)))
 
-(define-public rust-clicolors-control
-  (package
-    (name "rust-clicolors-control")
-    (version "1.0.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "clicolors-control" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1y80cgarxhrd1bz5yjm81r444v6flvy36aaxrrsac0yhfd6gvavk"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-atty" ,rust-atty)
-         ("rust-lazy-static" ,rust-lazy-static)
-         ("rust-libc" ,rust-libc)
-         ("rust-winapi" ,rust-winapi))))
-    (home-page
-      "https://github.com/mitsuhiko/clicolors-control")
-    (synopsis
-      "A common utility library to control CLI colorization")
-    (description
-      "This package provides a common utility library to control CLI colorization")
-    (license license:expat)))
-
 (define-public rust-clippy
   (package
     (name "rust-clippy")
@@ -1229,10 +1178,9 @@
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-rustc-std-workspace-core"
-          ,rust-rustc-std-workspace-core))
-        #:cargo-development-inputs
-        (("rust-cc" ,rust-cc))))
+        (("rust-cc" ,rust-cc)
+         ("rust-rustc-std-workspace-core"
+          ,rust-rustc-std-workspace-core))))
     (home-page
       "https://github.com/rust-lang-nursery/compiler-builtins")
     (synopsis
@@ -2868,65 +2816,6 @@
     (license (list license:unlicense
                    license:expat))))
 
-(define-public rust-fuchsia-cprng ; guix upstreamable
-  (package
-    (name "rust-fuchsia-cprng")
-    (version "0.1.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "fuchsia-cprng" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1fnkqrbz7ixxzsb04bsz9p0zzazanma8znfdqjvh39n14vapfvx0"))))
-    (build-system cargo-build-system)
-    (home-page "https://fuchsia.googlesource.com/fuchsia/+/master/garnet/public/rust/fuchsia-cprng")
-    (synopsis "Fuchsia cryptographically secure pseudorandom number generator")
-    (description "Rust crate for the Fuchsia cryptographically secure
-pseudorandom number generator")
-    (license license:bsd-3)))
-
-(define-public rust-fuchsia-zircon
-  (package
-    (name "rust-fuchsia-zircon")
-    (version "0.3.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "fuchsia-zircon" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "10jxc5ks1x06gpd0xg51kcjrxr35nj6qhx2zlc5n7bmskv3675rf"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags)
-        ("rust-fuchsia-zircon-sys" ,rust-fuchsia-zircon-sys))))
-    (home-page "https://fuchsia.googlesource.com/garnet/")
-    (synopsis "Rust bindings for the Zircon kernel")
-    (description "Rust bindings for the Zircon kernel.")
-    (license license:bsd-3)))
-
-(define-public rust-fuchsia-zircon-sys
-  (package
-    (name "rust-fuchsia-zircon-sys")
-    (version "0.3.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "fuchsia-zircon-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "19zp2085qsyq2bh1gvcxq1lb8w6v6jj9kbdkhpdjrl95fypakjix"))))
-    (build-system cargo-build-system)
-    (home-page "https://fuchsia.googlesource.com/garnet/")
-    (synopsis "Low-level Rust bindings for the Zircon kernel")
-    (description "Low-level Rust bindings for the Zircon kernel.")
-    (license license:bsd-3)))
-
 (define-public rust-futures-channel-preview
   (package
     (name "rust-futures-channel-preview")
@@ -2976,33 +2865,6 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-futures-cpupool
-  (package
-    (name "rust-futures-cpupool")
-    (version "0.1.8")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "futures-cpupool" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1r32456gpblzfvnkf60545v8acqk7gh5zhyhi1jn669k9gicv45b"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-futures" ,rust-futures)
-         ("rust-num-cpus" ,rust-num-cpus))))
-    (home-page
-      "https://github.com/alexcrichton/futures-rs")
-    (synopsis
-      "An implementation of thread pools which hand out futures to the results of the computation on the threads themselves.")
-    (description
-      "An implementation of thread pools which hand out futures to the results of the computation on the threads themselves.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-futures-executor-preview
   (package
     (name "rust-futures-executor-preview")
@@ -3526,30 +3388,6 @@ pseudorandom number generator")
       "A Tokio aware, HTTP/2.0 client & server implementation for Rust.")
     (license license:expat)))
 
-(define-public rust-heapsize
-  (package
-    (name "rust-heapsize")
-    (version "0.4.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "heapsize" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0q94q9ppqjgrw71swiyia4hgby2cz6dldp7ij57nkvhd6zmfcy8n"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs (("rust-winapi" ,rust-winapi))))
-    (home-page "https://github.com/servo/heapsize")
-    (synopsis
-      "Infrastructure for measuring the total runtime size of an object on the heap")
-    (description
-      "Infrastructure for measuring the total runtime size of an object on the heap")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-heapsize-0.3
   (package
     (inherit rust-heapsize)
@@ -3564,7 +3402,8 @@ pseudorandom number generator")
          (base32
           "0dmwc37vgsdjzk10443dj4f23439i9gch28jcwzmry3chrwx8v2m"))))
     (arguments
-     `(#:cargo-inputs (("rust-kernel32-sys" ,rust-kernel32-sys))))))
+     `(#:cargo-inputs (("rust-kernel32-sys" ,rust-kernel32-sys))
+       #:tests? #f)))) ;; No flexible-tests feature flags on this release.
 
 (define-public rust-heapsize-plugin
   (package
@@ -3581,7 +3420,14 @@ pseudorandom number generator")
           "1i72isf699q9jl167g2kg4xd6h3cd05rc79zaph58aqjy0g0m9y9"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-development-inputs (("rust-heapsize" ,rust-heapsize))))
+     `(#:cargo-development-inputs (("rust-heapsize" ,rust-heapsize-0.3))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-Cargo-toml
+           (lambda _
+             (substitute* "Cargo.toml"
+               (("path = \"..\", ") ""))
+             #t)))))
     (home-page "https://github.com/servo/heapsize")
     (synopsis
       "Automatically generating infrastructure for measuring the total runtime size of an object on the heap")
@@ -3701,31 +3547,6 @@ pseudorandom number generator")
      `(#:cargo-inputs
        (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.4))))))
 
-(define-public rust-hostname
-  (package
-    (name "rust-hostname")
-    (version "0.1.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "hostname" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0kprf862qaa7lwdms6aw7f3275h0j2rwhs9nz5784pm8hdmb9ki1"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-libc" ,rust-libc)
-         ("rust-winutil" ,rust-winutil))))
-    (home-page "https://github.com/fengcen/hostname")
-    (synopsis
-      "Get hostname. Compatible with windows and linux, redox.")
-    (description
-      "Get hostname.  Compatible with windows and linux, redox.")
-    (license license:expat)))
-
 (define-public rust-http
   (package
     (name "rust-http")
@@ -4558,28 +4379,6 @@ pseudorandom number generator")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-kernel32-sys
-  (package
-    (name "rust-kernel32-sys")
-    (version "0.2.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "kernel32-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1389av0601a9yz8dvx5zha9vmkd6ik7ax0idpb032d28555n41vm"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.2)
-        ("rust-winapi-build" ,rust-winapi-build))))
-    (home-page "https://github.com/retep998/winapi-rs")
-    (synopsis "Contains function definitions for the Windows API library kernel32")
-    (description "Contains function definitions for the Windows API library kernel32.")
-    (license license:expat)))
-
 (define-public rust-language-tags
   (package
     (name "rust-language-tags")
@@ -5274,31 +5073,6 @@ stream encoding/decoding.")
          (base32
           "1cvm2z7dy138s302ii7wlzcxbka5a8yfl5pl5di7lbdnw9hw578g"))))))
 
-(define-public rust-mime
-  (package
-    (name "rust-mime")
-    (version "0.3.13")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "mime" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "09clbyvdkwflp8anwjhqdib0sw8191gphcchdp80nc8ayhhwl9ry"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-unicase" ,rust-unicase))))
-    (home-page "https://github.com/hyperium/mime")
-    (synopsis
-      "Strongly Typed Mimes")
-    (description
-      "Strongly Typed Mimes")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-mime-0.2
   (package
     (inherit rust-mime)
@@ -5659,50 +5433,6 @@ stream encoding/decoding.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-nodrop ; guix upstreamable
-  (package
-    (name "rust-nodrop")
-    (version "0.1.13")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "nodrop" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0if9ifn6rvar5jirx4b3qh4sl5kjkmcifycvzhxa9j3crkfng5ig"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-nodrop-union" ,rust-nodrop-union))))
-    (home-page "https://github.com/bluss/arrayvec")
-    (synopsis "Wrapper type to inhibit drop (destructor)")
-    (description "This package provides a wrapper type to inhibit drop
-(destructor).  Use @code{std::mem::ManuallyDrop} instead!")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-nodrop-union ; guix upstreamable
-  (package
-    (name "rust-nodrop-union")
-    (version "0.1.10")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "nodrop-union" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0jsnkdn9l8jlmb9h4wssi76sxnyxwnyi00p6y1p2gdq7c1gdw2b7"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/bluss/arrayvec")
-    (synopsis "Wrapper type to inhibit drop (destructor)")
-    (description "This package provides a wrapper type to inhibit drop
-(destructor).  Implementation crate for nodrop, the untagged unions
-implementation (which is unstable / requires nightly).")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-nom
   (package
     (name "rust-nom")
@@ -5765,35 +5495,6 @@ implementation (which is unstable / requires nightly).")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-num-iter
-  (package
-    (name "rust-num-iter")
-    (version "0.1.39")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "num-iter" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0bhk2qbr3261r6zvfc58lz4spfqjhvdripxgz5mks5rd85r55gbn"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-num-integer" ,rust-num-integer)
-         ("rust-num-traits" ,rust-num-traits))
-        #:cargo-development-inputs
-        (("rust-autocfg" ,rust-autocfg))))
-    (home-page
-      "https://github.com/rust-num/num-iter")
-    (synopsis
-      "External iterators for generic mathematics")
-    (description
-      "External iterators for generic mathematics")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-object
   (package
     (name "rust-object")
@@ -6585,32 +6286,6 @@ implementation (which is unstable / requires nightly).")
       "Bindings to the PicoHTTPParser.")
     (license license:expat)))
 
-(define-public rust-plugin
-  (package
-    (name "rust-plugin")
-    (version "0.2.6")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "plugin" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1q7nghkpvxxr168y2jnzh3w7qc9vfrby9n7ygy3xpj0bj71hsshs"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-typemap" ,rust-typemap))
-        #:cargo-development-inputs
-        (("rust-void" ,rust-void))))
-    (home-page "https://github.com/reem/rust-plugin")
-    (synopsis
-      "Lazily evaluated, order-independent plugins for extensible types.")
-    (description
-      "Lazily evaluated, order-independent plugins for extensible types.")
-    (license license:expat)))
-
 (define-public rust-pretty-env-logger
   (package
     (name "rust-pretty-env-logger")
@@ -7441,7 +7116,7 @@ invocations.")
        (("rust-autocfg" ,rust-autocfg)
         ("rust-rand-core" ,rust-rand-core-0.4)
         ("rust-serde" ,rust-serde)
-        ("rust-serde" ,rust-serde-derive))
+        ("rust-serde-derive" ,rust-serde-derive))
        #:cargo-development-inputs
        (("rust-bincode" ,rust-bincode))))))
 
@@ -7491,7 +7166,7 @@ invocations.")
       `(#:cargo-inputs
         (("rust-rand-core" ,rust-rand-core-0.3)
          ("rust-serde" ,rust-serde)
-         ("rust-serde" ,rust-serde-derive))
+         ("rust-serde-derive" ,rust-serde-derive))
         #:cargo-development-inputs
         (("rust-bincode" ,rust-bincode))))))
 
@@ -7860,34 +7535,6 @@ system calls.")
        (("rust-quickcheck" ,rust-quickcheck) ; 0.2
         ("rust-rand", rust-rand-0.3))))))
 
-(define-public rust-remove-dir-all
-  (package
-    (name "rust-remove-dir-all")
-    (version "0.5.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "remove_dir_all" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0bkrlyg26mgizpiy1yb2hhpgscxcag8r5fnckqsvk25608vzm0sa"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-winapi" ,rust-winapi))
-        #:cargo-development-inputs
-        (("rust-doc-comment" ,rust-doc-comment))))
-    (home-page
-      "https://github.com/XAMPPRocky/remove_dir_all.git")
-    (synopsis
-      "A safe, reliable implementation of remove_dir_all for Windows")
-    (description
-      "This package provides a safe, reliable implementation of remove_dir_all for Windows")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-reqwest
   (package
     (name "rust-reqwest")
@@ -7954,33 +7601,6 @@ system calls.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-resolv-conf
-  (package
-    (name "rust-resolv-conf")
-    (version "0.6.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "resolv-conf" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1jvdsmksdf6yiipm3aqahyv8n1cjd7wqc8sa0p0gzsax3fmb8qxj"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-quick-error" ,rust-quick-error)
-         ("rust-hostname" ,rust-hostname))))
-    (home-page
-      "https://github.com/tailhook/resolv-conf")
-    (synopsis
-      "A /etc/resolv.conf parser crate for rust.")
-    (description
-      "A /etc/resolv.conf parser crate for rust.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-ring
   (package
     (name "rust-ring")
@@ -10683,55 +10303,6 @@ function with proven statistical guarantees.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-typemap
-  (package
-    (name "rust-typemap")
-    (version "0.3.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "typemap" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1xm1gbvz9qisj1l6d36hrl9pw8imr8ngs6qyanjnsad3h0yfcfv5"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-unsafe-any" ,rust-base64))))
-    (home-page "https://github.com/reem/rust-typemap")
-    (synopsis
-      "A typesafe store for many value types.")
-    (description
-      "A typesafe store for many value types.")
-    (license license:expat)))
-
-(define-public rust-unicase
-  (package
-    (name "rust-unicase")
-    (version "2.4.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "unicase" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1xmpmkakhhblq7dzab1kwyv925kv7fqjkjsxjspg6ix9n88makm8"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs (("rust-version-check" ,rust-version-check))))
-    (home-page
-      "https://github.com/seanmonstar/unicase")
-    (synopsis
-      "A case-insensitive wrapper around strings.")
-    (description
-      "A case-insensitive wrapper around strings.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-unicode-bidi
   (package
     (name "rust-unicode-bidi")
@@ -11455,52 +11026,6 @@ function with proven statistical guarantees.")
       "Rust bindings to MS Windows Registry API.")
     (license license:expat)))
 
-(define-public rust-winutil
-  (package
-    (name "rust-winutil")
-    (version "0.1.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winutil" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0vkyl3fbbf05n5ph5yz8sfaccrk9x3qsr25560w6w68ldf5i7bvx"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-winapi" ,rust-winapi))))
-    (home-page "https://bitbucket.org/DaveLancaster/winutil")
-    (synopsis "A simple library wrapping a handful of useful winapi functions.")
-    (description
-      "A simple library wrapping a handful of useful winapi functions.")
-    (license license:expat)))
-
-(define-public rust-ws2-32-sys
-  (package
-    (name "rust-ws2-32-sys")
-    (version "0.2.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "ws2_32-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0ppscg5qfqaw0gzwv2a4nhn5bn01ff9iwn6ysqnzm4n8s3myz76m"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.2)
-        ("rust-winapi-build" ,rust-winapi-build))))
-    (home-page "https://github.com/retep998/winapi-rs")
-    (synopsis
-      "Contains function definitions for the Windows API library ws2_32.")
-    (description
-      "Contains function definitions for the Windows API library ws2_32.")
-    (license license:expat)))
-
 (define-public rust-xattr
   (package
     (name "rust-xattr")
-- 
cgit v1.2.3


From 8ee6f7dd7acbe71bbe62807c9006d192410a7bd4 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Thu, 29 Aug 2019 09:31:07 -0500
Subject: gn: Add more crates

---
 gn/packages/crates-io.scm | 341 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 336 insertions(+), 5 deletions(-)

(limited to 'gn/packages/crates-io.scm')

diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index 37cbf33..d4ecbc5 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -264,6 +264,40 @@
       `(#:cargo-inputs
         (("rust-winapi" ,rust-winapi))))))
 
+(define-public rust-argon2rs
+  (package
+    (name "rust-argon2rs")
+    (version "0.2.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "argon2rs" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "14mkgkrjd4b4zy92pflz6yb4j1wn2chbd8jczxknxbkdm2vb0rrz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-blake2-rfc" ,rust-blake2-rfc)
+        ("rust-scoped-threadpool" ,rust-scoped-threadpool))
+       #:cargo-development-inputs
+       (("rust-cargon" ,rust-cargon))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-Cargo-toml
+           (lambda _
+             (substitute* "Cargo.toml"
+               (("path = \"benches/cargon\",") ""))
+             #t)))))
+    (home-page "https://github.com/bryant/argon2rs")
+    (synopsis "Rust library for the Argon2 hashing algorithm")
+    (description
+     "This is a purely Rust-based library that provides both variants of the
+state-of-the-art Argon2 hashing algorithm, suitable for password hashing and
+password-based key derivation.")
+    (license license:expat)))
+
 (define-public rust-arrayvec
   (package
     (name "rust-arrayvec")
@@ -696,6 +730,35 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-blake2-rfc
+  (package
+    (name "rust-blake2-rfc")
+    (version "0.2.18")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "blake2-rfc" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0034g47hyq2bzmk40895ill1mbnpmmjakdq3dmm9clidvl5m6vax"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-arrayvec" ,rust-arrayvec)
+         ("rust-constant-time-eq" ,rust-constant-time-eq)
+         ("rust-clippy" ,rust-clippy))
+        #:cargo-development-inputs
+        (("rust-data-encoding" ,rust-data-encoding))))
+    (home-page "https://github.com/cesarb/blake2-rfc")
+    (synopsis "pure Rust implementation of BLAKE2 based on RFC 7693")
+    (description
+     "This is a pure Rust implementation of BLAKE2 based on RFC 7693.  This
+crate is limited to the features described in the RFC: only the @code{digest
+length} and @code{key length} parameters can be used.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-blas-src
   (package
     (name "rust-blas-src")
@@ -906,6 +969,29 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-cargon
+  (package
+    (name "rust-cargon")
+    (version "0.0.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "cargon" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1cszlab7jk736p0lb50ag4l9nv72m7j41bwrmygl0lr4iz0350w2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-gcc" ,rust-gcc))))
+    (home-page "https://github.com/bryant/argon2rs")
+    (synopsis "Thin wrapper around the Argon2 C library")
+    (description
+      "This package provides a thin wrapper around the Argon2 C library.  It is
+used in argon2rs' bench suite.")
+    (license license:wtfpl2)))
+
 (define-public rust-cc
   (package
     (name "rust-cc")
@@ -1099,7 +1185,7 @@
          ("rust-textwrap" ,rust-textwrap)
          ("rust-unicode-width" ,rust-unicode-width)
          ("rust-vec-map" ,rust-vec-map)
-         ("rust-yaml-rust" ,rust-yaml-rust))
+         ("rust-yaml-rust" ,rust-yaml-rust-0.3))
         #:cargo-development-inputs
         (("rust-lazy-static" ,rust-lazy-static)
          ("rust-regex" ,rust-regex)
@@ -1190,6 +1276,45 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-compiletest-rs
+  (package
+    (name "rust-compiletest-rs")
+    (version "0.3.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "compiletest-rs" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0rvckrzk4bs3h9vsvf0z8rzhh59rddxcq5z5c0iyzv1daihci5sq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-diff" ,rust-diff)
+        ("rust-filetime" ,rust-filetime)
+        ("rust-getopts" ,rust-getopts)
+        ("rust-libc" ,rust-libc)
+        ("rust-log" ,rust-log)
+        ("rust-miow" ,rust-miow)
+        ("rust-regex" ,rust-regex)
+        ("rust-rustfix" ,rust-rustfix)
+        ("rust-serde" ,rust-serde)
+        ("rust-serde-derive" ,rust-serde-derive)
+        ("rust-serde-json" ,rust-serde-json)
+        ("rust-winapi" ,rust-winapi)
+        ("rust-tempfile" ,rust-tempfile)
+        ("rust-tester" ,rust-tester))))
+    (home-page "https://github.com/laumann/compiletest-rs")
+    (synopsis "Compiletest utility from the Rust compiler")
+    (description
+     "This project is an attempt at extracting the @code{compiletest} utility
+from the Rust compiler.  The @code{compiletest} utility is useful for library
+and plugin developers, who want to include test programs that should fail to
+compile, issue warnings or otherwise produce compile-time output.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-console
   (package
     (name "rust-console")
@@ -1225,6 +1350,26 @@
       "This package provides a terminal and console abstraction for Rust")
     (license license:expat)))
 
+(define-public rust-constant-time-eq
+  (package
+    (name "rust-constant-time-eq")
+    (version "0.1.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "constant_time_eq" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "083icpr9xb72rrdxw3p4068dcspn6ai22jy7rhl2a8grfz448nlr"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/cesarb/constant_time_eq")
+    (synopsis" Compares two equal-sized byte strings in constant time")
+    (description
+     "This package compares two equal-sized byte strings in constant time.
+It is inspired by the Linux kernel's crypto_memneq.")
+    (license license:cc0)))
+
 (define-public rust-conv
   (package
     (name "rust-conv")
@@ -2036,6 +2181,36 @@
     (license (list license:unlicense
                    license:expat))))
 
+(define-public rust-duct
+  (package
+    (name "rust-duct")
+    (version "0.12.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "duct" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1vm1nzyi434h2zwix7c925qfa886ri1qx4nkq4hdrgkq7h9ayh1n"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-lazycell" ,rust-lazycell)
+         ("rust-libc" ,rust-libc)
+         ("rust-os-pipe" ,rust-os-pipe)
+         ("rust-shared-child" ,rust-shared-child))
+        #:cargo-development-inputs
+        (("rust-tempdir" ,rust-tempdir))))
+    (home-page
+      "https://github.com/oconnor663/duct.rs")
+    (synopsis
+      "a library for creating shell pipelines")
+    (description
+      "a library for creating shell pipelines")
+    (license license:expat)))
+
 (define-public rust-either
   (package
     (name "rust-either")
@@ -2557,6 +2732,42 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-rustfix
+  (package
+    (name "rust-rustfix")
+    (version "0.4.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rustfix" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "01zn0ysnass3mmrhxk90584y713vjfq1x97mi4saac99g9vsql3i"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-failure" ,rust-failure)
+         ("rust-log" ,rust-log)
+         ("rust-serde" ,rust-serde)
+         ("rust-serde-json" ,rust-serde-json))
+        #:cargo-development-inputs
+        (("rust-difference" ,rust-difference)
+         ("rust-duct" ,rust-duct)
+         ("rust-env-logger" ,rust-env-logger)
+         ("rust-log" ,rust-log)
+         ("rust-proptest" ,rust-proptest)
+         ("rust-tempdir" ,rust-tempdir))))
+    (home-page
+      "https://github.com/rust-lang-nursery/rustfix")
+    (synopsis
+      "Automatically apply the suggestions made by rustc")
+    (description
+      "Automatically apply the suggestions made by rustc")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-flame
   (package
     (name "rust-flame")
@@ -3093,6 +3304,35 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-gcc
+  (package
+    (name "rust-gcc")
+    (version "0.3.55")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "gcc" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1hng1sajn4r67hndvhjysswz8niayjwvcj42zphpxzhbz89kjpwg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-rayon" ,rust-rayon-0.8))
+       #:cargo-development-inputs
+       (("rust-tempdir" ,rust-tempdir))
+       ;#:tests? #f
+       )) ; tests fail
+    (home-page "https://github.com/alexcrichton/gcc-rs")
+    (synopsis "Library to compile C/C++ code into a Rust library/application")
+    (description
+     "This package provides a build-time dependency for Cargo build scripts to
+assist in invoking the native C compiler to compile native C code into a static
+archive to be linked into Rustcode.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-generic-array
   (package
     (name "rust-generic-array")
@@ -4696,6 +4936,25 @@
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-linked-hash-map-0.3
+  (package
+    (inherit rust-linked-hash-map)
+    (name "rust-linked-hash-map")
+    (version "0.3.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "linked-hash-map" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1kaf95grvfqchxn8pl0854g8ab0fzl56217hndhhhz5qqm2j09kd"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-clippy" ,rust-clippy)
+        ("rust-serde" ,rust-serde-0.8)
+        ("rust-serde-test" ,rust-serde-test)))))) ; 0.8
+
 (define-public rust-lipsum
   (package
     (name "rust-lipsum")
@@ -7281,6 +7540,29 @@ invocations.")
          ("rust-serde" ,rust-serde)
          ("rust-serde-derive" ,rust-serde-derive))))))
 
+(define-public rust-rayon-0.8
+  (package
+    (inherit rust-rayon)
+    (name "rust-rayon")
+    (version "0.8.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rayon" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1j2l9x98ma63qkh9w8zik0vcpwqf9cvc2ynh66ibjp36nq4gw55n"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-rayon-core" ,rust-rayon-core))
+       #:cargo-development-inputs
+       (("rust-compiletest-rs" ,rust-compiletest-rs)
+        ("rust-docopt" ,rust-docopt)
+        ("rust-futures" ,rust-futures)
+        ("rust-rand" ,rust-rand-0.3)
+        ("rust-rustc-serialize" ,rust-rustc-serialize))))))
+
 (define-public rust-rayon-core
   (package
     (name "rust-rayon-core")
@@ -7356,6 +7638,8 @@ invocations.")
       `(#:cargo-inputs
         (("rust-rand-core" ,rust-rand-core-0.3))))))
 
+;; This package requires features which are unavailable
+;; on the stable releases of Rust.
 (define-public rust-redox-syscall ; guix upstreamable
   (package
     (name "rust-redox-syscall")
@@ -7373,6 +7657,7 @@ invocations.")
     (synopsis "Rust library to access raw Redox system calls")
     (description "This package provides a Rust library to access raw Redox
 system calls.")
+    (properties '((hidden? . #t)))
     (license license:expat)))
 
 (define-public rust-redox-users
@@ -7401,7 +7686,7 @@ system calls.")
       "A Rust library to access Redox users and groups functionality")
     (description
       "This package provides a Rust library to access Redox users and groups functionality")
-    (license #f)))
+    (license license:expat)))
 
 (define-public rust-ref-cast
   (package
@@ -7837,6 +8122,34 @@ system calls.")
     (license (list license:asl2.0
                    license:boost1.0))))
 
+(define-public rust-scoped-threadpool
+  (package
+    (name "rust-scoped-threadpool")
+    (version "0.1.9")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "scoped_threadpool" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1a26d3lk40s9mrf4imhbik7caahmw2jryhhb6vqv6fplbbgzal8x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-lazy-static" ,rust-lazy-static))))
+    (home-page "https://github.com/Kimundi/scoped-threadpool-rs")
+    (synopsis "library for scoped and cached threadpools")
+    (description
+     "This crate provides a stable, safe and scoped threadpool.  It can be used
+to execute a number of short-lived jobs in parallel without the need to respawn
+the underlying threads.  Jobs are runnable by borrowing the pool for a given
+scope, during which an arbitrary number of them can be executed. These jobs can
+access data of any lifetime outside of the pools scope, which allows working on
+non-'static references in parallel.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-scroll
   (package
     (name "rust-scroll")
@@ -9147,7 +9460,7 @@ function with proven statistical guarantees.")
 (define-public rust-term-size
   (package
     (name "rust-term-size")
-    (version "1.0.0-beta1")
+    (version "0.3.1")
     (source
       (origin
         (method url-fetch)
@@ -9156,12 +9469,12 @@ function with proven statistical guarantees.")
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "13w9cqjhzh3mmx6zami8lxyf42xx53yy866zxhxqcm71k637v8d8"))))
+            "09wk3173ngmb710qs9rwgibq4w250q8lgnwjvb9cypc1vdk9lnwy"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
         (("rust-clippy" ,rust-clippy)
-         ;("rust-kernel32-sys" ,rust-kernel32-sys) ; windows
+         ("rust-kernel32-sys" ,rust-kernel32-sys)
          ("rust-libc" ,rust-libc)
          ("rust-winapi" ,rust-winapi))))
     (home-page
@@ -11111,3 +11424,21 @@ in-memory encoding/decoding.")
       "The missing YAML 1.2 parser for rust")
     (license (list license:asl2.0
                    license:expat))))
+
+(define-public rust-yaml-rust-0.3
+  (package
+    (inherit rust-yaml-rust)
+    (name "rust-yaml-rust")
+    (version "0.3.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "yaml-rust" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "14m9dzwb8fb05f4jjb4nqp49rxd9c5vcmwpv3a04d2y5iphncqz6"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-clippy" ,rust-clippy)
+        ("rust-linked-hash-map" ,rust-linked-hash-map-0.3))))))
-- 
cgit v1.2.3


From 853b2db5aafabc91aaf5b8364512259c63e93db2 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Mon, 2 Sep 2019 06:53:51 -0500
Subject: gn: minor crate changes

---
 gn/packages/crates-io.scm | 204 ++++++++++++++++++++++++----------------------
 1 file changed, 107 insertions(+), 97 deletions(-)

(limited to 'gn/packages/crates-io.scm')

diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index d4ecbc5..a8f3ee8 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -388,7 +388,7 @@ password-based key derivation.")
 (define-public rust-automod
   (package
     (name "rust-automod")
-    (version "0.1.1")
+    (version "0.1.2")
     (source
       (origin
         (method url-fetch)
@@ -397,7 +397,7 @@ password-based key derivation.")
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0pld582piq2d55z0j96zcs8izw3ml46f8h9y7sdyxg093yfvxl2h"))))
+            "17am5i7z7jpsrq9bm0wyhf4q9850g2kqvzl3ik900x5gc7brwv2a"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -414,7 +414,7 @@ password-based key derivation.")
 (define-public rust-average
   (package
     (name "rust-average")
-    (version "0.10.1")
+    (version "0.10.2")
     (source
       (origin
         (method url-fetch)
@@ -423,7 +423,7 @@ password-based key derivation.")
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "077wbjzn2hwdjnglp8pjvirvsjgfgbgnlirwh5g2hk14xqx7f57l"))))
+            "16ib3vlfp3akpflha1m6598x3jfrgrh9qgrf9vvv11rfqirp22dx"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
@@ -995,7 +995,7 @@ used in argon2rs' bench suite.")
 (define-public rust-cc
   (package
     (name "rust-cc")
-    (version "1.0.38")
+    (version "1.0.41")
     (source
       (origin
         (method url-fetch)
@@ -1004,14 +1004,25 @@ used in argon2rs' bench suite.")
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "0imzcz53wg7m3gr6657yrikp7icyc2bpkvssnyd0xvj8imihqh6f"))))
+            "1zxzd559dbbf1iwdzmkj7czapzccs17kqqmsj9ayijpdix5rrbld"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-rayon" ,rust-rayon))
+     `(;#:cargo-inputs
+       ;(("rust-rayon" ,rust-rayon))
        #:cargo-development-inputs
        (("rust-tempdir" ,rust-tempdir))
-       #:tests? #f)) ; tests fail
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'remove-optional-deps
+           (lambda _
+             (substitute* "Cargo.toml.orig"
+               ((".*optional.*") "\n")
+               ((".*features.*") "")
+               ((".*parallel.*") ""))
+             (delete-file "Cargo.toml")
+             (copy-file "Cargo.toml.orig" "Cargo.toml")
+             #t)))
+       #:tests? #f)) ; Tests require cc-test from git repo.
     (home-page
       "https://github.com/alexcrichton/cc-rs")
     (synopsis
@@ -5913,7 +5924,7 @@ stream encoding/decoding.")
 (define-public rust-openssl-src
   (package
     (name "rust-openssl-src")
-    (version "111.4.0+1.1.1c")
+    (version "111.5.0+1.1.1c")
     (source
       (origin
         (method url-fetch)
@@ -5922,7 +5933,7 @@ stream encoding/decoding.")
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "10s3hvkfk6bi4ba1ssvj914rjs31vs8plssy4kbvsa0w7idkqfkq"))))
+            "17h4jwa3n1i91h0q8g72c1d9xzm97bnkxn1s7rljyghp94zvzpjb"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs (("rust-cc" ,rust-cc))))
@@ -5938,7 +5949,7 @@ stream encoding/decoding.")
 (define-public rust-openssl-sys
   (package
     (name "rust-openssl-sys")
-    (version "0.9.48")
+    (version "0.9.49")
     (source
       (origin
         (method url-fetch)
@@ -5947,7 +5958,7 @@ stream encoding/decoding.")
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1f05kxx8mai9ac16x1lk0404bymghbbj7vcbqrfwqfr52w131fmm"))))
+            "1168vivyqbzaxl48bvv9r1x714c03f5c1za8pv5x8fyj9gjxkypl"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -6057,86 +6068,6 @@ stream encoding/decoding.")
       "A library for creating references that carry their owner with them.")
     (license license:expat)))
 
-(define-public rust-rand-os
-  (package
-    (name "rust-rand-os")
-    (version "0.2.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "rand_os" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "06is69f8rfzs620g5b54k6cgy5yaycrsyqg55flyfrsf8g88733f"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-getrandom" ,rust-getrandom)
-         ("rust-rand-core" ,rust-rand-core))))
-    (home-page "https://crates.io/crates/rand_os")
-    (synopsis "OS backed Random Number Generator")
-    (description "OS backed Random Number Generator")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-rand-os-0.1
-  (package
-    (inherit rust-rand-os)
-    (name "rust-rand-os")
-    (version "0.1.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "rand_os" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0wahppm0s64gkr2vmhcgwc0lij37in1lgfxg5rbgqlz0l5vgcxbv"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cloudabi" ,rust-cloudabi)
-        ("rust-fuchsia-cprng" ,rust-fuchsia-cprng)
-        ("rust-getrandom" ,rust-getrandom)
-        ("rust-libc" ,rust-libc)
-        ("rust-log" ,rust-log)
-        ("rust-rand-core" ,rust-rand-core-0.4)
-        ("rust-rdrand" ,rust-rdrand-0.4)
-        ("rust-stdweb" ,rust-stdweb)
-        ("rust-wasm-bindgen" ,rust-wasm-bindgen)
-        ("rust-winapi" ,rust-winapi))))))
-
-(define-public rust-rspec
-  (package
-    (name "rust-rspec")
-    (version "1.0.0-beta.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "rspec" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1abfzwkbxlwahb243k8d3fp6i135lx1aqmbfl79w9zlpng182ndk"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-colored" ,rust-colored)
-         ("rust-derive-new" ,rust-derive-new)
-         ("rust-derive-builder" ,rust-derive-builder)
-         ("rust-expectest" ,rust-expectest)
-         ("rust-rayon" ,rust-rayon))
-        #:cargo-development-inputs
-        (("rust-clippy" ,rust-clippy))))
-    (home-page "https://mackwic.github.io/rspec")
-    (synopsis
-      "Write Rspec-like tests with stable rust")
-    (description
-      "Write Rspec-like tests with stable rust")
-    (license license:mpl2.0)))
-
 (define-public rust-packed-simd
   (package
     (name "rust-packed-simd")
@@ -7083,7 +7014,7 @@ invocations.")
 (define-public rust-rand-core
   (package
     (name "rust-rand-core")
-    (version "0.5.0")
+    (version "0.5.1")
     (source
       (origin
         (method url-fetch)
@@ -7092,13 +7023,12 @@ invocations.")
           (string-append name "-" version ".tar.gz"))
         (sha256
           (base32
-            "1jis94x9ri8xlxki2w2w5k29sjpfwgzkjylg7paganp74hrnhpk1"))))
+            "06bdvx08v3rkz451cm7z59xwwqn1rkfh6v9ay77b14f8dwlybgch"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
         (("rust-getrandom" ,rust-getrandom)
-         ("rust-serde" ,rust-serde)
-         ("rust-serde-derive" ,rust-serde-derive))))
+         ("rust-serde" ,rust-serde))))
     (home-page "https://crates.io/crates/rand_core")
     (synopsis
       "Core random number generator traits and tools for implementation.")
@@ -7328,6 +7258,56 @@ invocations.")
          ("rust-rand-core" ,rust-rand-core-0.4)
          ("rust-winapi" ,rust-winapi))))))
 
+(define-public rust-rand-os
+  (package
+    (name "rust-rand-os")
+    (version "0.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_os" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "06is69f8rfzs620g5b54k6cgy5yaycrsyqg55flyfrsf8g88733f"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-getrandom" ,rust-getrandom)
+         ("rust-rand-core" ,rust-rand-core))))
+    (home-page "https://crates.io/crates/rand_os")
+    (synopsis "OS backed Random Number Generator")
+    (description "OS backed Random Number Generator")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-rand-os-0.1
+  (package
+    (inherit rust-rand-os)
+    (name "rust-rand-os")
+    (version "0.1.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rand_os" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0wahppm0s64gkr2vmhcgwc0lij37in1lgfxg5rbgqlz0l5vgcxbv"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cloudabi" ,rust-cloudabi)
+        ("rust-fuchsia-cprng" ,rust-fuchsia-cprng)
+        ("rust-getrandom" ,rust-getrandom)
+        ("rust-libc" ,rust-libc)
+        ("rust-log" ,rust-log)
+        ("rust-rand-core" ,rust-rand-core-0.4)
+        ("rust-rdrand" ,rust-rdrand-0.4)
+        ("rust-stdweb" ,rust-stdweb)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen)
+        ("rust-winapi" ,rust-winapi))))))
+
 (define-public rust-rand-pcg
   (package
     (name "rust-rand-pcg")
@@ -7947,6 +7927,36 @@ system calls.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-rspec
+  (package
+    (name "rust-rspec")
+    (version "1.0.0-beta.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rspec" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1abfzwkbxlwahb243k8d3fp6i135lx1aqmbfl79w9zlpng182ndk"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-colored" ,rust-colored)
+         ("rust-derive-new" ,rust-derive-new)
+         ("rust-derive-builder" ,rust-derive-builder)
+         ("rust-expectest" ,rust-expectest)
+         ("rust-rayon" ,rust-rayon))
+        #:cargo-development-inputs
+        (("rust-clippy" ,rust-clippy))))
+    (home-page "https://mackwic.github.io/rspec")
+    (synopsis
+      "Write Rspec-like tests with stable rust")
+    (description
+      "Write Rspec-like tests with stable rust")
+    (license license:mpl2.0)))
+
 (define-public rust-rustc-demangle
   (package
     (name "rust-rustc-demangle")
-- 
cgit v1.2.3


From fc7de7d90e780f6e9ac3154460dbc8fdeea873e4 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Mon, 2 Sep 2019 15:54:30 +0300
Subject: gn: Upstream some crates

---
 gn/packages/crates-io.scm | 197 ++--------------------------------------------
 1 file changed, 8 insertions(+), 189 deletions(-)

(limited to 'gn/packages/crates-io.scm')

diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index a8f3ee8..50d2411 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -1000,11 +1000,10 @@ used in argon2rs' bench suite.")
       (origin
         (method url-fetch)
         (uri (crate-uri "cc" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "1zxzd559dbbf1iwdzmkj7czapzccs17kqqmsj9ayijpdix5rrbld"))))
+         (base32
+          "1zxzd559dbbf1iwdzmkj7czapzccs17kqqmsj9ayijpdix5rrbld"))))
     (build-system cargo-build-system)
     (arguments
      `(;#:cargo-inputs
@@ -1023,15 +1022,12 @@ used in argon2rs' bench suite.")
              (copy-file "Cargo.toml.orig" "Cargo.toml")
              #t)))
        #:tests? #f)) ; Tests require cc-test from git repo.
-    (home-page
-      "https://github.com/alexcrichton/cc-rs")
-    (synopsis
-      "A build-time dependency for Cargo build scripts to assist in invoking the native
-      C compiler to compile native C code into a static archive to be linked into Rust
-      code.")
+    (home-page "https://github.com/alexcrichton/cc-rs")
+    (synopsis "Invoke the native C compiler")
     (description
-      "This package provides a build-time dependency for Cargo build scripts to assist in invoking the native
-      C compiler to compile native C code into a static archive to be linked into Rustcode.")
+     "This package provides a build-time dependency for Cargo build scripts to
+assist in invoking the native C compiler to compile native C code into a static
+archive to be linked into Rustcode.")
     (license (list license:asl2.0
                    license:expat))))
 
@@ -3639,53 +3635,6 @@ archive to be linked into Rustcode.")
       "A Tokio aware, HTTP/2.0 client & server implementation for Rust.")
     (license license:expat)))
 
-(define-public rust-heapsize-0.3
-  (package
-    (inherit rust-heapsize)
-    (name "rust-heapsize")
-    (version "0.3.9")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "heapsize" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0dmwc37vgsdjzk10443dj4f23439i9gch28jcwzmry3chrwx8v2m"))))
-    (arguments
-     `(#:cargo-inputs (("rust-kernel32-sys" ,rust-kernel32-sys))
-       #:tests? #f)))) ;; No flexible-tests feature flags on this release.
-
-(define-public rust-heapsize-plugin
-  (package
-    (name "rust-heapsize-plugin")
-    (version "0.1.6")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "heapsize_plugin" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1i72isf699q9jl167g2kg4xd6h3cd05rc79zaph58aqjy0g0m9y9"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-development-inputs (("rust-heapsize" ,rust-heapsize-0.3))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-Cargo-toml
-           (lambda _
-             (substitute* "Cargo.toml"
-               (("path = \"..\", ") ""))
-             #t)))))
-    (home-page "https://github.com/servo/heapsize")
-    (synopsis
-      "Automatically generating infrastructure for measuring the total runtime size of an object on the heap")
-    (description
-      "Automatically generating infrastructure for measuring the total runtime size of an object on the heap")
-    (license license:mpl2.0)))
-
 (define-public rust-heck
   (package
     (name "rust-heck")
@@ -4630,33 +4579,6 @@ archive to be linked into Rustcode.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-language-tags
-  (package
-    (name "rust-language-tags")
-    (version "0.2.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "language-tags" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "16hrjdpa827carq5x4b8zhas24d8kg4s16m6nmmn1kb7cr5qh7d9"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-heapsize" ,rust-heapsize))
-        #:cargo-development-inputs
-        (("rust-heapsize-plugin" ,rust-heapsize-plugin))))
-    (home-page
-      "https://github.com/pyfisch/rust-language-tags")
-    (synopsis
-      "Language tags for Rust")
-    (description
-      "Language tags for Rust")
-    (license license:expat)))
-
 (define-public rust-lazycell
   (package
     (name "rust-lazycell")
@@ -6043,31 +5965,6 @@ stream encoding/decoding.")
         ("rust-rand" ,rust-rand-0.4)
         ("rust-serde-test" ,rust-serde-test))))))
 
-(define-public rust-owning-ref
-  (package
-    (name "rust-owning-ref")
-    (version "0.4.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "owning_ref" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "04zgwy77lin8qz398s6g44467pd6kjhbrlqifkia5rkr47mbi929"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-stable-deref-trait" ,rust-stable-deref-trait))))
-    (home-page
-      "https://github.com/Kimundi/owning-ref-rs")
-    (synopsis
-      "A library for creating references that carry their owner with them.")
-    (description
-      "A library for creating references that carry their owner with them.")
-    (license license:expat)))
-
 (define-public rust-packed-simd
   (package
     (name "rust-packed-simd")
@@ -7618,28 +7515,6 @@ invocations.")
       `(#:cargo-inputs
         (("rust-rand-core" ,rust-rand-core-0.3))))))
 
-;; This package requires features which are unavailable
-;; on the stable releases of Rust.
-(define-public rust-redox-syscall ; guix upstreamable
-  (package
-    (name "rust-redox-syscall")
-    (version "0.1.56")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "redox_syscall" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "110y7dyfm2vci4x5vk7gr0q551dvp31npl99fnsx2fb17wzwcf94"))))
-    (build-system cargo-build-system)
-    (home-page "https://gitlab.redox-os.org/redox-os/syscall")
-    (synopsis "Rust library to access raw Redox system calls")
-    (description "This package provides a Rust library to access raw Redox
-system calls.")
-    (properties '((hidden? . #t)))
-    (license license:expat)))
-
 (define-public rust-redox-users
   (package
     (name "rust-redox-users")
@@ -8132,34 +8007,6 @@ system calls.")
     (license (list license:asl2.0
                    license:boost1.0))))
 
-(define-public rust-scoped-threadpool
-  (package
-    (name "rust-scoped-threadpool")
-    (version "0.1.9")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "scoped_threadpool" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1a26d3lk40s9mrf4imhbik7caahmw2jryhhb6vqv6fplbbgzal8x"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-development-inputs
-       (("rust-lazy-static" ,rust-lazy-static))))
-    (home-page "https://github.com/Kimundi/scoped-threadpool-rs")
-    (synopsis "library for scoped and cached threadpools")
-    (description
-     "This crate provides a stable, safe and scoped threadpool.  It can be used
-to execute a number of short-lived jobs in parallel without the need to respawn
-the underlying threads.  Jobs are runnable by borrowing the pool for a given
-scope, during which an arbitrary number of them can be executed. These jobs can
-access data of any lifetime outside of the pools scope, which allows working on
-non-'static references in parallel.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-scroll
   (package
     (name "rust-scroll")
@@ -9563,34 +9410,6 @@ function with proven statistical guarantees.")
       and handle Unicode characters correctly.")
     (license license:expat)))
 
-(define-public rust-thread-id
-  (package
-    (name "rust-thread-id")
-    (version "3.3.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "thread-id" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1h90v19fjz3x9b25ywh68z5yf2zsmm6h5zb4rl302ckbsp4z9yy7"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-libc" ,rust-libc)
-         ("rust-redox-syscall" ,rust-redox-syscall)
-         ("rust-winapi" ,rust-winapi))))
-    (home-page
-      "https://github.com/ruuda/thread-id")
-    (synopsis
-      "Get a unique ID for the current thread in Rust.")
-    (description
-      "Get a unique ID for the current thread in Rust.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-time
   (package
     (name "rust-time")
-- 
cgit v1.2.3


From 4701720ad14ddd39c46ba90382e458cf9e3e3e38 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Tue, 3 Sep 2019 11:27:25 +0300
Subject: gn: Adjust to upstream crate changes.

* gn/packages/crates-io.scm (rust-syn, rust-synstructure,
rust-synstructure-0.10)[arguments]: Use rust-unicode-xid-0.1 in
cargo-inputs.
(rust-constant-time-eq): Remove variable.
---
 gn/packages/crates-io.scm | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

(limited to 'gn/packages/crates-io.scm')

diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index 50d2411..9aaf002 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -1357,26 +1357,6 @@ compile, issue warnings or otherwise produce compile-time output.")
       "This package provides a terminal and console abstraction for Rust")
     (license license:expat)))
 
-(define-public rust-constant-time-eq
-  (package
-    (name "rust-constant-time-eq")
-    (version "0.1.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "constant_time_eq" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "083icpr9xb72rrdxw3p4068dcspn6ai22jy7rhl2a8grfz448nlr"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/cesarb/constant_time_eq")
-    (synopsis" Compares two equal-sized byte strings in constant time")
-    (description
-     "This package compares two equal-sized byte strings in constant time.
-It is inspired by the Linux kernel's crypto_memneq.")
-    (license license:cc0)))
-
 (define-public rust-conv
   (package
     (name "rust-conv")
@@ -9099,7 +9079,7 @@ function with proven statistical guarantees.")
       `(#:cargo-inputs
         (("rust-proc-macro2" ,rust-proc-macro2)
          ("rust-quote" ,rust-quote)
-         ("rust-unicode-xid" ,rust-unicode-xid))
+         ("rust-unicode-xid" ,rust-unicode-xid-0.1))
         #:cargo-development-inputs
         (("rust-insta" ,rust-insta)
          ("rust-rayon" ,rust-rayon)
@@ -9132,7 +9112,7 @@ function with proven statistical guarantees.")
         (("rust-proc-macro2" ,rust-proc-macro2)
          ("rust-quote" ,rust-quote)
          ("rust-syn" ,rust-syn)
-         ("rust-unicode-xid" ,rust-unicode-xid))
+         ("rust-unicode-xid" ,rust-unicode-xid-0.1))
         #:cargo-development-inputs
         (("rust-synstructure-test-traits"
           ,rust-synstructure-test-traits))))
@@ -9162,7 +9142,7 @@ function with proven statistical guarantees.")
        (("rust-proc-macro2" ,rust-proc-macro2)
         ("rust-quote" ,rust-quote)
         ("rust-syn" ,rust-syn)
-        ("rust-unicode-xid" ,rust-unicode-xid))
+        ("rust-unicode-xid" ,rust-unicode-xid-0.1))
        #:cargo-development-inputs
        (("rust-synstructure-test-traits"
          ,rust-synstructure-test-traits))))))
-- 
cgit v1.2.3