From ed496cb63900ad3202750d495ec5a18f1d59f7ea Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 10 Nov 2021 19:51:35 +0200
Subject: WIP: proof of concept for cargo-inputs->inputs

With this patch guix can track (most?) of the crate inputs for newsboat
and can build without any cargo-inputs.
---
 gnu/packages/crates-io.scm   | 996 +++++++++++++++++++++++++++++++------------
 gnu/packages/syndication.scm |  51 +--
 2 files changed, 749 insertions(+), 298 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c96bc65e14..1c1bb9cf16 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1006,7 +1006,17 @@ (define-public rust-addr2line-0.14
         ("rust-rustc-demangle" ,rust-rustc-demangle-0.1)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
         ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
-        ("rust-smallvec" ,rust-smallvec-1))))
+        ("rust-smallvec" ,rust-smallvec-1)) ))
+    (inputs
+     `(("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+       ("rust-cpp-demangle" ,rust-cpp-demangle-0.3)
+       ("rust-fallible-iterator" ,rust-fallible-iterator-0.2)
+       ("rust-gimli" ,rust-gimli-0.23)
+       ("rust-object" ,rust-object-0.22)
+       ("rust-rustc-demangle" ,rust-rustc-demangle-0.1)
+       ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+       ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+       ("rust-smallvec" ,rust-smallvec-1)))
     (home-page "https://github.com/gimli-rs/addr2line")
     (synopsis "Symbolication library written in Rust, using gimli")
     (description
@@ -1113,7 +1123,7 @@ (define-public rust-adler32-1
         (method url-fetch)
         (uri (crate-uri "adler32" version))
         (file-name
-          (string-append name "-" version ".crate"))
+          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0bgks405vz823bphgwhj4l9h6vpfh900s0phfk4qqijyh9xhfysn"))))
@@ -1944,7 +1954,7 @@ (define-public rust-antidote-1
       (origin
         (method url-fetch)
         (uri (crate-uri "antidote" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "19g2sw2qa2ibnh4x7j1snk46593jgx6y7rnvva496ynq61af5z9l"))))
@@ -3923,7 +3933,7 @@ (define-public rust-atty-0.2
      (origin
        (method url-fetch)
        (uri (crate-uri "atty" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
          "1s7yslcs6a28c5vz7jwj63lkfgyx8mx99fdirlhi9lbhhzhrpcyr"))))
@@ -3934,6 +3944,10 @@ (define-public rust-atty-0.2
        (("rust-hermit-abi" ,rust-hermit-abi-0.1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-winapi" ,rust-winapi-0.3))))
+    (inputs
+     `(("rust-hermit-abi" ,rust-hermit-abi-0.1)
+       ("rust-libc" ,rust-libc-0.2)
+       ("rust-winapi" ,rust-winapi-0.3)))
     (home-page "https://github.com/softprops/atty")
     (synopsis "Simple interface for querying atty")
     (description
@@ -3970,7 +3984,7 @@ (define-public rust-autocfg-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "autocfg" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1chwgimpx5z7xbag7krr9d8asxfqbh683qhgl9kn3hxk2l0djj8x"))))
@@ -4211,7 +4225,8 @@ (define-public rust-backtrace-0.3
          "1g716jmrik0fx29va3js4gw8hwk5jlsmvqaa9ryp1c9qyh07c4cx"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(;#:skip-build? #t
+       #:tests? #f      ; Not all files included in the tarball.
        #:cargo-inputs
        (("rust-addr2line" ,rust-addr2line-0.14)
         ("rust-backtrace-sys" ,rust-backtrace-sys-0.1)
@@ -4223,7 +4238,23 @@ (define-public rust-backtrace-0.3
         ("rust-rustc-demangle" ,rust-rustc-demangle-0.1)
         ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
         ("rust-serde" ,rust-serde-1)
-        ("rust-winapi" ,rust-winapi-0.3))))
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-libloading" ,rust-libloading-0.6))))
+    (inputs
+     `(("rust-addr2line" ,rust-addr2line-0.14)
+       ("rust-backtrace-sys" ,rust-backtrace-sys-0.1)
+       ("rust-cfg-if" ,rust-cfg-if-1)
+       ("rust-cpp-demangle" ,rust-cpp-demangle-0.3)
+       ("rust-libc" ,rust-libc-0.2)
+       ("rust-miniz-oxide" ,rust-miniz-oxide-0.4)
+       ("rust-object" ,rust-object-0.23)
+       ("rust-rustc-demangle" ,rust-rustc-demangle-0.1)
+       ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
+       ("rust-serde" ,rust-serde-1)
+       ("rust-winapi" ,rust-winapi-0.3)))
+    (native-inputs
+     `(("rust-libloading" ,rust-libloading-0.6)))
     (home-page "https://github.com/rust-lang/backtrace-rs")
     (synopsis "Acquire a stack trace (backtrace) at runtime in a Rust program")
     (description
@@ -4254,7 +4285,7 @@ (define-public rust-backtrace-sys-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "backtrace-sys" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "16a3igz22q9lnnjjr77f4k8ci48v8zdwrs67khx3h7wx3jzfpyqq"))))
@@ -4428,7 +4459,9 @@ (define-public rust-base64-0.10
        (("rust-byteorder" ,rust-byteorder-1))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.2)
-        ("rust-rand" ,rust-rand-0.4))))))
+        ("rust-rand" ,rust-rand-0.4))))
+    (inputs
+     `(("rust-byteorder" ,rust-byteorder-1)))))
 
 (define-public rust-base64-0.9
   (package
@@ -4475,7 +4508,7 @@ (define-public rust-base-x-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "base-x" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1hfy0wv7j5ynd73yk1vyr32pqa77rp15lkrc54f8ky9c6hcbc80v"))))
@@ -4557,7 +4590,7 @@ (define-public rust-bencher-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "bencher" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1x8p2xblgqssay8cdykp5pkfc0np0jk5bs5cx4f5av097aav9zbx"))))
@@ -5268,6 +5301,10 @@ (define-public rust-bit-set-0.5
        (("rust-bit-vec" ,rust-bit-vec-0.5))
        #:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.4))))
+    (inputs
+     `(("rust-bit-vec" ,rust-bit-vec-0.5)))
+    (native-inputs
+     `(("rust-rand" ,rust-rand-0.4)))
     (home-page "https://github.com/contain-rs/bit-set")
     (synopsis "Set of bits")
     (description
@@ -5369,7 +5406,7 @@ (define-public rust-bitflags-1
       (origin
         (method url-fetch)
         (uri (crate-uri "bitflags" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "14qnd5nq8p2almk79m4m8ydqhd413yaxsyjp5xd19g3mikzf47fg"))))
@@ -5716,7 +5753,7 @@ (define-public rust-blas-sys-0.7
       (origin
         (method url-fetch)
         (uri (crate-uri "blas-sys" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0h14zjycwc76v15h8qll9z1xiryvmpvsb5gam97pqpdjrrwv5c8k"))))
@@ -7910,7 +7947,7 @@ (define-public rust-cargon-0.0
       (origin
         (method url-fetch)
         (uri (crate-uri "cargon" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1cszlab7jk736p0lb50ag4l9nv72m7j41bwrmygl0lr4iz0350w2"))))
@@ -7985,7 +8022,7 @@ (define-public rust-cblas-sys-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "cblas-sys" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0rgsn3klhhh09d8qf3b87zl4rwk93l2g0qzh9hhb0lff5kcfrzmn"))))
@@ -8007,7 +8044,7 @@ (define-public rust-cc-1
       (origin
         (method url-fetch)
         (uri (crate-uri "cc" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0j7d7h4n81z5f22l3v8ggjvvw8m64636nlaqax4x1y44da1rc12c"))))
@@ -8169,7 +8206,7 @@ (define-public rust-cfg-if-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "cfg-if" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "08h80ihs74jcyp24cd75wwabygbbdgl05k6p5dmq8akbr78vv1a7"))))
@@ -8342,12 +8379,12 @@ (define-public rust-chrono-0.4
     (arguments
      `(#:cargo-inputs
        (("rust-js-sys" ,rust-js-sys-0.3)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-num-integer" ,rust-num-integer-0.1)
-        ("rust-num-traits" ,rust-num-traits-0.2)
+        ;("rust-libc" ,rust-libc-0.2)
+        ;("rust-num-integer" ,rust-num-integer-0.1)
+        ;("rust-num-traits" ,rust-num-traits-0.2)
         ("rust-pure-rust-locales" ,rust-pure-rust-locales-0.5)
         ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
-        ("rust-serde" ,rust-serde-1)
+        ;("rust-serde" ,rust-serde-1)
         ("rust-time" ,rust-time-0.1)
         ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
        #:cargo-development-inputs
@@ -8360,6 +8397,24 @@ (define-public rust-chrono-0.4
         ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))
        #:features '("unstable-locales")
        #:tests? #f))
+    (inputs
+     `(("rust-js-sys" ,rust-js-sys-0.3)
+       ("rust-libc" ,rust-libc-0.2)
+       ("rust-num-integer" ,rust-num-integer-0.1)
+       ("rust-num-traits" ,rust-num-traits-0.2)
+       ("rust-pure-rust-locales" ,rust-pure-rust-locales-0.5)
+       ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
+       ("rust-serde" ,rust-serde-1)
+       ("rust-time" ,rust-time-0.1)
+       ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))
+    (native-inputs
+     `(("rust-bincode" ,rust-bincode-0.8)
+       ("rust-criterion" ,rust-criterion-0.3)
+       ("rust-doc-comment" ,rust-doc-comment-0.3)
+       ("rust-num-iter" ,rust-num-iter-0.1)
+       ("rust-serde-derive" ,rust-serde-derive-1)
+       ("rust-serde-json" ,rust-serde-json-1)
+       ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))
     (home-page "https://github.com/chronotope/chrono")
     (synopsis "Date and time library for Rust")
     (description "Date and time library for Rust.")
@@ -8493,6 +8548,8 @@ (define-public rust-clang-ast-0.1
        (("rust-clang-ast-test-suite" ,rust-clang-ast-test-suite-0.0.0)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1))))
+    (inputs
+     `(("rust-serde" ,rust-serde-1)))
     (home-page "https://github.com/dtolnay/clang-ast")
     (synopsis "Data structures for processing Clang's ast format")
     (description "This package contains data structures for processing Clang's
@@ -8628,7 +8685,7 @@ (define-public rust-clang-sys-0.26
       (origin
         (method url-fetch)
         (uri (crate-uri "clang-sys" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1r50dwy5hj5gq07dn0qf8222d07qv0970ymx0j8n9779yayc3w3f"))))
@@ -8779,7 +8836,7 @@ (define-public rust-clap-2
      (origin
        (method url-fetch)
        (uri (crate-uri "clap" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
          "00i065a58987k1sbzqmlz721rw521zcg08jmsh40gi3khp3qmr9p"))))
@@ -8799,6 +8856,21 @@ (define-public rust-clap-2
        (("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-regex" ,rust-regex-1)
         ("rust-version-sync" ,rust-version-sync-0.8))))
+     (inputs
+      `(("rust-ansi-term" ,rust-ansi-term-0.11)
+        ("rust-atty" ,rust-atty-0.2)
+        ("rust-bitflags" ,rust-bitflags-1)
+        ("rust-clippy" ,rust-clippy-0.0)
+        ("rust-strsim" ,rust-strsim-0.8)
+        ("rust-term-size" ,rust-term-size-0.3)
+        ("rust-textwrap" ,rust-textwrap-0.11)
+        ("rust-unicode-width" ,rust-unicode-width-0.1)
+        ("rust-vec-map" ,rust-vec-map-0.8)
+        ("rust-yaml-rust" ,rust-yaml-rust-0.3)))
+     (native-inputs
+      `(("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-version-sync" ,rust-version-sync-0.8)))
     (license license:expat)))
 
 (define-public rust-clearscreen-1
@@ -8835,7 +8907,7 @@ (define-public rust-clicolors-control-1
       (origin
         (method url-fetch)
         (uri (crate-uri "clicolors-control" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "07klix8nbpwk0cg1k4h0kkiijm1jxvrzndqdkr7dqr6xvkjjw24h"))))
@@ -8975,7 +9047,7 @@ (define-public rust-cloudabi-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "cloudabi" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0rv4yf5jlldfkynzrw687s00f4x12ypw7axv71vawhy6h4i52i23"))))
@@ -8999,12 +9071,13 @@ (define-public rust-cloudabi-0.0
       (origin
         (method url-fetch)
         (uri (crate-uri "cloudabi" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0kxcg83jlihy0phnd2g8c2c303px3l2p3pkjz357ll6llnd5pz6x"))))
     (arguments
-     `(#:cargo-inputs
+     `(#:tests? #f
+       #:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1))))))
 
 (define-public rust-cloudflare-zlib-sys-0.2
@@ -9069,7 +9142,7 @@ (define-public rust-cmake-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "cmake" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1fv346ipxmvff6qrnh78rild0s8k72ilfjkdsrk869562y62cmhf"))))
@@ -9264,11 +9337,31 @@ (define-public rust-codespan-reporting-0.11
         (base32 "04wwbn2c5rcfz3zn4kj7nyvpj37hn5cxh0m8w1r3af4ak6w45kn6"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(;#:skip-build? #t
        #:cargo-inputs
        (("rust-serde" ,rust-serde-1)
         ("rust-termcolor" ,rust-termcolor-1)
-        ("rust-unicode-width" ,rust-unicode-width-0.1))))
+        ("rust-unicode-width" ,rust-unicode-width-0.1))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-insta" ,rust-insta-1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-peg" ,rust-peg-0.6)
+        ("rust-rustyline" ,rust-rustyline-6)
+        ("rust-structopt" ,rust-structopt-0.3)
+        ("rust-unindent" ,rust-unindent-0.1))))
+    (inputs
+     `(("rust-serde" ,rust-serde-1)
+       ("rust-termcolor" ,rust-termcolor-1)
+       ("rust-unicode-width" ,rust-unicode-width-0.1)))
+    (native-inputs
+     `(("rust-anyhow" ,rust-anyhow-1)
+       ("rust-insta" ,rust-insta-1)
+       ("rust-lazy-static" ,rust-lazy-static-1)
+       ("rust-peg" ,rust-peg-0.6)
+       ("rust-rustyline" ,rust-rustyline-6)
+       ("rust-structopt" ,rust-structopt-0.3)
+       ("rust-unindent" ,rust-unindent-0.1)))
     (home-page "https://github.com/brendanzab/codespan")
     (synopsis "Beautiful diagnostic reporting for text-based programming languages")
     (description
@@ -9625,7 +9718,7 @@ (define-public rust-compiler-builtins-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "compiler_builtins" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1rhj6ccmfkh9gcxnxgjq4fg257yi4f9325nfzsphbmxwkrg06sq3"))))
@@ -10057,7 +10150,7 @@ (define-public rust-constant-time-eq-0.1
      (origin
        (method url-fetch)
        (uri (crate-uri "constant_time_eq" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
          "1g3vp04qzmk6cpzrd19yci6a95m7ap6wy7wkwgiy2pjklklrfl14"))))
@@ -10544,7 +10637,7 @@ (define-public rust-core-foundation-sys-0.6
      (origin
        (method url-fetch)
        (uri (crate-uri "core-foundation-sys" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
          "0fzsw1j9g1x598yhwklg59l15hwzc0pyvs01w9fg2kin4598mjp7"))))))
@@ -10672,11 +10765,21 @@ (define-public rust-cpp-demangle-0.3
         (base32 "142knq32bpa2hbp4z0bldjd1x869664l0ff2gdrqx7pryv59x4a4"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:skip-build? #t ; nothing to install
        #:cargo-inputs
        (("rust-afl" ,rust-afl-0.8)
-        ("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-glob" ,rust-glob-0.3))))
+        ("rust-cfg-if" ,rust-cfg-if-0.1)
+        ("rust-glob" ,rust-glob-0.3))
+       #:cargo-development-inputs
+       (("rust-clap" ,rust-clap-2)
+        ("rust-diff" ,rust-diff-0.1))))
+    (inputs
+     `(("rust-afl" ,rust-afl-0.8)
+       ("rust-cfg-if" ,rust-cfg-if-0.1)
+       ("rust-glob" ,rust-glob-0.3)))
+    (native-inputs
+     `(("rust-clap" ,rust-clap-2)
+       ("rust-diff" ,rust-diff-0.1)))
     (home-page "https://github.com/gimli-rs/cpp_demangle")
     (synopsis "Demangle C++ symbols")
     (description
@@ -10699,13 +10802,14 @@ (define-public rust-cpp-demangle-0.2
          "0bamx2c78xzjhhvpg6p9bjarl6qm6j8npm6756kiqdh784w29j8k"))))
     (arguments
      `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-afl" ,rust-afl-0.8)
-        ("rust-cfg-if" ,rust-cfg-if-0.1)
-        ("rust-glob" ,rust-glob-0.3))
-       #:cargo-development-inputs
-       (("rust-clap" ,rust-clap-2)
-        ("rust-diff" ,rust-diff-0.1))))))
+       ))
+    (inputs
+     `(("rust-afl" ,rust-afl-0.8)
+       ("rust-cfg-if" ,rust-cfg-if-0.1)
+       ("rust-glob" ,rust-glob-0.3)))
+    (native-inputs
+     `(("rust-clap" ,rust-clap-2)
+       ("rust-diff" ,rust-diff-0.1)))))
 
 (define-public rust-cpufeatures-0.1
   (package
@@ -12497,12 +12601,22 @@ (define-public rust-curl-sys-0.4
        #:cargo-development-inputs
        (("rust-cfg-if" ,rust-cfg-if-1))))
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("pkg-config" ,pkg-config)
+       ("rust-cfg-if" ,rust-cfg-if-1)))
     (inputs
      `(("curl" ,curl)
        ("nghttp2" ,nghttp2)
        ("openssl" ,openssl)
-       ("zlib" ,zlib)))
+       ("zlib" ,zlib)
+       ("rust-libc" ,rust-libc-0.2)
+       ("rust-libnghttp2-sys" ,rust-libnghttp2-sys-0.1)
+       ("rust-libz-sys" ,rust-libz-sys-1)
+       ("rust-mesalink" ,rust-mesalink-1)
+       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+       ("rust-winapi" ,rust-winapi-0.3)
+       ("rust-cc" ,rust-cc-1)
+       ("rust-pkg-config" ,rust-pkg-config-0.3)
+       ("rust-vcpkg" ,rust-vcpkg-0.2)))
     (home-page "https://github.com/alexcrichton/curl-rust")
     (synopsis "Native bindings to the libcurl library")
     (description
@@ -12590,6 +12704,17 @@ (define-public rust-cxx-1
         ("rust-cxx-test-suite" ,rust-cxx-test-suite-0.0.0)
         ("rust-rustversion" ,rust-rustversion-1)
         ("rust-trybuild" ,rust-trybuild-1))))
+    (inputs
+     `(("rust-cc" ,rust-cc-1)
+       ("rust-cxxbridge-flags" ,rust-cxxbridge-flags-1)
+       ("rust-cxxbridge-macro" ,rust-cxxbridge-macro-1)
+       ("rust-link-cplusplus" ,rust-link-cplusplus-1)))
+    (native-inputs
+     `(("rust-cxx-build" ,rust-cxx-build-1)
+       ("rust-cxx-gen" ,rust-cxx-gen-0.7)
+       ("rust-cxx-test-suite" ,rust-cxx-test-suite-0.0.0)
+       ("rust-rustversion" ,rust-rustversion-1)
+       ("rust-trybuild" ,rust-trybuild-1)))
     (home-page "https://cxx.rs")
     (synopsis "Safe interop between Rust and C++")
     (description "This package provides a safe interop between Rust and C++.")
@@ -12649,6 +12774,17 @@ (define-public rust-cxx-build-1
        #:cargo-development-inputs
        (("rust-cxx-gen" ,rust-cxx-gen-0.7)
         ("rust-pkg-config" ,rust-pkg-config-0.3))))
+    (inputs
+     `(("rust-cc" ,rust-cc-1)
+       ("rust-codespan-reporting" ,rust-codespan-reporting-0.11)
+       ("rust-lazy-static" ,rust-lazy-static-1)
+       ("rust-proc-macro2" ,rust-proc-macro2-1)
+       ("rust-quote" ,rust-quote-1)
+       ("rust-scratch" ,rust-scratch-1)
+       ("rust-syn" ,rust-syn-1)))
+    (native-inputs
+     `(("rust-cxx-gen" ,rust-cxx-gen-0.7)
+       ("rust-pkg-config" ,rust-pkg-config-0.3)))
     (home-page "https://cxx.rs")
     (synopsis "C++ code generator")
     (description
@@ -12803,7 +12939,8 @@ (define-public rust-cxxbridge-macro-1
           "0gkwvihw74dh8p3fz3552wnxanrpwmwfy38ylz2z8knjq0y8y4v3"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t     ; Avoid a cycle with rust-cxx-1.
+       #:cargo-inputs
        (("rust-clang-ast" ,rust-clang-ast-0.1)
         ("rust-flate2" ,rust-flate2-1)
         ("rust-memmap" ,rust-memmap-0.7)
@@ -12814,6 +12951,17 @@ (define-public rust-cxxbridge-macro-1
         ("rust-syn" ,rust-syn-1))
        #:cargo-development-inputs
        (("rust-cxx" ,rust-cxx-1))))
+    (inputs
+     `(("rust-clang-ast" ,rust-clang-ast-0.1)
+       ("rust-flate2" ,rust-flate2-1)
+       ("rust-memmap" ,rust-memmap-0.7)
+       ("rust-proc-macro2" ,rust-proc-macro2-1)
+       ("rust-quote" ,rust-quote-1)
+       ("rust-serde" ,rust-serde-1)
+       ("rust-serde-json" ,rust-serde-json-1)
+       ("rust-syn" ,rust-syn-1)))
+    ;(native-inputs
+    ; `(("rust-cxx" ,rust-cxx-1)))  ; Creates a cycle
     (home-page "https://cxx.rs")
     (synopsis "Implementation detail of the `cxx` crate")
     (description
@@ -13148,7 +13296,7 @@ (define-public rust-data-encoding-2
       (origin
         (method url-fetch)
         (uri (crate-uri "data-encoding" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "027rcrwdschrkdr2n9d24gnh03vl41qmvhjqn9vn6z1njy2n0flr"))))
@@ -13501,7 +13649,7 @@ (define-public rust-defmac-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "defmac" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "14cqfvc0f1pkd6gdhjxa2wv3iibqprc0n203ims8lvg96752ynfm"))))
@@ -13521,7 +13669,7 @@ (define-public rust-defmac-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "defmac" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "17giv0n0n1r64z0dahfvkjy3ys517jxyhs8sd9lmgvcljpjyryxa"))))))
@@ -14261,10 +14409,13 @@ (define-public rust-diff-0.1
          "16b40bhsa2qgvgvxs983l625pkxyp6m0mzmpwg2605cvj53yl98f"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(;#:skip-build? #t
        #:cargo-development-inputs
-       (("rust-quickcheck" ,rust-quickcheck-0.9)
-        ("rust-speculate" ,rust-speculate-0.1))))
+      (("rust-quickcheck" ,rust-quickcheck-0.9)
+       ("rust-speculate" ,rust-speculate-0.1))))
+    (native-inputs
+     `(("rust-quickcheck" ,rust-quickcheck-0.9)
+       ("rust-speculate" ,rust-speculate-0.1)))
     (home-page "https://github.com/utkarshkukreti/diff.rs")
     (synopsis
      "LCS based slice and string diffing implementation")
@@ -14640,7 +14791,7 @@ (define-public rust-dirs-1
       (origin
         (method url-fetch)
         (uri (crate-uri "dirs" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "009rrhzj9pxyncmm2vhlj70npg0cgggv2hjbbkiwdl9vccq8kmrz"))))
@@ -14760,7 +14911,7 @@ (define-public rust-discard-1
       (origin
         (method url-fetch)
         (uri (crate-uri "discard" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1h67ni5bxvg95s91wgicily4ix7lcw7cq0a5gy9njrybaibhyb91"))))
@@ -14913,7 +15064,7 @@ (define-public rust-doc-comment-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "doc-comment" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "15rsqxgarfpb1yim9sbp9yfgj7p2dq6v51c6bq1a62paii9ylgcj"))))
@@ -15220,7 +15371,7 @@ (define-public rust-dtoa-0.4
       (origin
         (method url-fetch)
         (uri (crate-uri "dtoa" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0phbm7i0dpn44gzi07683zxaicjap5064w62pidci4fhhciv8mza"))))
@@ -15242,7 +15393,7 @@ (define-public rust-dtoa-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "dtoa" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0g96cap6si1g6wi62hsdk2fnj3sf5vd4i97zj6163j8hhnsl3n0d"))))))
@@ -16256,6 +16407,9 @@ (define-public rust-enum-to-u8-slice-derive-0.1
      `(#:cargo-inputs
        (("rust-quote" ,rust-quote-0.3)
         ("rust-syn" ,rust-syn-0.11))))
+    (inputs
+     `(("rust-quote" ,rust-quote-0.3)
+       ("rust-syn" ,rust-syn-0.11)))
     (home-page "https://github.com/mesalock-linux/enum_to_u8_slice_derive")
     (synopsis "Convert enum to u8 slice ref")
     (description
@@ -16377,7 +16531,13 @@ (define-public rust-env-logger-0.6
         ("rust-humantime" ,rust-humantime-1)
         ("rust-log" ,rust-log-0.4)
         ("rust-regex" ,rust-regex-1)
-        ("rust-termcolor" ,rust-termcolor-1))))))
+        ("rust-termcolor" ,rust-termcolor-1))))
+    (inputs
+     `(("rust-atty" ,rust-atty-0.2)
+       ("rust-humantime" ,rust-humantime-1)
+       ("rust-log" ,rust-log-0.4)
+       ("rust-regex" ,rust-regex-1)
+       ("rust-termcolor" ,rust-termcolor-1)))))
 
 (define-public rust-env-logger-0.5
   (package
@@ -17047,7 +17207,7 @@ (define-public rust-fallible-iterator-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "fallible-iterator" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1xq759lsr8gqss7hva42azn3whgrbrs2sd9xpn92c5ickxm1fhs4"))))
@@ -17198,6 +17358,14 @@ (define-public rust-fastrand-1
         ("rust-rand" ,rust-rand-0.8)
         ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
         ("rust-wyhash" ,rust-wyhash-0.5))))
+     (inputs
+      `(("rust-instant" ,rust-instant-0.1)))
+     (native-inputs
+      `(("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-instant" ,rust-instant-0.1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
+        ("rust-wyhash" ,rust-wyhash-0.5)))
     (home-page "https://github.com/stjepang/fastrand")
     (synopsis "Simple and fast random number generator")
     (description
@@ -17563,7 +17731,7 @@ (define-public rust-filetime-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "filetime" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1s71cb7hzkk4ahc5j53w8933gnxv2giyj7v0za5hbbk37ahwyd0x"))))
@@ -17596,7 +17764,7 @@ (define-public rust-findshlibs-0.5
       (origin
         (method url-fetch)
         (uri (crate-uri "findshlibs" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1n2vagn0q5yim32hxkwi1cjgp3yn1dm45p7z8nw6lapywihhs9mi"))))
@@ -17654,7 +17822,7 @@ (define-public rust-fixedbitset-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "fixedbitset" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0kg03p777wc0dajd9pvlcnsyrwa8dhqwf0sd9r4dw0p82rs39arp"))))
@@ -17674,7 +17842,7 @@ (define-public rust-fixedbitset-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "fixedbitset" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46"))))))
@@ -17807,6 +17975,23 @@ (define-public rust-flate2-1
         ("rust-tokio-io" ,rust-tokio-io-0.1)
         ("rust-tokio-tcp" ,rust-tokio-tcp-0.1)
         ("rust-tokio-threadpool" ,rust-tokio-threadpool-0.1))))
+    (inputs
+     `(("rust-cfg-if" ,rust-cfg-if-1)
+       ("rust-cloudflare-zlib-sys" ,rust-cloudflare-zlib-sys-0.2)
+       ("rust-crc32fast" ,rust-crc32fast-1)
+       ("rust-futures" ,rust-futures-0.1)
+       ("rust-libc" ,rust-libc-0.2)
+       ("rust-libz-sys" ,rust-libz-sys-1)
+       ("rust-miniz-sys" ,rust-miniz-sys-0.1)
+       ("rust-miniz-oxide" ,rust-miniz-oxide-0.4)
+       ("rust-tokio-io" ,rust-tokio-io-0.1)))
+    ;(native-inputs
+    ; `(("rust-futures" ,rust-futures-0.1)
+    ;   ("rust-quickcheck" ,rust-quickcheck-0.9)
+    ;   ("rust-rand" ,rust-rand-0.7)
+    ;   ("rust-tokio-io" ,rust-tokio-io-0.1)
+    ;   ("rust-tokio-tcp" ,rust-tokio-tcp-0.1)
+    ;   ("rust-tokio-threadpool" ,rust-tokio-threadpool-0.1)))
     (home-page "https://github.com/alexcrichton/flate2-rs")
     (synopsis
      "Bindings to miniz.c for DEFLATE compression and decompression")
@@ -18033,7 +18218,7 @@ (define-public rust-fnv-1
       (origin
         (method url-fetch)
         (uri (crate-uri "fnv" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1ww56bi1r5b8id3ns9j3qxbi7w5h005rzhiryy0zi9h97raqbb9g"))))
@@ -18199,7 +18384,7 @@ (define-public rust-foreign-types-shared-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "foreign-types-shared" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0kanxlif1vp0ffh2r9l610jqbkmb3183yqykxq1z5w1vay2rn7y6"))))))
@@ -18429,7 +18614,7 @@ (define-public rust-fs-extra-1
      (origin
        (method url-fetch)
        (uri (crate-uri "fs_extra" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "151k6dr35mhq5d8pc8krhw55ajhkyiv0pm14s7zzlc5bc9fp28i0"))))
     (build-system cargo-build-system)
@@ -18597,7 +18782,7 @@ (define-public rust-fuchsia-cprng-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "fuchsia-cprng" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1fnkqrbz7ixxzsb04bsz9p0zzazanma8znfdqjvh39n14vapfvx0"))))
@@ -18618,7 +18803,7 @@ (define-public rust-fuchsia-zircon-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "fuchsia-zircon" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "10jxc5ks1x06gpd0xg51kcjrxr35nj6qhx2zlc5n7bmskv3675rf"))))
@@ -18641,7 +18826,7 @@ (define-public rust-fuchsia-zircon-sys-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "fuchsia-zircon-sys" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "19zp2085qsyq2bh1gvcxq1lb8w6v6jj9kbdkhpdjrl95fypakjix"))))
@@ -18740,7 +18925,7 @@ (define-public rust-futures-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "futures" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1vq3cw37knnd0afw3rcjzh71i2l01v5m4ysinrrqdvnn2ql0z60v"))))
@@ -18863,7 +19048,7 @@ (define-public rust-futures-core-preview-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "futures-core-preview" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "02n66jkjhpy210dv24pz0j30lvyin5kzlrb50p1j7x8yzdin4nxk"))))
@@ -18884,7 +19069,7 @@ (define-public rust-futures-cpupool-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "futures-cpupool" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1r32456gpblzfvnkf60545v8acqk7gh5zhyhi1jn669k9gicv45b"))))
@@ -19018,7 +19203,7 @@ (define-public rust-futures-io-preview-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "futures-io-preview" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1npb04xbn2gw5rjllz88cb88fql44xxfkgcidjjj26fva3j4m4gl"))))
@@ -19224,7 +19409,7 @@ (define-public rust-futures-sink-preview-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "futures-sink-preview" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1v7y5qvgvl0d6hd9s4k7bd5qrj2gdlrs5yfl22v5pxv9dgpliwc6"))))
@@ -19963,7 +20148,7 @@ (define-public rust-getopts-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "getopts" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1mgb3qvivi26gs6ihqqhh8iyhp3vgxri6vwyrwg28w0xqzavznql"))))
@@ -20004,6 +20189,14 @@ (define-public rust-getrandom-0.2
         ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
        #:cargo-development-inputs
        (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (inputs
+     `(("rust-cfg-if" ,rust-cfg-if-0.1)
+       ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+       ("rust-libc" ,rust-libc-0.2)
+       ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+       ("rust-stdweb" ,rust-stdweb-0.4)
+       ("rust-wasi" ,rust-wasi-0.9)
+       ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))
     (home-page "https://github.com/rust-random/getrandom")
     (synopsis "Retrieve random data from system source")
     (description
@@ -20084,7 +20277,11 @@ (define-public rust-gettext-rs-0.7
        #:cargo-development-inputs
        (("rust-lazy-static" ,rust-lazy-static-1))))
     (inputs
-     `(("gettext" ,gettext-minimal)))
+     `(("gettext" ,gettext-minimal)
+       ("rust-gettext-sys" ,rust-gettext-sys-0.21)
+       ("rust-locale-config" ,rust-locale-config-0.3)))
+    (native-inputs
+     `(("rust-lazy-static" ,rust-lazy-static-1)))
     (home-page "https://github.com/Koka/gettext-rs")
     (synopsis "GNU Gettext FFI binding for Rust")
     (description "This package provides GNU Gettext FFI bindings for Rust.")
@@ -20322,7 +20519,15 @@ (define-public rust-gimli-0.23
         ("rust-indexmap" ,rust-indexmap-1)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
         ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
-        ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))
+        ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))
+       ))
+    (inputs
+     `(("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+       ("rust-fallible-iterator" ,rust-fallible-iterator-0.2)
+       ("rust-indexmap" ,rust-indexmap-1)
+       ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+       ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+       ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)))
     (home-page "https://github.com/gimli-rs/gimli")
     (synopsis "Library for reading and writing the DWARF debugging format")
     (description
@@ -20637,7 +20842,7 @@ (define-public rust-glob-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "glob" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0x25wfr7vg3mzxc9x05dcphvd3nwlcmbnxrvwcvrrdwplcrrk4cv"))))
@@ -20663,7 +20868,7 @@ (define-public rust-glob-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "glob" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb"))))))
@@ -21769,7 +21974,7 @@ (define-public rust-heapsize-0.4
      (origin
        (method url-fetch)
        (uri (crate-uri "heapsize" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
          "0q94q9ppqjgrw71swiyia4hgby2cz6dldp7ij57nkvhd6zmfcy8n"))))
@@ -21794,7 +21999,7 @@ (define-public rust-heapsize-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "heapsize" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0dmwc37vgsdjzk10443dj4f23439i9gch28jcwzmry3chrwx8v2m"))))
@@ -21811,7 +22016,7 @@ (define-public rust-heapsize-plugin-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "heapsize_plugin" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1i72isf699q9jl167g2kg4xd6h3cd05rc79zaph58aqjy0g0m9y9"))))
@@ -21834,7 +22039,7 @@ (define-public rust-heck-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "heck" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "01a2v7yvkiqxakdqz4hw3w3g4sm52ivz9cs3qcsv2arxsmw4wmi0"))))
@@ -21908,7 +22113,7 @@ (define-public rust-hex-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "hex" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0xsdcjiik5j750j67zk42qdnmm4ahirk3gmkmcqgq7qls2jjcl40"))))))
@@ -21922,7 +22127,7 @@ (define-public rust-hex-0.2
      (origin
        (method url-fetch)
        (uri (crate-uri "hex" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1ajkw40qzn2ygnqjj9w584f6l31wi318258n84pn2hax8la2i8nn"))))))
 
@@ -22270,7 +22475,7 @@ (define-public rust-hostname-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "hostname" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0kprf862qaa7lwdms6aw7f3275h0j2rwhs9nz5784pm8hdmb9ki1"))))
@@ -22709,7 +22914,9 @@ (define-public rust-humantime-1
        #:cargo-development-inputs
        (("rust-chrono" ,rust-chrono-0.4)
         ("rust-rand" ,rust-rand-0.4)
-        ("rust-time" ,rust-time-0.1))))))
+        ("rust-time" ,rust-time-0.1))))
+    (inputs
+     `(("rust-quick-error" ,rust-quick-error-1)))))
 
 (define-public rust-hyper-0.14
   (package
@@ -23261,6 +23468,13 @@ (define-public rust-idna-0.2
        #:cargo-development-inputs
        (("rust-rustc-test" ,rust-rustc-test-0.3)
         ("rust-serde-json" ,rust-serde-json-1))))
+    (inputs
+     `(("rust-matches" ,rust-matches-0.1)
+       ("rust-unicode-bidi" ,rust-unicode-bidi-0.3)
+       ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))
+    (native-inputs
+     `(("rust-rustc-test" ,rust-rustc-test-0.3)
+       ("rust-serde-json" ,rust-serde-json-1)))
     (home-page "https://github.com/servo/rust-url/")
     (synopsis "Internationalizing Domain Names in Applications and Punycode")
     (description
@@ -24015,7 +24229,7 @@ (define-public rust-iovec-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "iovec" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0ph73qygwx8i0mblrf110cj59l00gkmsgrpzz1rm85syz5pymcxj"))))
@@ -24466,7 +24680,7 @@ (define-public rust-itoa-0.4
       (origin
         (method url-fetch)
         (uri (crate-uri "itoa" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "13nxqrfnh83a7x5rw4wq2ilp8nxvwy74dxzysdg59dbxqk0agdxq"))))
@@ -24502,7 +24716,7 @@ (define-public rust-itoa-0.1
      (origin
        (method url-fetch)
        (uri (crate-uri "itoa" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
          "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f"))))))
@@ -24905,6 +25119,8 @@ (define-public rust-js-sys-0.3
        #:cargo-development-inputs
        (("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
         ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (inputs
+     `(("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))
     (home-page "https://rustwasm.github.io/wasm-bindgen/")
     (synopsis "Bindings for all JS global objects and functions in WASM")
     (description
@@ -24921,7 +25137,7 @@ (define-public rust-json-0.11
       (origin
         (method url-fetch)
         (uri (crate-uri "json" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1rg9jxf6bpbwis3ixd5ak8rp37him7n4z8awz4ssrxl6hyplbhlj"))))
@@ -25057,7 +25273,7 @@ (define-public rust-kernel32-sys-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "kernel32-sys" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1389av0601a9yz8dvx5zha9vmkd6ik7ax0idpb032d28555n41vm"))))
@@ -25124,7 +25340,7 @@ (define-public rust-language-tags-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "language-tags" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "16hrjdpa827carq5x4b8zhas24d8kg4s16m6nmmn1kb7cr5qh7d9"))))
@@ -25350,7 +25566,7 @@ (define-public rust-lazy-static-1
       (origin
         (method url-fetch)
         (uri (crate-uri "lazy_static" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0in6ikhw8mgl33wjv6q6xfrb5b9jr16q8ygjy803fay4zcisvaz2"))))
@@ -26014,7 +26230,7 @@ (define-public rust-libloading-0.5
       (origin
         (method url-fetch)
         (uri (crate-uri "libloading" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0lyply8rcqc8agajzxs7bq6ivba9dnn1i68kgb9z2flnfjh13cgj"))))
@@ -26476,6 +26692,13 @@ (define-public rust-libz-sys-1
         ("rust-cmake" ,rust-cmake-0.1)
         ("rust-pkg-config" ,rust-pkg-config-0.3)
         ("rust-vcpkg" ,rust-vcpkg-0.2))))
+    (inputs
+     `(("rust-libc" ,rust-libc-0.2)
+       ;; Build dependencies:
+       ("rust-cc" ,rust-cc-1)
+       ("rust-cmake" ,rust-cmake-0.1)
+       ("rust-pkg-config" ,rust-pkg-config-0.3)
+       ("rust-vcpkg" ,rust-vcpkg-0.2)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("zlib" ,zlib)))
@@ -26558,8 +26781,10 @@ (define-public rust-link-cplusplus-1
          (base32
           "0m7365ig7r88x7b4gkzj5m7b6wiq42pi1ign7mvyq63jr22sfspr"))))
     (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-cc" ,rust-cc-1))))
+    ;(arguments
+    ; `(#:cargo-inputs (("rust-cc" ,rust-cc-1))))
+    (inputs
+     `(("rust-cc" ,rust-cc-1)))
     (home-page "https://github.com/dtolnay/link-cplusplus")
     (synopsis "Link libstdc++ or libc++ automatically or manually")
     (description "This crate helps link to libstdc++ or libc++ automatically or
@@ -26810,6 +27035,12 @@ (define-public rust-locale-config-0.3
         ("rust-objc-foundation" ,rust-objc-foundation-0.1)
         ("rust-regex" ,rust-regex-1)
         ("rust-winapi" ,rust-winapi-0.3))))
+    (inputs
+     `(("rust-lazy-static" ,rust-lazy-static-1)
+       ("rust-objc" ,rust-objc-0.2)
+       ("rust-objc-foundation" ,rust-objc-foundation-0.1)
+       ("rust-regex" ,rust-regex-1)
+       ("rust-winapi" ,rust-winapi-0.3)))
     (home-page "https://github.com/rust-locale/locale_config/")
     (synopsis "Maintains locale preferences for processes and threads")
     (description
@@ -26855,6 +27086,10 @@ (define-public rust-lock-api-0.4
        (("rust-owning-ref" ,rust-owning-ref-0.4)
         ("rust-scopeguard" ,rust-scopeguard-1)
         ("rust-serde" ,rust-serde-1))))
+    (inputs
+     `(("rust-owning-ref" ,rust-owning-ref-0.4)
+       ("rust-scopeguard" ,rust-scopeguard-1)
+       ("rust-serde" ,rust-serde-1)))
     (home-page "https://github.com/Amanieu/parking_lot")
     (synopsis "Wrappers to create fully-featured Mutex and RwLock types")
     (description "This package provides wrappers to create fully-featured
@@ -26901,7 +27136,7 @@ (define-public rust-lock-api-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "lock_api" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0b24q9mh258xa52ap636q1sxz0j5vrnp0hwbbh7ddjka3wwz3sv2"))))
@@ -26918,7 +27153,7 @@ (define-public rust-log-0.4
      (origin
        (method url-fetch)
        (uri (crate-uri "log" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "04175hv0v62shd82qydq58a48k3bjijmk54v38zgqlbxqkkbpfai"))))
     (build-system cargo-build-system)
@@ -27690,8 +27925,10 @@ (define-public rust-malloc-buf-0.0
        (base32
         "1jqr77j89pwszv51fmnknzvd53i1nkmcr8rjrvcxhm4dx1zr1fv2"))))
    (build-system cargo-build-system)
-   (arguments
-    `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
+   ;(arguments
+   ; `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
+   (inputs
+    `(("rust-libc" ,rust-libc-0.2)))
    (home-page "https://github.com/SSheldon/malloc_buf")
    (synopsis "Structs for handling malloc'd memory passed to Rust")
    (description
@@ -27706,7 +27943,7 @@ (define-public rust-maplit-1
       (origin
         (method url-fetch)
         (uri (crate-uri "maplit" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "07b5kjnhrrmfhgqm9wprjw8adx6i225lqp49gasgqg74lahnabiy"))))
@@ -27854,7 +28091,7 @@ (define-public rust-matches-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "matches" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "020axl4q7rk9vz90phs7f8jas4imxal9y9kxl4z4v7a6719mrz3z"))))
@@ -27929,7 +28166,7 @@ (define-public rust-matrixmultiply-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "matrixmultiply" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "13s7nfd3dfcsrixld2lk8c563ih5xzczl2w36hprfc016rkfrxyl"))))
@@ -27949,7 +28186,7 @@ (define-public rust-matrixmultiply-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "matrixmultiply" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "00p0fpjhm45qdzi37mgv7ggsy8b9gqvq4999yrbgyn1dxkf6gbfw"))))
@@ -28037,7 +28274,7 @@ (define-public rust-md5-0.7
      (origin
        (method url-fetch)
        (uri (crate-uri "md5" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0wcps37hrhz59fkhf8di1ppdnqld6l1w5sdy7jp7p51z0i4c8329"))))
     (build-system cargo-build-system)
@@ -28057,7 +28294,7 @@ (define-public rust-md5-0.6
       (origin
         (method url-fetch)
         (uri (crate-uri "md5" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "17b2xm4h4cvxsdjsf3kdrzqv2za60kak961xzi5kmw6g6djcssvy"))))))
@@ -28223,18 +28460,21 @@ (define-public rust-memmap-0.7
       (origin
         (method url-fetch)
         (uri (crate-uri "memmap" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0ns7kkd1h4pijdkwfvw4qlbbmqmlmzwlq3g2676dcl5vwyazv1b5"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-winapi" ,rust-winapi-0.3))
+       ;#:cargo-inputs
+       ;(("rust-libc" ,rust-libc-0.2)
+       ; ("rust-winapi" ,rust-winapi-0.3))
        #:cargo-development-inputs
        (("rust-tempdir" ,rust-tempdir-0.3))))
+    (inputs
+     `(("rust-libc" ,rust-libc-0.2)
+       ("rust-winapi" ,rust-winapi-0.3)))
     (home-page "https://github.com/danburkert/memmap-rs")
     (synopsis "Rust library for cross-platform memory mapped IO")
     (description
@@ -28252,7 +28492,7 @@ (define-public rust-memmap-0.6
       (origin
         (method url-fetch)
         (uri (crate-uri "memmap" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1zy6s0ni0lx9rjzq3gq2zz9r8zgjmbp02332g3gsj4fyhv4s5zz2"))))))
@@ -28534,6 +28774,22 @@ (define-public rust-mesalink-1
         ("rust-webpki-roots" ,rust-webpki-roots-0.17))
        #:cargo-development-inputs
        (("rust-cfg-if" ,rust-cfg-if-1))))
+    (inputs
+     `(("rust-base64" ,rust-base64-0.10)
+       ("rust-bitflags" ,rust-bitflags-1)
+       ("rust-enum-to-u8-slice-derive" ,rust-enum-to-u8-slice-derive-0.1)
+       ("rust-env-logger" ,rust-env-logger-0.6)
+       ("rust-jemallocator" ,rust-jemallocator-0.3)
+       ("rust-lazy-static" ,rust-lazy-static-1)
+       ("rust-libc" ,rust-libc-0.2)
+       ("rust-parking-lot" ,rust-parking-lot-0.9)
+       ("rust-ring" ,rust-ring-0.16)
+       ("rust-rustls" ,rust-rustls-0.16)
+       ("rust-sct" ,rust-sct-0.6)
+       ("rust-untrusted" ,rust-untrusted-0.7)
+       ("rust-walkdir" ,rust-walkdir-2)
+       ("rust-webpki" ,rust-webpki-0.21)
+       ("rust-webpki-roots" ,rust-webpki-roots-0.17)))
     (home-page "https://github.com/mesalock-linux/mesalink")
     (synopsis "Memory-safe and OpenSSL-compatible TLS library")
     (description
@@ -28821,7 +29077,7 @@ (define-public rust-mime-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "mime" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "13dcm9lh01hdwfjcg74ppljyjfj1c6w3a3cwkhxf0w8wa37cfq1a"))))
@@ -28974,6 +29230,12 @@ (define-public rust-miniz-oxide-0.4
         ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
         ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
+    (inputs
+     `(("rust-adler" ,rust-adler-0.2)
+       ("rust-autocfg" ,rust-autocfg-1)
+       ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+       ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+       ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))
     (home-page  "https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide")
     (synopsis "Pure rust replacement for the miniz DEFLATE/zlib encoder/decoder")
     (description
@@ -28991,7 +29253,7 @@ (define-public rust-miniz-oxide-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "miniz_oxide" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "198n4hfpq0qcxf275l6fpzh7b9cl7ck2xs6pjgpds74bazv9yrxa"))))
@@ -29051,7 +29313,7 @@ (define-public rust-miniz-sys-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "miniz-sys" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "00l2r4anm8g35x0js2zfdnwfbrih9m43vphdpb77c5ga3kjkm7hy"))))
@@ -29317,7 +29579,7 @@ (define-public rust-miow-0.3
      (origin
        (method url-fetch)
        (uri (crate-uri "miow" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "15sqdhh29dqgw5xh59clwv6scbsbvdkbmdc16hbfvyq7b2sw2css"))))
     (build-system cargo-build-system)
@@ -29344,7 +29606,7 @@ (define-public rust-miow-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "miow" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "06g9b8sqlh5gxakwqq4rrib07afwanfnxgxajrldwcgk3hxjy7wc"))))
@@ -29511,7 +29773,7 @@ (define-public rust-modifier-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "modifier" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0n3fmgli1nsskl0whrfzm1gk0rmwwl6pw1q4nb9sqqmn5h8wkxa1"))))
@@ -30510,7 +30772,7 @@ (define-public rust-net2-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "net2" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "126g3fgfxp06zimc1l9iyxnn9cif1hjsg7sd81nlls5nnyghsma2"))))
@@ -31171,7 +31433,7 @@ (define-public rust-nodrop-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "nodrop" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1fz1v9r8ijacf0hlq0pdv5l9mz8vgqg1snmhvpjmi9aci1b4mvvj"))))
@@ -31194,7 +31456,7 @@ (define-public rust-nodrop-union-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "nodrop-union" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1h59pph19rxanyqcaid8pg73s7wmzdx3zhjv5snlim5qx606zxkc"))))
@@ -31241,8 +31503,16 @@ (define-public rust-nom-7
                (setenv "JEMALLOC_OVERRIDE"
                        (string-append jemalloc "/lib/libjemalloc_pic.a")))
              #t)))))
+    (inputs
+     `(("rust-memchr" ,rust-memchr-2)
+       ("rust-minimal-lexical" ,rust-minimal-lexical-0.1)
+       ("rust-version-check" ,rust-version-check-0.9)))
     (native-inputs
-     `(("jemalloc" ,jemalloc)))
+     `(("jemalloc" ,jemalloc)
+       ("rust-criterion" ,rust-criterion-0.3)
+       ("rust-doc-comment" ,rust-doc-comment-0.3)
+       ("rust-jemallocator" ,rust-jemallocator-0.3)
+       ("rust-proptest" ,rust-proptest-1)))
     (home-page "https://github.com/Geal/nom")
     (synopsis
      "Byte-oriented, zero-copy, parser combinators library")
@@ -32270,6 +32540,9 @@ (define-public rust-num-integer-0.1
      `(#:cargo-inputs
        (("rust-autocfg" ,rust-autocfg-1)
         ("rust-num-traits" ,rust-num-traits-0.2))))
+    (inputs
+     `(("rust-autocfg" ,rust-autocfg-1)
+       ("rust-num-traits" ,rust-num-traits-0.2)))
     (home-page "https://github.com/rust-num/num-integer")
     (synopsis "Integer traits and functions")
     (description "This package provides Integer traits and functions.")
@@ -32426,7 +32699,7 @@ (define-public rust-num-traits-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "num-traits" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0c9whknf2dm74a3cqirafy6gj83a76gl56g4v3g19k6lkwz13rcj"))))
@@ -32463,7 +32736,7 @@ (define-public rust-numtoa-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "numtoa" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1vs9rhggqbql1p26x8nkha1j06wawwgb2jp5fs88b5gi7prvvy5q"))))
@@ -32535,9 +32808,13 @@ (define-public rust-objc-0.2
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; Tests require gcc-objc.
-       #:cargo-inputs
-       (("rust-malloc-buf" ,rust-malloc-buf-0.0)
-        ("rust-objc-exception" ,rust-objc-exception-0.1))))
+       ;#:cargo-inputs
+       ;(("rust-malloc-buf" ,rust-malloc-buf-0.0)
+       ; ("rust-objc-exception" ,rust-objc-exception-0.1))a
+       ))
+    (inputs
+     `(("rust-malloc-buf" ,rust-malloc-buf-0.0)
+       ("rust-objc-exception" ,rust-objc-exception-0.1)))
     (home-page "https://github.com/SSheldon/rust-objc")
     (synopsis "Objective-C Runtime bindings and wrapper for Rust")
     (description "This package provides an Objective-C Runtime bindings and
@@ -32560,8 +32837,11 @@ (define-public rust-objc-exception-0.1
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-cc" ,rust-cc-1))))
+       ;#:cargo-inputs
+       ;(("rust-cc" ,rust-cc-1))
+       ))
+    (inputs
+     `(("rust-cc" ,rust-cc-1)))
     (home-page "https://github.com/SSheldon/rust-objc-exception")
     (synopsis "Rust interface for Objective-C's throw and try/catch statements")
     (description
@@ -32589,6 +32869,10 @@ (define-public rust-objc-foundation-0.1
        (("rust-block" ,rust-block-0.1)
         ("rust-objc" ,rust-objc-0.2)
         ("rust-objc-id" ,rust-objc-id-0.1))))
+    (inputs
+     `(("rust-block" ,rust-block-0.1)
+       ("rust-objc" ,rust-objc-0.2)
+       ("rust-objc-id" ,rust-objc-id-0.1)))
     (home-page "https://github.com/SSheldon/rust-objc-foundation")
     (synopsis "Rust wrapper for Objective-C's Foundation framework")
     (description "This package provides a rust wrapper for Objective-C's
@@ -32612,6 +32896,7 @@ (define-public rust-objc-id-0.1
     (arguments
      `(#:tests? #f  ; Tests require gcc-objc.
        #:cargo-inputs (("rust-objc" ,rust-objc-0.2))))
+    (inputs `(("rust-objc" ,rust-objc-0.2)))
     (home-page "https://github.com/SSheldon/rust-objc-id")
     (synopsis "Rust smart pointers for Objective-C reference counting")
     (description
@@ -32636,6 +32921,8 @@ (define-public rust-objc-test-utils-0.0
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-gcc" ,rust-gcc-0.3))))
+    (inputs
+     `(("rust-gcc" ,rust-gcc-0.3)))
     (home-page "https://github.com/SSheldon/rust-objc")
     (synopsis "Utilities for testing Objective-C interop")
     (description
@@ -32699,7 +32986,17 @@ (define-public rust-object-0.23
         ("rust-indexmap" ,rust-indexmap-1)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
         ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
-        ("rust-wasmparser" ,rust-wasmparser-0.57))))))
+        ("rust-wasmparser" ,rust-wasmparser-0.57))
+       ))
+    (inputs
+     `(("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+       ("rust-crc32fast" ,rust-crc32fast-1)
+       ("rust-flate2" ,rust-flate2-1)
+       ("rust-indexmap" ,rust-indexmap-1)
+       ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+       ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+       ("rust-wasmparser" ,rust-wasmparser-0.57)
+       ))))
 
 (define-public rust-object-0.22
   (package
@@ -33179,7 +33476,7 @@ (define-public rust-openssl-probe-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "openssl-probe" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1pijrdifgsdwd45b08c2g0dsmnhz7c3kmagb70839ngrd7d29bvp"))))
@@ -33216,7 +33513,12 @@ (define-public rust-openssl-sys-0.9
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
-     `(("openssl" ,openssl)))
+     `(("openssl" ,openssl)
+       ("rust-libc" ,rust-libc-0.2)
+       ;; Build dependencies:
+       ("rust-autocfg" ,rust-autocfg-1)
+       ("rust-cc" ,rust-cc-1)
+       ("rust-pkg-config" ,rust-pkg-config-0.3)))
     (home-page "https://github.com/sfackler/rust-openssl")
     (synopsis "FFI bindings to OpenSSL")
     (description
@@ -33571,6 +33873,8 @@ (define-public rust-owned-ttf-parser-0.6
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-ttf-parser" ,rust-ttf-parser-0.6))))
+    (inputs
+     `(("rust-ttf-parser" ,rust-ttf-parser-0.6)))
     (home-page "https://github.com/alexheretic/owned-ttf-parser")
     (synopsis "TTF-parser plus support for owned data")
     (description
@@ -33585,7 +33889,7 @@ (define-public rust-owning-ref-0.4
       (origin
         (method url-fetch)
         (uri (crate-uri "owning_ref" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1kjj9m28wjv452jw49p1mp3d8ql058x78v4bz00avr7rvsnmpxbg"))))
@@ -33863,7 +34167,7 @@ (define-public rust-parity-wasm-0.40
       (origin
         (method url-fetch)
         (uri (crate-uri "parity-wasm" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "03qycy21avz4970zc7aj8rj5h4wvi4qsrc90a6hpws1a56mglf8y"))))
@@ -33989,12 +34293,16 @@ (define-public rust-parking-lot-0.9
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-lock-api" ,rust-lock-api-0.3)
-        ("rust-parking-lot-core" ,rust-parking-lot-core-0.6))
+        ("rust-parking-lot-core" ,rust-parking-lot-core-0.6)
+        ("rust-rustc-version" ,rust-rustc-version-0.2))
        #:cargo-development-inputs
        (("rust-bincode" ,rust-bincode-1)
         ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-rand" ,rust-rand-0.4)
-        ("rust-rustc-version" ,rust-rustc-version-0.2))))))
+        ("rust-rand" ,rust-rand-0.7))))
+    (inputs
+     `(("rust-lock-api" ,rust-lock-api-0.3)
+       ("rust-parking-lot-core" ,rust-parking-lot-core-0.6)
+       ("rust-rustc-version" ,rust-rustc-version-0.2)))))
 
 (define-public rust-parking-lot-0.8
   (package
@@ -34131,7 +34439,18 @@ (define-public rust-parking-lot-core-0.6
         ("rust-thread-id" ,rust-thread-id-3)
         ("rust-winapi" ,rust-winapi-0.3))
        #:cargo-development-inputs
-       (("rust-rustc-version" ,rust-rustc-version-0.2))))))
+       (("rust-rustc-version" ,rust-rustc-version-0.2))))
+    (inputs
+     `(("rust-backtrace" ,rust-backtrace-0.3)
+       ("rust-cfg-if" ,rust-cfg-if-0.1)
+       ("rust-cloudabi" ,rust-cloudabi-0.0)
+       ("rust-libc" ,rust-libc-0.2)
+       ("rust-petgraph" ,rust-petgraph-0.4)
+       ("rust-rand" ,rust-rand-0.4)
+       ("rust-redox-syscall" ,rust-redox-syscall-0.1)
+       ("rust-smallvec" ,rust-smallvec-0.6)
+       ("rust-thread-id" ,rust-thread-id-3)
+       ("rust-winapi" ,rust-winapi-0.3)))))
 
 (define-public rust-parking-lot-core-0.5
   (package
@@ -34809,7 +35128,7 @@ (define-public rust-peeking-take-while-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "peeking_take_while" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "16bhqr6rdyrp12zv381cxaaqqd0pwysvm1q8h2ygihvypvfprc8r"))))
@@ -34925,7 +35244,7 @@ (define-public rust-percent-encoding-2
       (origin
         (method url-fetch)
         (uri (crate-uri "percent-encoding" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0bp3zrsk3kr47fbpipyczidbbx4g54lzxdm77ni1i3qws10mdzfl"))))
@@ -34945,7 +35264,7 @@ (define-public rust-percent-encoding-1
       (origin
         (method url-fetch)
         (uri (crate-uri "percent-encoding" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0cgq08v1fvr6bs5fvy390cz830lq4fak8havdasdacxcw790s09i"))))))
@@ -35031,7 +35350,7 @@ (define-public rust-permutohedron-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "permutohedron" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0b1pzh48j86v46wxngch6k1kx9cdw3jr3lwa86gd6jd4bmxzz1xn"))))
@@ -35480,7 +35799,7 @@ (define-public rust-pico-sys-0.0
       (origin
         (method url-fetch)
         (uri (crate-uri "pico-sys" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1q5pg0ms6szz6b5h26h4k40zb76zbwwjgyigac4wly9qngdj4yl5"))))
@@ -35668,7 +35987,7 @@ (define-public rust-pkg-config-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "pkg-config" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0k4860955riciibxr8bhnklp79jydp4xfylwdn5v9kj96hxlac9q"))))
@@ -35727,7 +36046,7 @@ (define-public rust-plain-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "plain" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "19n1xbxb4wa7w891268bzf6cbwq4qvdb86bik1z129qb0xnnnndl"))))
@@ -35833,7 +36152,7 @@ (define-public rust-plugin-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "plugin" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1q7nghkpvxxr168y2jnzh3w7qc9vfrby9n7ygy3xpj0bj71hsshs"))))
@@ -35905,7 +36224,7 @@ (define-public rust-pocket-resources-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "pocket-resources" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1n2i5vmi8fdbw89wm5nz1ws1z9f1qax911p6ksg4scmdg23z6df1"))))
@@ -36829,7 +37148,7 @@ (define-public rust-ppv-lite86-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "ppv-lite86" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1shj4q7jwj0azssr8cg51dk3kh7d4lg9rmbbz1kbqk971vc5wyi3"))))
@@ -37501,7 +37820,7 @@ (define-public rust-proc-macro2-1
       (origin
         (method url-fetch)
         (uri (crate-uri "proc-macro2" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0f3h0zl5w5090ajmmvpmhkpr4iwqnn5rip3afacabhc657vwmn7h"))))
@@ -37721,6 +38040,22 @@ (define-public rust-proptest-1
         ("rust-x86" ,rust-x86-0.33))
        #:cargo-development-inputs
        (("rust-regex" ,rust-regex-1))))
+    (inputs
+     `(("rust-bit-set" ,rust-bit-set-0.5)
+       ("rust-bitflags" ,rust-bitflags-1)
+       ("rust-byteorder" ,rust-byteorder-1)
+       ("rust-lazy-static" ,rust-lazy-static-1)
+       ("rust-num-traits" ,rust-num-traits-0.2)
+       ("rust-quick-error" ,rust-quick-error-2)
+       ("rust-rand" ,rust-rand-0.8)
+       ("rust-rand-chacha" ,rust-rand-chacha-0.3)
+       ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)
+       ("rust-regex-syntax" ,rust-regex-syntax-0.6)
+       ("rust-rusty-fork" ,rust-rusty-fork-0.3)
+       ("rust-tempfile" ,rust-tempfile-3)
+       ("rust-x86" ,rust-x86-0.33)))
+    (native-inputs
+     `(("rust-regex" ,rust-regex-1)))
     (home-page "https://altsysrq.github.io/proptest-book/proptest/index.html")
     (synopsis "Hypothesis-like property-based testing and shrinking")
     (description
@@ -38313,7 +38648,7 @@ (define-public rust-quick-error-2
       (origin
         (method url-fetch)
         (uri (crate-uri "quick-error" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "18z6r2rcjvvf8cn92xjhm2qc3jpd1ljvcbf12zv0k9p565gmb4x9"))))
@@ -38334,7 +38669,7 @@ (define-public rust-quick-error-1
       (origin
         (method url-fetch)
         (uri (crate-uri "quick-error" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1q6za3v78hsspisc197bg3g7rpc989qycy8ypr8ap8igv10ikl51"))))))
@@ -38481,9 +38816,14 @@ (define-public rust-quickcheck-0.9
     (arguments
      `(#:cargo-inputs
        (("rust-env-logger" ,rust-env-logger-0.7)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-rand" ,rust-rand-0.7)
-        ("rust-rand-core" ,rust-rand-core-0.5))))))
+       ("rust-log" ,rust-log-0.4)
+       ("rust-rand" ,rust-rand-0.7)
+       ("rust-rand-core" ,rust-rand-core-0.5))))
+    (inputs
+     `(("rust-env-logger" ,rust-env-logger-0.7)
+       ("rust-log" ,rust-log-0.4)
+       ("rust-rand" ,rust-rand-0.7)
+       ("rust-rand-core" ,rust-rand-core-0.5)))))
 
 (define-public rust-quickcheck-0.8
   (package
@@ -38676,17 +39016,19 @@ (define-public rust-quote-1
       (origin
         (method url-fetch)
         (uri (crate-uri "quote" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "19rjmfqzk26rxbgxy5j2ckqc2v12sw2xw8l4gi8bzpn2bmsbkl63"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1))
+     `(;#:cargo-inputs
+       ;(("rust-proc-macro2" ,rust-proc-macro2-1))
        #:cargo-development-inputs
        (("rust-rustversion" ,rust-rustversion-1)
         ("rust-trybuild" ,rust-trybuild-1))))
+    (inputs
+     `(("rust-proc-macro2" ,rust-proc-macro2-1)))
     (home-page "https://github.com/dtolnay/quote")
     (synopsis "Quasi-quoting macro quote!(...)")
     (description "Quasi-quoting macro quote!(...)")
@@ -38928,6 +39270,14 @@ (define-public rust-rand-0.8
         ("rust-rand-core" ,rust-rand-core-0.6)
         ("rust-rand-hc" ,rust-rand-hc-0.3)
         ("rust-serde" ,rust-serde-1))))
+    (inputs
+     `(("rust-libc" ,rust-libc-0.2)
+       ("rust-log" ,rust-log-0.4)
+       ("rust-packed-simd-2" ,rust-packed-simd-2-0.3)
+       ("rust-rand-chacha" ,rust-rand-chacha-0.3)
+       ("rust-rand-core" ,rust-rand-core-0.6)
+       ("rust-rand-hc" ,rust-rand-hc-0.3)
+       ("rust-serde" ,rust-serde-1)))
     (home-page "https://crates.io/crates/rand")
     (synopsis "Random number generators and other randomness functionality")
     (description
@@ -38944,7 +39294,7 @@ (define-public rust-rand-0.7
      (origin
        (method url-fetch)
        (uri (crate-uri "rand" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
          "00sdaimkbz491qgi6qxkv582yivl32m2jd401kzbn94vsiwicsva"))))
@@ -38971,7 +39321,7 @@ (define-public rust-rand-0.6
       (origin
         (method url-fetch)
         (uri (crate-uri "rand" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1jl4449jcl4wgmzld6ffwqj5gwxrp8zvx8w573g1z368qg6xlwbd"))))
@@ -39053,7 +39403,7 @@ (define-public rust-rand-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "rand" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0v679h38pjjqj5h4md7v2slsvj6686qgcn7p9fbw3h43iwnk1b34"))))
@@ -39075,10 +39425,13 @@ (define-public rust-rand-chacha-0.3
         (base32 "03df2xh5nbdvwr17qm3sviaxa95r8yhm1nil2pr0pqf90p7ka9z1"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(;#:skip-build? #t
        #:cargo-inputs
        (("rust-ppv-lite86" ,rust-ppv-lite86-0.2)
         ("rust-rand-core" ,rust-rand-core-0.6))))
+    (inputs
+     `(("rust-ppv-lite86" ,rust-ppv-lite86-0.2)
+       ("rust-rand-core" ,rust-rand-core-0.6)))
     (home-page "https://crates.io/crates/rand_chacha")
     (synopsis "ChaCha random number generator")
     (description
@@ -39113,7 +39466,7 @@ (define-public rust-rand-chacha-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "rand_chacha" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1vxwyzs4fy1ffjc8l00fsyygpiss135irjf7nyxgq2v0lqf3lvam"))))
@@ -39175,7 +39528,7 @@ (define-public rust-rand-core-0.4
       (origin
         (method url-fetch)
         (uri (crate-uri "rand_core" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1p09ynysrq1vcdlmcqnapq4qakl2yd1ng3kxh3qscpx09k2a6cww"))))
@@ -39193,7 +39546,7 @@ (define-public rust-rand-core-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "rand_core" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0jzdgszfa4bliigiy4hi66k7fs3gfwi2qxn8vik84ph77fwdwvvs"))))
@@ -39300,7 +39653,7 @@ (define-public rust-rand-hc-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "rand_hc" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0g31sqwpmsirdlwr0svnacr4dbqyz339im4ssl9738cjgfpjjcfa"))))
@@ -39317,7 +39670,7 @@ (define-public rust-rand-hc-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "rand_hc" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1i0vl8q5ddvvy0x8hf1zxny393miyzxkwqnw31ifg6p0gdy6fh3v"))))
@@ -39360,7 +39713,7 @@ (define-public rust-rand-isaac-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "rand_isaac" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "027flpjr4znx2csxk7gxb7vrf9c7y5mydmvg5az2afgisp4rgnfy"))))
@@ -39380,7 +39733,7 @@ (define-public rust-rand-jitter-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "rand_jitter" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "16z387y46bfz3csc42zxbjq89vcr1axqacncvv8qhyy93p4xarhi"))))
@@ -39431,7 +39784,7 @@ (define-public rust-rand-os-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "rand_os" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0wahppm0s64gkr2vmhcgwc0lij37in1lgfxg5rbgqlz0l5vgcxbv"))))
@@ -39455,7 +39808,7 @@ (define-public rust-rand-pcg-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "rand_pcg" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0ab4h6s6x3py833jk61lwadq83qd1c8bih2hgi6yps9rnv0x1aqn"))))
@@ -39483,7 +39836,7 @@ (define-public rust-rand-pcg-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "rand_pcg" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0i0bdla18a8x4jn1w0fxsbs3jg7ajllz6azmch1zw33r06dv1ydb"))))
@@ -39551,7 +39904,7 @@ (define-public rust-rand-xorshift-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "rand_xorshift" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0p2x8nr00hricpi2m6ca5vysiha7ybnghz79yqhhx6sl4gkfkxyb"))))
@@ -39771,7 +40124,7 @@ (define-public rust-rawpointer-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "rawpointer" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1qy1qvj17yh957vhffnq6agq0brvylw27xgks171qrah75wmg8v0"))))
@@ -39793,7 +40146,7 @@ (define-public rust-rawpointer-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "rawpointer" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "06ghpm9y7gacks78s3maakha07kbnwrxif5q37r2l7z1sali3b7b"))))))
@@ -39964,7 +40317,7 @@ (define-public rust-rdrand-0.4
       (origin
         (method url-fetch)
         (uri (crate-uri "rdrand" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1cjq0kwx1bk7jx3kzyciiish5gqsj7620dm43dc52sr8fzmm9037"))))
@@ -40078,7 +40431,7 @@ (define-public rust-redox-syscall-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "redox_syscall" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1kh59fpwy33w9nwd5iyc283yglq8pf2s41hnhvl48iax9mz0zk21"))))
@@ -40092,7 +40445,7 @@ (define-public rust-redox-termios-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "redox-termios" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0xhgvdh62mymgdl3jqrngl8hr4i8xwpnbsxnldq0l47993z1r2by"))))
@@ -40290,8 +40643,16 @@ (define-public rust-regex-1
         ("rust-regex-syntax" ,rust-regex-syntax-0.6))
        #:cargo-development-inputs
        (("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-quickcheck" ,rust-quickcheck-0.8)
-        ("rust-rand" ,rust-rand-0.6))))
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-rand" ,rust-rand-0.8))))
+     (inputs
+      `(("rust-aho-corasick" ,rust-aho-corasick-0.7)
+        ("rust-memchr" ,rust-memchr-2)
+        ("rust-regex-syntax" ,rust-regex-syntax-0.6)))
+     (native-inputs
+      `(("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-rand" ,rust-rand-0.8)))
     (home-page "https://github.com/rust-lang/regex")
     (synopsis "Regular expressions for Rust")
     (description
@@ -40837,7 +41198,7 @@ (define-public rust-resolv-conf-0.6
       (origin
         (method url-fetch)
         (uri (crate-uri "resolv-conf" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0jlzifww1h7j23jnjj49xz8q0fpd9rqpd0ks8c4y651vgw9lx0qi"))))
@@ -40913,6 +41274,15 @@ (define-public rust-ring-0.16
        #:cargo-development-inputs
        (("rust-libc" ,rust-libc-0.2)
         ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (inputs
+     `(("rust-libc" ,rust-libc-0.2)
+       ("rust-once-cell" ,rust-once-cell-1)
+       ("rust-spin" ,rust-spin-0.5)
+       ("rust-untrusted" ,rust-untrusted-0.7)
+       ("rust-web-sys" ,rust-web-sys-0.3)
+       ("rust-winapi" ,rust-winapi-0.3)
+       ;; build dependencies
+       ("rust-cc" ,rust-cc-1)))
     (home-page "https://github.com/briansmith/ring")
     (synopsis "Safe, fast, small crypto using Rust")
     (description "This package provided safe, fast, small crypto using Rust.")
@@ -42624,7 +42994,7 @@ (define-public rust-rustc-demangle-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "rustc-demangle" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "10qp42sl1wrdbgbbh8rnay2grm976z7hqgz32c4y09l1c071qsac"))))
@@ -42745,7 +43115,7 @@ (define-public rust-rustc-serialize-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "rustc-serialize" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1nkg3vasg7nk80ffkazizgiyv3hb1l9g3d8h17cajbkx538jiwfw"))))
@@ -42792,7 +43162,7 @@ (define-public rust-rustc-std-workspace-core-1
       (origin
         (method url-fetch)
         (uri (crate-uri "rustc-std-workspace-core" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1309xhwyai9xpz128xrfjqkmnkvgjwddznmj7brbd8i8f58zamhr"))))
@@ -42917,7 +43287,9 @@ (define-public rust-rustc-version-0.2
          "02h3x57lcr8l2pm0a645s9whdh33pn5cnrwvn5cb57vcrc53x3hk"))))
     (arguments
      `(#:skip-build? #t
-       #:cargo-inputs (("rust-semver" ,rust-semver-0.9))))))
+       #:cargo-inputs (("rust-semver" ,rust-semver-0.9))))
+    (inputs
+     `(("rust-semver" ,rust-semver-0.9)))))
 
 (define-public rust-rustdoc-stripper-0.1
   (package
@@ -43395,6 +43767,11 @@ (define-public rust-rusty-fork-0.3
         ("rust-quick-error" ,rust-quick-error-1)
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-wait-timeout" ,rust-wait-timeout-0.2))))
+    (inputs
+     `(("rust-fnv" ,rust-fnv-1)
+       ("rust-quick-error" ,rust-quick-error-1)
+       ("rust-tempfile" ,rust-tempfile-3)
+       ("rust-wait-timeout" ,rust-wait-timeout-0.2)))
     (home-page "https://github.com/altsysrq/rusty-fork")
     (synopsis "Library for running Rust tests in sub-processes")
     (description
@@ -43635,7 +44012,7 @@ (define-public rust-ryu-1
       (origin
         (method url-fetch)
         (uri (crate-uri "ryu" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0xlx9ybzncrb7d6r9533g8ydlg6mr252pfzl4g9cqaqkpvk24mjk"))))
@@ -43861,7 +44238,7 @@ (define-public rust-safemem-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "safemem" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0wp0d2b2284lw11xhybhaszsczpbq1jbdklkxgifldcknmy3nw7g"))))
@@ -43896,7 +44273,7 @@ (define-public rust-same-file-1
       (origin
         (method url-fetch)
         (uri (crate-uri "same-file" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "00h5j1w87dmhnvbv9l8bic3y7xxsnjmssvifw2ayvgx9mb1ivz4k"))))
@@ -44008,7 +44385,7 @@ (define-public rust-schannel-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "schannel" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "08d0p5iy574vdrax4l3laazic0crj7rp7vp3if5rrfkcdfq51xc7"))))
@@ -44054,7 +44431,7 @@ (define-public rust-scoped-threadpool-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "scoped_threadpool" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1a26d3lk40s9mrf4imhbik7caahmw2jryhhb6vqv6fplbbgzal8x"))))
@@ -44083,7 +44460,7 @@ (define-public rust-scoped-tls-1
       (origin
         (method url-fetch)
         (uri (crate-uri "scoped-tls" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1hj8lifzvivdb1z02lfnzkshpvk85nkgzxsy2hc0zky9wf894spa"))))
@@ -44106,7 +44483,7 @@ (define-public rust-scoped-tls-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "scoped-tls" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk"))))))
@@ -44119,7 +44496,7 @@ (define-public rust-scopeguard-1
       (origin
         (method url-fetch)
         (uri (crate-uri "scopeguard" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1kbqm85v43rq92vx7hfiay6pmcga03vrjbbfwqpyj3pwsg3b16nj"))))
@@ -44144,7 +44521,7 @@ (define-public rust-scopeguard-0.3
         (method url-fetch)
         (uri (crate-uri "scopeguard" version))
         (file-name
-          (string-append name "-" version ".crate"))
+          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl"))))))
@@ -44691,7 +45068,7 @@ (define-public rust-security-framework-sys-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "security-framework-sys" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "15gqhhi206lzynd0pcbswxhvqc4p9bmpl2h9qnwfnpb16zy96573"))))
@@ -44888,6 +45265,9 @@ (define-public rust-semver-0.9
         ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-tempdir" ,rust-tempdir-0.3))))
+    (inputs
+     `(("rust-semver-parser" ,rust-semver-parser-0.7)
+       ("rust-serde" ,rust-serde-1)))
     (home-page "https://docs.rs/crate/semver")
     (synopsis
      "Semantic version parsing and comparison")
@@ -44913,6 +45293,8 @@ (define-public rust-semver-parser-0.10
        (("rust-pest" ,rust-pest-2))
        #:cargo-development-inputs
        (("rust-pest-generator" ,rust-pest-generator-2))))
+    (inputs
+     `(("rust-pest" ,rust-pest-2)))
     (home-page "https://github.com/steveklabnik/semver-parser")
     (synopsis "Parsing of the Semver spec")
     (description "This package provides for parsing of the Semver spec.")
@@ -44927,7 +45309,7 @@ (define-public rust-semver-parser-0.9
       (origin
         (method url-fetch)
         (uri (crate-uri "semver-parser" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1ahqhvgpzhcsd28id7xnrjv4419i9yyalhm7d7zi430qx0hi2vml"))))))
@@ -44941,7 +45323,7 @@ (define-public rust-semver-parser-0.7
       (origin
         (method url-fetch)
         (uri (crate-uri "semver-parser" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq"))))))
@@ -45104,6 +45486,8 @@ (define-public rust-serde-1
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-serde-derive" ,rust-serde-derive-1))))
+    (inputs
+     `(("rust-serde-derive" ,rust-serde-derive-1)))
     (home-page "https://serde.rs")
     (synopsis "Generic serialization/deserialization framework")
     (description
@@ -45471,7 +45855,7 @@ (define-public rust-serde-derive-1
       (origin
         (method url-fetch)
         (uri (crate-uri "serde-derive" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0ccg4m7ww6mfs5vjdbdifri2kf1wyd4difjnqnraph2gssaw54ck"))))
@@ -45483,6 +45867,10 @@ (define-public rust-serde-derive-1
         ("rust-syn" ,rust-syn-1))
        #:cargo-development-inputs
        (("rust-serde" ,rust-serde-1))))
+    (inputs
+     `(("rust-proc-macro2" ,rust-proc-macro2-1)
+       ("rust-quote" ,rust-quote-1)
+       ("rust-syn" ,rust-syn-1)))
     (home-page "https://serde.rs")
     (synopsis
       "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]")
@@ -45569,6 +45957,11 @@ (define-public rust-serde-json-1
         ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-stacker" ,rust-serde-stacker-0.1)
         ("rust-trybuild" ,rust-trybuild-1))))
+    (inputs
+     `(("rust-indexmap" ,rust-indexmap-1)
+       ("rust-itoa" ,rust-itoa-0.4)
+       ("rust-ryu" ,rust-ryu-1)
+       ("rust-serde" ,rust-serde-1)))
     (home-page "https://github.com/serde-rs/json")
     (synopsis "JSON serialization file format")
     (description
@@ -46860,7 +47253,7 @@ (define-public rust-shlex-1
      (origin
        (method url-fetch)
        (uri (crate-uri "shlex" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0gf773p2snqpw69rzh8s1wdlq8dc8c1ypmiv516il1fdyb46i9a2"))))
     (build-system cargo-build-system)
@@ -46879,7 +47272,7 @@ (define-public rust-shlex-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "shlex" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1lmv6san7g8dv6jdfp14m7bdczq9ss7j7bgsfqyqjc3jnjfippvz"))))
@@ -47398,7 +47791,7 @@ (define-public rust-slab-0.4
       (origin
         (method url-fetch)
         (uri (crate-uri "slab" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1y59xsa27jk84sxzswjk60xcjf8b4fm5960jwpznrrcmasyva4f1"))))
@@ -47815,7 +48208,10 @@ (define-public rust-smallvec-0.6
        (("rust-maybe-uninit" ,rust-maybe-uninit-2)
         ("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
-       (("rust-bincode" ,rust-bincode-1))))))
+       (("rust-bincode" ,rust-bincode-1))))
+    (inputs
+     `(("rust-maybe-uninit" ,rust-maybe-uninit-2)
+       ("rust-serde" ,rust-serde-1)))))
 
 (define-public rust-smallvec-0.2
   (package
@@ -48044,7 +48440,7 @@ (define-public rust-socket2-0.3
      (origin
        (method url-fetch)
        (uri (crate-uri "socket2" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0vldz14mxqxnjqb6an2pj7mgclv7nrk45cpscwq7g3fj2c0mfbhj"))))
     (arguments
@@ -48091,7 +48487,7 @@ (define-public rust-sourcefile-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "sourcefile" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1lwa6973zs4bgj29my7agfjgk4nw9hp6j7dfnr13nid85fw7rxsb"))))
@@ -48166,12 +48562,17 @@ (define-public rust-speculate-0.1
          "0ph01n3fqkmnfr1wd13dqsi4znv06xy6p4h3hqqdzk81r0r5vd1w"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-0.4)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-0.15)
+        ("rust-quote" ,rust-quote-0.6)
+        ("rust-syn" ,rust-syn-0.14)
         ("rust-unicode-xid" ,rust-unicode-xid-0.1))))
+    (inputs
+     `(("rust-proc-macro2" ,rust-proc-macro2-0.4)
+       ("rust-quote" ,rust-quote-0.6)
+       ("rust-syn" ,rust-syn-0.14)
+       ("rust-unicode-xid" ,rust-unicode-xid-0.1)))
     (home-page "https://github.com/utkarshkukreti/speculate.rs")
     (synopsis "RSpec inspired testing framework for Rust")
     (description
@@ -48186,7 +48587,7 @@ (define-public rust-spin-0.5
       (origin
         (method url-fetch)
         (uri (crate-uri "spin" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0b84m6dbzrwf2kxylnw82d3dr8w06av7rfkr8s85fb5f43rwyqvf"))))
@@ -48358,7 +48759,7 @@ (define-public rust-stacker-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "stacker" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "12igajfgqz96c7vcwi91xdfsphawik6g36ndlglqih0a7bqw8vyr"))))
@@ -48481,7 +48882,7 @@ (define-public rust-static-assertions-1
       (origin
         (method url-fetch)
         (uri (crate-uri "static-assertions" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0gsl6xmw10gvn3zs1rv99laj5ig7ylffnh71f9l34js4nr4r7sx2"))))
@@ -48502,7 +48903,7 @@ (define-public rust-static-assertions-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "static-assertions" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1lw33i89888yb3x29c6dv4mrkg3534n0rlg3r7qzh4p58xmv6gkz"))))))
@@ -48713,7 +49114,7 @@ (define-public rust-stdweb-internal-runtime-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "stdweb-internal-runtime" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1h0nkppb4r8dbrbms2hw9n5xdcs392m0r5hj3b6lsx3h6fx02dr1"))))
@@ -48733,7 +49134,7 @@ (define-public rust-stdweb-internal-test-macro-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "stdweb-internal-test-macro" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0wx3jlm98qrg1pdw149fprzs9x3x3igqkm5ll23jv2v62yddfrjf"))))
@@ -48875,7 +49276,7 @@ (define-public rust-streaming-stats-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "streaming-stats" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0iz5dlq51w5hxjrv6a4hpf8rrj91kgvy0s9mhj0j12il9v771mmh"))))
@@ -49221,7 +49622,7 @@ (define-public rust-strsim-0.9
      (origin
        (method url-fetch)
        (uri (crate-uri "strsim" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
          "0k497pv882qn3q977ckznm13vxx927g8s1swvcv68j3c1pccwik4"))))))
@@ -49235,7 +49636,7 @@ (define-public rust-strsim-0.8
       (origin
         (method url-fetch)
         (uri (crate-uri "strsim" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0sjsm7hrvjdifz661pjxq5w4hf190hx53fra8dfvamacvff139cf"))))))
@@ -50001,10 +50402,15 @@ (define-public rust-syn-1
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-unicode-xid" ,rust-unicode-xid-0.2))))
+       ;#:cargo-inputs
+       ;(("rust-proc-macro2" ,rust-proc-macro2-1)
+       ; ("rust-quote" ,rust-quote-1)
+       ; ("rust-unicode-xid" ,rust-unicode-xid-0.2))
+       ))
+    (inputs
+     `(("rust-proc-macro2" ,rust-proc-macro2-1)
+       ("rust-quote" ,rust-quote-1)
+       ("rust-unicode-xid" ,rust-unicode-xid-0.2)))
     (home-page "https://github.com/dtolnay/syn")
     (synopsis "Parser for Rust source code")
     (description
@@ -50056,7 +50462,8 @@ (define-public rust-syn-0.14
         (base32
          "0hgpgi8lcvkfd5jnma5fxq41ycb9kna635b4c2wl4z1rmbnfj6i6"))))
     (arguments
-     `(#:cargo-inputs
+     `(#:tests? #f
+       #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-0.4)
         ("rust-quote" ,rust-quote-0.6)
         ("rust-unicode-xid" ,rust-unicode-xid-0.1))
@@ -50103,7 +50510,8 @@ (define-public rust-syn-0.11
         (base32
          "1b8x8jdsmj6r9ck7n1pg371526n1q90kx6rv6ivcb22w06wr3f6k"))))
     (arguments
-     `(#:phases
+     `(#:tests? #f
+       #:phases
        (modify-phases %standard-phases
          (add-before 'build 'fixup-cargo-toml
            (lambda _
@@ -50118,7 +50526,11 @@ (define-public rust-syn-0.11
        (("rust-syntex-pos" ,rust-syntex-pos-0.58)
         ("rust-syntex-syntax" ,rust-syntex-syntax-0.58)
         ("rust-tempdir" ,rust-tempdir-0.3)
-        ("rust-walkdir" ,rust-walkdir-1))))))
+        ("rust-walkdir" ,rust-walkdir-1))))
+    (inputs
+     `(("rust-quote" ,rust-quote-0.3)
+       ("rust-synom" ,rust-synom-0.11)
+       ("rust-unicode-xid" ,rust-unicode-xid-0.0)))))
 
 (define-public rust-syn-mid-0.5
   (package
@@ -50243,7 +50655,7 @@ (define-public rust-synstructure-test-traits-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "synstructure_test_traits" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1b3fs2b9kc1gy9dilaxqjbdl4z0mlrbbxjzkprdx953rif1c3q66"))))
@@ -50827,7 +51239,7 @@ (define-public rust-tar-0.4
       (origin
         (method url-fetch)
         (uri (crate-uri "tar" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1lr6v3cpkfxd2lk5ll2jd8wr1xdskwj35smnh5sfb8xvzzxnn6dk"))))
@@ -51531,7 +51943,7 @@ (define-public rust-tempdir-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "tempdir" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1n5n86zxpgd85y0mswrp5cfdisizq2rv3la906g6ipyc03xvbwhm"))))
@@ -51556,12 +51968,12 @@ (define-public rust-tempfile-3
      (origin
        (method url-fetch)
        (uri (crate-uri "tempfile" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "08pbf3c1i42382dc44dil5bgiawcsi0qk6zdibw10f69rxiwdhfs"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(;#:skip-build? #t
        #:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-libc" ,rust-libc-0.2)
@@ -51569,6 +51981,13 @@ (define-public rust-tempfile-3
         ("rust-redox-syscall" ,rust-redox-syscall-0.2)
         ("rust-remove-dir-all" ,rust-remove-dir-all-0.5)
         ("rust-winapi" ,rust-winapi-0.3))))
+    (inputs
+     `(("rust-cfg-if" ,rust-cfg-if-1)
+       ("rust-libc" ,rust-libc-0.2)
+       ("rust-rand" ,rust-rand-0.8)
+       ("rust-redox-syscall" ,rust-redox-syscall-0.2)
+       ("rust-remove-dir-all" ,rust-remove-dir-all-0.5)
+       ("rust-winapi" ,rust-winapi-0.3)))
     (home-page "https://stebalien.com/projects/tempfile-rs")
     (synopsis "Library for managing temporary files and directories")
     (description
@@ -51737,7 +52156,7 @@ (define-public rust-term-0.4
       (origin
         (method url-fetch)
         (uri (crate-uri "term" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1wbh8ngqkqr3f6wz902yplf60bd5yapnckvrkgmzp5nffi7n8qzs"))))
@@ -51755,7 +52174,7 @@ (define-public rust-term-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "term" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32 "109jmzddq1kz6wm2ndgddy7yrlqcw2i36ygxl0fcymc0sda7w1zj"))))
     (arguments
@@ -51860,7 +52279,7 @@ (define-public rust-termcolor-1
      (origin
        (method url-fetch)
        (uri (crate-uri "termcolor" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1x65i1ny4m6z1by62ra6wdcrd557p2ysm866x0pg60zby2cxizid"))))
     (build-system cargo-build-system)
@@ -51969,7 +52388,7 @@ (define-public rust-termion-1
       (origin
         (method url-fetch)
         (uri (crate-uri "termion" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "01f9787d5nx445bqbj644v38bn0hl2swwjy9baz0dnbqi6fyqb62"))))
@@ -51995,7 +52414,7 @@ (define-public rust-termios-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "termios" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "09any1p4jp4bphvb5ikagnvwjc3xn2djchy96nkpa782xb2j1dkj"))))
@@ -52298,7 +52717,7 @@ (define-public rust-thread-id-3
       (origin
         (method url-fetch)
         (uri (crate-uri "thread-id" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1h90v19fjz3x9b25ywh68z5yf2zsmm6h5zb4rl302ckbsp4z9yy7"))))
@@ -52343,7 +52762,7 @@ (define-public rust-thread-local-1
      (origin
        (method url-fetch)
        (uri (crate-uri "thread_local" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1gccp3grndpi6dyhzylz4hkqnkzc1xyri98n0xwwhnn90i7d4640"))))
     (build-system cargo-build-system)
@@ -52367,7 +52786,7 @@ (define-public rust-thread-local-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "thread_local" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6"))))
@@ -52426,7 +52845,7 @@ (define-public rust-threadpool-1
       (origin
         (method url-fetch)
         (uri (crate-uri "threadpool" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0rd89n1q7vy47w4c32cnynibffv9kj3jy3dwr0536n9lbw5ckw72"))))
@@ -52652,7 +53071,7 @@ (define-public rust-time-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "time" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0f14wrgxj7ya2v4msg5mni7046bsm2angm7cn3pd3yv04gpm12na"))))
@@ -53506,7 +53925,7 @@ (define-public rust-tokio-mock-task-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "tokio-mock-task" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1y7q83qfk9ljjfvs82b453pmz9x1v3d6kr4x55j8mal01s6790dw"))))
@@ -54734,7 +55153,7 @@ (define-public rust-toml-0.5
       (origin
         (method url-fetch)
         (uri (crate-uri "toml" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1apcmjrrjw429pjw7mqlmdwwd67g8305vwqy4kw3swr612bl44d3"))))
@@ -54977,7 +55396,7 @@ (define-public rust-tracing-core-0.1
      (origin
        (method url-fetch)
        (uri (crate-uri "tracing-core" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0pvbgv301vw6dq4krc14yqbyyixb42lcs4s57xw05llkgy9f63gm"))))
     (build-system cargo-build-system)
@@ -55298,7 +55717,7 @@ (define-public rust-traitobject-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "traitobject" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0yb0n8822mr59j200fyr2fxgzzgqljyxflx9y8bdy3rlaqngilgg"))))
@@ -56145,7 +56564,7 @@ (define-public rust-try-from-0.3
      (origin
        (method url-fetch)
        (uri (crate-uri "try_from" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
          "12wdd4ja7047sd3rx70hv2056hyc8gcdllcx3a41g1rnw64kng98"))))
@@ -56167,7 +56586,7 @@ (define-public rust-try-lock-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "try-lock" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "10p36rx6pqi9d0zr876xa8vksx2m66ha45myakl50rn08dxyn176"))))
@@ -56426,7 +56845,7 @@ (define-public rust-typeable-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "typeable" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "11w8dywgnm32hb291izjvh4zjd037ccnkk77ahk63l913zwzc40l"))))
@@ -56511,7 +56930,7 @@ (define-public rust-typemap-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "typemap" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1xm1gbvz9qisj1l6d36hrl9pw8imr8ngs6qyanjnsad3h0yfcfv5"))))
@@ -56533,7 +56952,7 @@ (define-public rust-typenum-1
       (origin
         (method url-fetch)
         (uri (crate-uri "typenum" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0cvbksljz61ian21fnn0h51kphl0pwpzb932bv4s0rwy1wh8lg1p"))))
@@ -56581,7 +57000,7 @@ (define-public rust-ucd-trie-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "ucd-trie" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1hh6kyzh5xygwy96wfmsf8v8czlzhps2lgbcyhj1xzy1w1xys04g"))))
@@ -56604,7 +57023,7 @@ (define-public rust-ucd-util-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "ucd-util" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "13ng291mkc9b132jjf4laj76f5nqm5qd2447rm8bry3wxbdc5kaw"))))
@@ -57087,7 +57506,7 @@ (define-public rust-unicode-xid-0.2
         (method url-fetch)
         (uri (crate-uri "unicode-xid" version))
         (file-name
-          (string-append name "-" version ".crate"))
+          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0r6mknipyy9vpz8mwmxvkx65ff2ha1n2pxqjj6f46lcn8yrhpzpp"))))
@@ -57107,7 +57526,7 @@ (define-public rust-unicode-xid-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "unicode-xid" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1z57lqh4s18rr4x0j4fw4fmp9hf9346h0kmdgqsqx0fhjr3k0wpw"))))))
@@ -57218,7 +57637,7 @@ (define-public rust-unreachable-1
       (origin
         (method url-fetch)
         (uri (crate-uri "unreachable" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0mps2il4xy2mjqc3appas27hhn2xmvixc3bzzhfrjj74gy3i0a1q"))))
@@ -57241,7 +57660,7 @@ (define-public rust-unsafe-any-0.4
       (origin
         (method url-fetch)
         (uri (crate-uri "unsafe-any" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0zwwphsqkw5qaiqmjwngnfpv9ym85qcsyj7adip9qplzjzbn00zk"))))
@@ -57283,7 +57702,7 @@ (define-public rust-untrusted-0.7
       (origin
         (method url-fetch)
         (uri (crate-uri "untrusted" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0jkbqaj9d3v5a91pp3wp9mffvng1nhycx6sh4qkdd9qyr62ccmm1"))))
@@ -57404,6 +57823,16 @@ (define-public rust-url-2
        (("rust-bencher" ,rust-bencher-0.1)
         ("rust-rustc-test" ,rust-rustc-test-0.3)
         ("rust-serde-json" ,rust-serde-json-1))))
+    (inputs
+     `(("rust-form-urlencoded" ,rust-form-urlencoded-1)
+       ("rust-idna" ,rust-idna-0.2)
+       ("rust-matches" ,rust-matches-0.1)
+       ("rust-percent-encoding" ,rust-percent-encoding-2)
+       ("rust-serde" ,rust-serde-1)))
+    (native-inputs
+     `(("rust-bencher" ,rust-bencher-0.1)
+       ("rust-rustc-test" ,rust-rustc-test-0.3)
+       ("rust-serde-json" ,rust-serde-json-1)))
     (home-page "https://github.com/servo/rust-url")
     (synopsis "URL library for Rust, based on the WHATWG URL Standard")
     (description
@@ -57838,7 +58267,7 @@ (define-public rust-vcpkg-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "vcpkg" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1yvrd2b97j4hv5bfhcj3al0dpkbzkdsr6dclxqz3zqm50rhwl2xh"))))
@@ -57882,7 +58311,7 @@ (define-public rust-vec-map-0.8
       (origin
         (method url-fetch)
         (uri (crate-uri "vec_map" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1481w9g1dw9rxp3l6snkdqihzyrd2f8vispzqmwjwsdyhw8xzggi"))))
@@ -57955,7 +58384,7 @@ (define-public rust-version-check-0.9
       (origin
         (method url-fetch)
         (uri (crate-uri "version_check" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32 "1vbaqdf802qinsq8q20w8w0qn2pv0rkq5p73ijcblrwxcvjp5adm"))))
     (build-system cargo-build-system)
@@ -57979,7 +58408,7 @@ (define-public rust-version-check-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "version_check" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1pf91pvj8n6akh7w6j5ypka6aqz08b3qpzgs0ak2kjf4frkiljwi"))))))
@@ -58100,7 +58529,7 @@ (define-public rust-void-1
       (origin
         (method url-fetch)
         (uri (crate-uri "void" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0zc8f0ksxvmhvgx4fdg0zyn6vdnbxd2xv9hfx4nhzg6kbs4f80ka"))))
@@ -58303,6 +58732,10 @@ (define-public rust-walkdir-2
        (("rust-same-file" ,rust-same-file-1)
         ("rust-winapi" ,rust-winapi-0.3)
         ("rust-winapi-util" ,rust-winapi-util-0.1))))
+    (inputs
+     `(("rust-same-file" ,rust-same-file-1)
+       ("rust-winapi" ,rust-winapi-0.3)
+       ("rust-winapi-util" ,rust-winapi-util-0.1)))
     (home-page "https://github.com/BurntSushi/walkdir")
     (synopsis "Recursively walk a directory")
     (description "Recursively walk a directory.")
@@ -58464,6 +58897,10 @@ (define-public rust-wasi-0.9
        (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
         ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
+    (inputs
+     `(("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+       ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+       ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))
     (home-page "https://github.com/bytecodealliance/wasi")
     (synopsis "Experimental WASI API bindings for Rust")
     (description
@@ -58480,7 +58917,7 @@ (define-public rust-wasi-0.5
        (method url-fetch)
        (uri (crate-uri "wasi" version))
        (file-name
-        (string-append name "-" version ".crate"))
+        (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
          "1ir3pd4phdfml0cbziw9bqp7mnk0vfp9biy8bh25lln6raml4m7x"))))
@@ -58506,7 +58943,8 @@ (define-public rust-wasm-bindgen-0.2
          "0vkkpz290k6pphmrgkayzdvk1dinxrp6c5zvr9l0zjlm2dsn9lrw"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #:cargo-inputs
       (("rust-cfg-if" ,rust-cfg-if-1)
        ("rust-serde" ,rust-serde-1)
        ("rust-serde-json" ,rust-serde-json-1)
@@ -58520,6 +58958,11 @@ (define-public rust-wasm-bindgen-0.2
         ,rust-wasm-bindgen-test-crate-a-0.1)
        ("rust-wasm-bindgen-test-crate-b"
         ,rust-wasm-bindgen-test-crate-b-0.1))))
+    (inputs
+     `(("rust-cfg-if" ,rust-cfg-if-1)
+       ("rust-serde" ,rust-serde-1)
+       ("rust-serde-json" ,rust-serde-json-1)
+       ("rust-wasm-bindgen-macro" ,rust-wasm-bindgen-macro-0.2)))
     (home-page "https://rustwasm.github.io/")
     (synopsis "Easy support for interacting between JS and Rust")
     (description
@@ -58704,7 +59147,7 @@ (define-public rust-wasm-bindgen-shared-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "wasm-bindgen-shared" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0n3ir6gq27np22l6m96y342a6fphk1pkbzbfqx6g364kgzfi2y3y"))))
@@ -58731,7 +59174,8 @@ (define-public rust-wasm-bindgen-test-0.3
          "09aas82c1i249bmzjwj9szk727nm4jzaidnwnq4jlycv3w6glm83"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #:cargo-inputs
        (("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1)
         ("rust-js-sys" ,rust-js-sys-0.3)
         ("rust-scoped-tls" ,rust-scoped-tls-1)
@@ -58850,7 +59294,7 @@ (define-public rust-wasm-bindgen-test-macro-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "wasm-bindgen-test-macro" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "19bvmw8mqlwh6wkbzgs3cnlkywrv8q2kkqggz6y0p158930xm287"))))
@@ -58958,12 +59402,16 @@ (define-public rust-web-sys-0.3
          "1jy4q5jawzg3dxzhfwa0g3fsz7h4j0ra6y232ikc6mlcimj52vrd"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t     ; TODO: Fix
+       #:cargo-inputs
        (("rust-js-sys" ,rust-js-sys-0.3)
         ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
        #:cargo-development-inputs
        (("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
         ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (inputs
+     `(("rust-js-sys" ,rust-js-sys-0.3)
+       ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))
     (home-page "https://rustwasm.github.io/wasm-bindgen/web-sys/index.html")
     (synopsis
      "Bindings for all Web APIs, a procedurally generated crate from WebIDL")
@@ -59430,7 +59878,7 @@ (define-public rust-widestring-0.4
       (origin
         (method url-fetch)
         (uri (crate-uri "widestring" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "13565qy4jhpg4x0xw8mwxzzsh0p8c93p5208lh6kpwp0q01y6qx7"))))
@@ -59477,7 +59925,7 @@ (define-public rust-winapi-0.3
       (origin
         (method url-fetch)
         (uri (crate-uri "winapi" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "06gl025x418lchw1wxj64ycr7gha83m44cjr5sarhynd9xkrm0sw"))))
@@ -59506,7 +59954,7 @@ (define-public rust-winapi-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "winapi" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0yh816lh6lf56dpsgxy189c2ai1z3j8mw9si6izqb6wsjkbcjz8n"))))
@@ -59520,7 +59968,7 @@ (define-public rust-winapi-build-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "winapi-build" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "1g4rqsgjky0a7530qajn2bbfcrl2v0zb39idgdws9b1l7gp5wc9d"))))
@@ -59564,7 +60012,7 @@ (define-public rust-winapi-util-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "winapi-util" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0y71bp7f6d536czj40dhqk0d55wfbbwqfp2ymqf1an5ibgl6rv3h"))))
@@ -59612,7 +60060,7 @@ (define-public rust-wincolor-1
       (origin
         (method url-fetch)
         (uri (crate-uri "wincolor" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "017x33ljndwc76cp5z9llgndn0nh7v8jcjaykbizkawmwy9n3pyp"))))
@@ -59810,7 +60258,7 @@ (define-public rust-winutil-0.1
       (origin
         (method url-fetch)
         (uri (crate-uri "winutil" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0vkyl3fbbf05n5ph5yz8sfaccrk9x3qsr25560w6w68ldf5i7bvx"))))
@@ -59881,7 +60329,7 @@ (define-public rust-ws2-32-sys-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "ws2_32-sys" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0ppscg5qfqaw0gzwv2a4nhn5bn01ff9iwn6ysqnzm4n8s3myz76m"))))
@@ -59984,7 +60432,7 @@ (define-public rust-xattr-0.2
       (origin
         (method url-fetch)
         (uri (crate-uri "xattr" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
           "0k556fb6f5jc907975j9c8iynl2fqz3rf0w6fiig83i4yi0kfk14"))))
@@ -60067,7 +60515,7 @@ (define-public rust-xdg-2
      (origin
        (method url-fetch)
        (uri (crate-uri "xdg" version))
-       (file-name (string-append name "-" version ".crate"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0mws8a0fr3cqk5nh7aq9lmkmhzghvasqy4mhw6nnza06l4d6i2fh"))))
     (build-system cargo-build-system)
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 7f2153f784..dff317f595 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -232,42 +232,45 @@ (define-public newsboat
        ("openssl" ,openssl)
        ("pkg-config" ,pkg-config)
        ;; For building documentation.
-       ("asciidoctor" ,ruby-asciidoctor)))
+       ("asciidoctor" ,ruby-asciidoctor)
+       ;; And the rust deps
+       ("rust-cxx-build" ,rust-cxx-build-1)
+       ("rust-tempfile" ,rust-tempfile-3)
+       ("rust-proptest" ,rust-proptest-1)
+       ("rust-section-testing" ,rust-section-testing-0.0)
+       ;; And the packages which can't be found for some reason...
+       ;("rust-num-integer" ,rust-num-integer-0.1)
+       ))
     (inputs
      `(("curl" ,curl)
        ("json-c" ,json-c)
        ("libxml2" ,libxml2)
        ("ncurses" ,ncurses)
        ("stfl" ,stfl)
-       ("sqlite" ,sqlite)))
+       ("sqlite" ,sqlite)
+       ;; And the rust deps
+       ("rust-backtrace" ,rust-backtrace-0.3)
+       ("rust-bitflags" ,rust-bitflags-1.3)
+       ("rust-chrono" ,rust-chrono-0.4)
+       ("rust-clap" ,rust-clap-2)
+       ("rust-curl-sys" ,rust-curl-sys-0.4)
+       ("rust-cxx" ,rust-cxx-1)
+       ("rust-fastrand" ,rust-fastrand-1)
+       ("rust-gettext-rs" ,rust-gettext-rs-0.7)
+       ("rust-libc" ,rust-libc-0.2)
+       ("rust-natord" ,rust-natord-1)
+       ("rust-nom" ,rust-nom-7)
+       ("rust-once-cell" ,rust-once-cell-1)
+       ("rust-percent-encoding" ,rust-percent-encoding-2)
+       ("rust-url" ,rust-url-2)
+       ("rust-unicode-width" ,rust-unicode-width-0.1)
+       ("rust-xdg" ,rust-xdg-2)) )
     (arguments
      `(#:modules ((guix build cargo-build-system)
                   (guix build utils)
                   ((guix build gnu-build-system) #:prefix gnu:))
        #:vendor-dir "vendor"
        #:install-source? #f
-       #:cargo-inputs
-       (("rust-backtrace" ,rust-backtrace-0.3)
-        ("rust-bitflags" ,rust-bitflags-1.3)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-curl-sys" ,rust-curl-sys-0.4)
-        ("rust-cxx" ,rust-cxx-1)
-        ("rust-fastrand" ,rust-fastrand-1)
-        ("rust-gettext-rs" ,rust-gettext-rs-0.7)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-natord" ,rust-natord-1)
-        ("rust-nom" ,rust-nom-7)
-        ("rust-once-cell" ,rust-once-cell-1)
-        ("rust-percent-encoding" ,rust-percent-encoding-2)
-        ("rust-url" ,rust-url-2)
-        ("rust-unicode-width" ,rust-unicode-width-0.1)
-        ("rust-xdg" ,rust-xdg-2))
-       #:cargo-development-inputs
-       (("rust-cxx-build" ,rust-cxx-build-1)
-        ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-proptest" ,rust-proptest-1)
-        ("rust-section-testing" ,rust-section-testing-0.0))
        #:phases
        (modify-phases %standard-phases
          (add-after 'configure 'dont-vendor-self
-- 
cgit v1.2.3