[bug#70606] [PATCH rust-team 001/101] gnu: Place rust-xxhash-rust-0.8 in alphabetical order.

[bug#70606] [PATCH rust-team 001/101] gnu: Place rust-xxhash-rust-0.8 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-xxhash-rust-0.8): Move variable.

Change-Id: Ia44ff25785b56cf42b1a8241f5d4199e0df82566
---
 gnu/packages/crates-io.scm | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fd87a0f8c7..b7dcdf22fe 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -89759,28 +89759,6 @@ (define-public rust-xmltree-0.8
        (("rust-indexmap" ,rust-indexmap-1)
         ("rust-xml-rs" ,rust-xml-rs-0.7))))))
 
-(define-public rust-xxhash-rust-0.8
-  (package
-    (name "rust-xxhash-rust")
-    (version "0.8.10")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "xxhash-rust" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32 "00zfsfigb6zh0x8aaickkkyd3vyjgnrq36ym04lil7my4lgahzcj"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f      ; Only doc tests, which fail.
-       #:cargo-development-inputs (("rust-getrandom" ,rust-getrandom-0.2)
-                                   ("rust-xxhash-c-sys" ,rust-xxhash-c-sys-0.8))))
-    (home-page "https://github.com/DoumanAsh/xxhash-rust")
-    (synopsis "Implementation of xxHash in Rust")
-    (description "This package provides an implementation of the xxHash
-algorithm in Rust.")
-    (license license:boost1.0)))
-
 (define-public rust-xxhash-c-sys-0.8
   (package
     (name "rust-xxhash-c-sys")
@@ -89801,6 +89779,28 @@ (define-public rust-xxhash-c-sys-0.8
     (description "This package provides bindings to xxhash.")
     (license license:boost1.0)))
 
+(define-public rust-xxhash-rust-0.8
+  (package
+    (name "rust-xxhash-rust")
+    (version "0.8.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "xxhash-rust" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "00zfsfigb6zh0x8aaickkkyd3vyjgnrq36ym04lil7my4lgahzcj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-development-inputs (("rust-getrandom" ,rust-getrandom-0.2)
+                                   ("rust-xxhash-c-sys" ,rust-xxhash-c-sys-0.8))))
+    (home-page "https://github.com/DoumanAsh/xxhash-rust")
+    (synopsis "Implementation of xxHash in Rust")
+    (description "This package provides an implementation of the xxHash
+algorithm in Rust.")
+    (license license:boost1.0)))
+
 (define-public rust-xz-0.1
   (package
     (name "rust-xz")

base-commit: 2c90e7aa2f078da27d517b2b77b61810f4513809
-- 
2.41.0

[bug#70606] [PATCH rust-team 002/101] gnu: Place rust-wl-clipboard-rs-0.8 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-wl-clipboard-rs-0.8): Move variable.

Change-Id: I80230c23f4d066a357be24ba4506db2f6b608146
---
 gnu/packages/crates-io.scm | 195 ++++++++++++++++++-------------------
 1 file changed, 96 insertions(+), 99 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b7dcdf22fe..7e71d8af59 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -88360,105 +88360,6 @@ (define-public rust-wax-0.6
 against paths and directory trees.")
     (license license:expat)))
 
-(define-public rust-wl-clipboard-rs-0.8
-  (package
-    (name "rust-wl-clipboard-rs")
-    (version "0.8.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "wl-clipboard-rs" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1nwa0bg6jpq5sd8x94xgkj0yk7zcz2m3sg2mm26b35qlj5rigd0j"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f  ; Failed to create a server socket.
-       #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.6)
-                       ("rust-libc" ,rust-libc-0.2)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-nix" ,rust-nix-0.28)
-                       ("rust-os-pipe" ,rust-os-pipe-1)
-                       ("rust-tempfile" ,rust-tempfile-3)
-                       ("rust-thiserror" ,rust-thiserror-1)
-                       ("rust-tree-magic-mini" ,rust-tree-magic-mini-3)
-                       ("rust-wayland-backend" ,rust-wayland-backend-0.3)
-                       ("rust-wayland-client" ,rust-wayland-client-0.31)
-                       ("rust-wayland-protocols" ,rust-wayland-protocols-0.31)
-                       ("rust-wayland-protocols-wlr" ,rust-wayland-protocols-wlr-0.2))
-       #:cargo-development-inputs
-       (("rust-proptest" ,rust-proptest-1)
-        ("rust-proptest-derive" ,rust-proptest-derive-0.4)
-        ("rust-wayland-protocols" ,rust-wayland-protocols-0.31)
-        ("rust-wayland-protocols-wlr" ,rust-wayland-protocols-wlr-0.2)
-        ("rust-wayland-server" ,rust-wayland-server-0.31))))
-    (home-page "https://github.com/YaLTeR/wl-clipboard-rs")
-    (synopsis "Access to the Wayland clipboard")
-    (description "This package provides access to the Wayland clipboard
-for terminal and other window-less applications.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-wl-clipboard-rs-0.7
-  (package
-    (inherit rust-wl-clipboard-rs-0.8)
-    (name "rust-wl-clipboard-rs")
-    (version "0.7.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "wl-clipboard-rs" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1n8sg981h3d08hnnlrsgs81w2qz3n8a5ml0jcsgnapdpzcyk06lq"))))
-    (arguments
-     `(#:tests? #f  ; Failed to create a server socket.
-       #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5)
-                       ("rust-libc" ,rust-libc-0.2)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-nix" ,rust-nix-0.24)
-                       ("rust-os-pipe" ,rust-os-pipe-1)
-                       ("rust-tempfile" ,rust-tempfile-3)
-                       ("rust-thiserror" ,rust-thiserror-1)
-                       ("rust-tree-magic-mini" ,rust-tree-magic-mini-3)
-                       ("rust-wayland-client" ,rust-wayland-client-0.29)
-                       ("rust-wayland-protocols" ,rust-wayland-protocols-0.29))
-       #:cargo-development-inputs
-       (("rust-wayland-protocols" ,rust-wayland-protocols-0.29)
-        ("rust-wayland-server" ,rust-wayland-server-0.29))))))
-
-(define-public rust-wl-clipboard-rs-0.4
-  (package
-    (inherit rust-wl-clipboard-rs-0.7)
-    (name "rust-wl-clipboard-rs")
-    (version "0.4.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "wl-clipboard-rs" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (patches (search-patches "rust-wl-clipboard-rs-newer-wl.patch"))
-        (sha256
-          (base32 "1252cm67pkrr6ik5ys2cdyfr2zzw6ds7v351i1cmyi94yiv01l13"))))
-    (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-derive-new" ,rust-derive-new-0.5)
-         ("rust-derive-more" ,rust-derive-more-0.99)
-         ("rust-exitfailure" ,rust-exitfailure-0.5)
-         ("rust-failure" ,rust-failure-0.1)
-         ("rust-libc" ,rust-libc-0.2)
-         ("rust-log" ,rust-log-0.4)
-         ("rust-mime-guess" ,rust-mime-guess-2)
-         ("rust-nix" ,rust-nix-0.18)
-         ("rust-os-pipe" ,rust-os-pipe-0.9)
-         ("rust-stderrlog" ,rust-stderrlog-0.4)
-         ("rust-structopt" ,rust-structopt-0.3)
-         ("rust-tempfile" ,rust-tempfile-3)
-         ("rust-tree-magic" ,rust-tree-magic-0.2)
-         ("rust-wayland-client" ,rust-wayland-client-0.28)
-         ("rust-wayland-commons" ,rust-wayland-commons-0.28)
-         ("rust-wayland-protocols" ,rust-wayland-protocols-0.28))))))
-
 (define-public rust-web-sys-0.3
   (package
     (name "rust-web-sys")
@@ -89243,6 +89144,102 @@ (define-public rust-winnow-0.4
                        ("rust-memchr" ,rust-memchr-2)
                        ("rust-terminal-size" ,rust-terminal-size-0.2))))))
 
+(define-public rust-wl-clipboard-rs-0.8
+  (package
+    (name "rust-wl-clipboard-rs")
+    (version "0.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wl-clipboard-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1nwa0bg6jpq5sd8x94xgkj0yk7zcz2m3sg2mm26b35qlj5rigd0j"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.6)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-nix" ,rust-nix-0.28)
+                       ("rust-os-pipe" ,rust-os-pipe-1)
+                       ("rust-tempfile" ,rust-tempfile-3)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tree-magic-mini" ,rust-tree-magic-mini-3)
+                       ("rust-wayland-backend" ,rust-wayland-backend-0.3)
+                       ("rust-wayland-client" ,rust-wayland-client-0.31)
+                       ("rust-wayland-protocols" ,rust-wayland-protocols-0.31)
+                       ("rust-wayland-protocols-wlr" ,rust-wayland-protocols-wlr-0.2))
+       #:cargo-development-inputs (("rust-proptest" ,rust-proptest-1)
+                                   ("rust-proptest-derive" ,rust-proptest-derive-0.4)
+                                   ("rust-wayland-protocols" ,rust-wayland-protocols-0.31)
+                                   ("rust-wayland-protocols-wlr" ,rust-wayland-protocols-wlr-0.2)
+                                   ("rust-wayland-server" ,rust-wayland-server-0.31))))
+    (home-page "https://github.com/YaLTeR/wl-clipboard-rs")
+    (synopsis "Access to the Wayland clipboard")
+    (description "This package provides access to the Wayland clipboard
+for terminal and other window-less applications.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-wl-clipboard-rs-0.7
+  (package
+    (inherit rust-wl-clipboard-rs-0.8)
+    (name "rust-wl-clipboard-rs")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wl-clipboard-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1n8sg981h3d08hnnlrsgs81w2qz3n8a5ml0jcsgnapdpzcyk06lq"))))
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-nix" ,rust-nix-0.24)
+                       ("rust-os-pipe" ,rust-os-pipe-1)
+                       ("rust-tempfile" ,rust-tempfile-3)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tree-magic-mini" ,rust-tree-magic-mini-3)
+                       ("rust-wayland-client" ,rust-wayland-client-0.29)
+                       ("rust-wayland-protocols" ,rust-wayland-protocols-0.29))
+       #:cargo-development-inputs (("rust-wayland-protocols" ,rust-wayland-protocols-0.29)
+                                   ("rust-wayland-server" ,rust-wayland-server-0.29))))))
+
+(define-public rust-wl-clipboard-rs-0.4
+  (package
+    (inherit rust-wl-clipboard-rs-0.7)
+    (name "rust-wl-clipboard-rs")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wl-clipboard-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (patches (search-patches "rust-wl-clipboard-rs-newer-wl.patch"))
+       (sha256
+        (base32 "1252cm67pkrr6ik5ys2cdyfr2zzw6ds7v351i1cmyi94yiv01l13"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5)
+                       ("rust-derive-more" ,rust-derive-more-0.99)
+                       ("rust-exitfailure" ,rust-exitfailure-0.5)
+                       ("rust-failure" ,rust-failure-0.1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-mime-guess" ,rust-mime-guess-2)
+                       ("rust-nix" ,rust-nix-0.18)
+                       ("rust-os-pipe" ,rust-os-pipe-0.9)
+                       ("rust-stderrlog" ,rust-stderrlog-0.4)
+                       ("rust-structopt" ,rust-structopt-0.3)
+                       ("rust-tempfile" ,rust-tempfile-3)
+                       ("rust-tree-magic" ,rust-tree-magic-0.2)
+                       ("rust-wayland-client" ,rust-wayland-client-0.28)
+                       ("rust-wayland-commons" ,rust-wayland-commons-0.28)
+                       ("rust-wayland-protocols" ,rust-wayland-protocols-0.28))))))
+
 (define-public rust-wycheproof-0.5
   (package
     (name "rust-wycheproof")
-- 
2.41.0

[bug#70606] [PATCH rust-team 003/101] gnu: Place rust-valuable-derive-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-valuable-derive-0.1): Move variable.

Change-Id: Ie439bf1fd092e4b12d0ef388b143bbf2bc8dfc2f
---
 gnu/packages/crates-io.scm | 47 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7e71d8af59..fe14f69f6f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -86602,30 +86602,6 @@ (define-public rust-v-htmlescape-0.15
     (description "This package provides simd optimized HTML escaping code.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-valuable-derive-0.1
-  (package
-    (name "rust-valuable-derive")
-    (version "0.1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "valuable-derive" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0cjvqljzsj891cjzlwv0ihrv4m0n5211a6pr6b7cz42ich66ji4x"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/tokio-rs/valuable")
-    (synopsis "Macros for the valuable crate")
-    (description "This package provides macros for the @code{valuable}
-crate.")
-    (license license:expat)))
-
 (define-public rust-valuable-0.1
   (package
     (name "rust-valuable")
@@ -86649,6 +86625,29 @@ (define-public rust-valuable-0.1
 un-typed structured data across trait-object boundaries.")
     (license license:expat)))
 
+(define-public rust-valuable-derive-0.1
+  (package
+    (name "rust-valuable-derive")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "valuable-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cjvqljzsj891cjzlwv0ihrv4m0n5211a6pr6b7cz42ich66ji4x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/tokio-rs/valuable")
+    (synopsis "Macros for the valuable crate")
+    (description "This package provides macros for the @code{valuable}
+crate.")
+    (license license:expat)))
+
 (define-public rust-valuable-serde-0.1
   (package
     (name "rust-valuable-serde")
-- 
2.41.0

[bug#70606] [PATCH rust-team 004/101] gnu: Place rust-unidecode-0.3 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-unidecode-0.3): Move variable.

Change-Id: I05d554c60d1c008f330a2b35c75b4119b3ce3eca
---
 gnu/packages/crates-io.scm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fe14f69f6f..68e5b7f41b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -84946,24 +84946,6 @@ (define-public rust-ungrammar-1
      "This package provides a DSL for describing concrete syntax trees.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-unidecode-0.3
-  (package
-    (name "rust-unidecode")
-    (version "0.3.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "unidecode" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1p0sm8j9223kw3iincv60s746s88k09xcaqf8nkx3w83isfv2as0"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/chowdhurya/rust-unidecode/")
-    (synopsis "Provides pure ASCII transliterations of Unicode strings")
-    (description
-     "This package provides pure ASCII transliterations of Unicode strings.")
-    (license license:bsd-3)))
-
 (define-public rust-unic-char-property-0.9
   (package
     (name "rust-unic-char-property")
@@ -85569,6 +85551,24 @@ (define-public rust-unicode-xid-0.0
         (base32
          "1p5l9h3n3i53cp95fb65p8q3vbwib79ryd9z5z5h5kr9gl6qc7wc"))))))
 
+(define-public rust-unidecode-0.3
+  (package
+    (name "rust-unidecode")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "unidecode" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1p0sm8j9223kw3iincv60s746s88k09xcaqf8nkx3w83isfv2as0"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/chowdhurya/rust-unidecode/")
+    (synopsis "Provides pure ASCII transliterations of Unicode strings")
+    (description
+     "This package provides pure ASCII transliterations of Unicode strings.")
+    (license license:bsd-3)))
+
 (define-public rust-unindent-0.2
   (package
     (name "rust-unindent")
-- 
2.41.0

[bug#70606] [PATCH rust-team 005/101] gnu: Place rust-tree-magic-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-tree-magic-0.2): Move variable.

Change-Id: I9ce8a7021194eef399bd5a89cda3d5629aeac6dd
---
 gnu/packages/crates-io.scm | 64 +++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 68e5b7f41b..03810b2dde 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -83397,6 +83397,38 @@ (define-public rust-trash-2
         ("rust-rand" ,rust-rand-0.8)
         ("rust-serial-test" ,rust-serial-test-0.6))))))
 
+(define-public rust-tree-magic-0.2
+  (package
+    (name "rust-tree-magic")
+    (version "0.2.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "tree_magic" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "0adndj775gjcvkf7yxdfj3pl39fcdiibswwgff23lm9yrrkr7ndi"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build?
+        #t
+        #:cargo-inputs
+        (("rust-clap" ,rust-clap-2)
+         ("rust-fnv" ,rust-fnv-1)
+         ("rust-lazy-static" ,rust-lazy-static-1)
+         ("rust-nom" ,rust-nom-3)
+         ("rust-num-cpus" ,rust-num-cpus-1)
+         ("rust-parking-lot" ,rust-parking-lot-0.10)
+         ("rust-petgraph" ,rust-petgraph-0.5)
+         ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
+         ("rust-tabwriter" ,rust-tabwriter-1)
+         ("rust-walkdir" ,rust-walkdir-2))))
+    (home-page "https://github.com/aahancoc/tree_magic/")
+    (synopsis "Determines the MIME type")
+    (description "This package determines the MIME type of a file by
+traversing a filetype tree.")
+    (license license:expat)))
+
 (define-public rust-tree-magic-db-3
   (package
     (name "rust-tree-magic-db")
@@ -83445,38 +83477,6 @@ (define-public rust-tree-magic-mini-3
      "Determines the MIME type of a file by traversing a filetype tree.")
     (license license:expat)))
 
-(define-public rust-tree-magic-0.2
-  (package
-    (name "rust-tree-magic")
-    (version "0.2.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "tree_magic" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "0adndj775gjcvkf7yxdfj3pl39fcdiibswwgff23lm9yrrkr7ndi"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:skip-build?
-        #t
-        #:cargo-inputs
-        (("rust-clap" ,rust-clap-2)
-         ("rust-fnv" ,rust-fnv-1)
-         ("rust-lazy-static" ,rust-lazy-static-1)
-         ("rust-nom" ,rust-nom-3)
-         ("rust-num-cpus" ,rust-num-cpus-1)
-         ("rust-parking-lot" ,rust-parking-lot-0.10)
-         ("rust-petgraph" ,rust-petgraph-0.5)
-         ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
-         ("rust-tabwriter" ,rust-tabwriter-1)
-         ("rust-walkdir" ,rust-walkdir-2))))
-    (home-page "https://github.com/aahancoc/tree_magic/")
-    (synopsis "Determines the MIME type")
-    (description "This package determines the MIME type of a file by
-traversing a filetype tree.")
-    (license license:expat)))
-
 (define-public rust-treeline-0.1
   (package
     (name "rust-treeline")
-- 
2.41.0

[bug#70606] [PATCH rust-team 006/101] gnu: Place rust-tokio-tcp-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-tokio-tcp-0.1): Move variable.

Change-Id: Ief9de6c666d7635455d0dceb4e40188e7e5c0b21
---
 gnu/packages/crates-io.scm | 62 +++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 03810b2dde..6d4cfd84d6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -81607,6 +81607,37 @@ (define-public rust-tokio-sync-0.1
         ("rust-tokio" ,rust-tokio-0.1)
         ("rust-tokio-mock-task" ,rust-tokio-mock-task-0.1))))))
 
+(define-public rust-tokio-tcp-0.1
+  (package
+    (name "rust-tokio-tcp")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio-tcp" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "06a15vg8bcd33ng3h9ldzlq7wl4jsw0p9qpy7v22ls5yah3b250x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bytes" ,rust-bytes-0.4)
+        ("rust-futures" ,rust-futures-0.1)
+        ("rust-iovec" ,rust-iovec-0.1)
+        ("rust-mio" ,rust-mio-0.6)
+        ("rust-tokio-io" ,rust-tokio-io-0.1)
+        ("rust-tokio-reactor" ,rust-tokio-reactor-0.1))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.6)
+        ("rust-tokio" ,rust-tokio-0.1))))
+    (home-page "https://tokio.rs")
+    (synopsis "TCP bindings for tokio")
+    (description "TCP bindings for tokio.")
+    (license license:expat)))
+
 (define-public rust-tokio-test-0.4
   (package
     (name "rust-tokio-test")
@@ -81678,37 +81709,6 @@ (define-public rust-tokio-test-0.2
        (("rust-futures-util" ,rust-futures-util-0.3)
         ("rust-tokio" ,rust-tokio-0.2))))))
 
-(define-public rust-tokio-tcp-0.1
-  (package
-    (name "rust-tokio-tcp")
-    (version "0.1.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "tokio-tcp" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "06a15vg8bcd33ng3h9ldzlq7wl4jsw0p9qpy7v22ls5yah3b250x"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bytes" ,rust-bytes-0.4)
-        ("rust-futures" ,rust-futures-0.1)
-        ("rust-iovec" ,rust-iovec-0.1)
-        ("rust-mio" ,rust-mio-0.6)
-        ("rust-tokio-io" ,rust-tokio-io-0.1)
-        ("rust-tokio-reactor" ,rust-tokio-reactor-0.1))
-       #:cargo-development-inputs
-       (("rust-env-logger" ,rust-env-logger-0.6)
-        ("rust-tokio" ,rust-tokio-0.1))))
-    (home-page "https://tokio.rs")
-    (synopsis "TCP bindings for tokio")
-    (description "TCP bindings for tokio.")
-    (license license:expat)))
-
 (define-public rust-tokio-threadpool-0.1
   (package
     (name "rust-tokio-threadpool")
-- 
2.41.0

[bug#70606] [PATCH rust-team 007/101] gnu: Place rust-timeago-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-timeago-0.4): Move variable.

Change-Id: I36dff0c1a818d3508c3a095d3f04115df41a5aa9
---
 gnu/packages/crates-io.scm | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6d4cfd84d6..19d700eb74 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79750,28 +79750,6 @@ (define-public rust-time-0.1
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-timeago-0.4
-  (package
-    (name "rust-timeago")
-    (version "0.4.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "timeago" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1rnh92sh1l4jbjvz4g7xvcvmfh7nk5k7mm2w56pnm9z0kmc0wwd1"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4)
-                       ("rust-isolang" ,rust-isolang-2))))
-    (home-page "https://github.com/vi/timeago")
-    (synopsis "Time formatting library in Rust")
-    (description
-     "This package provides a time formatting library in Rust that converts
-durations into strings.  For example, \"1 hour ago\" or \"01hou\".")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-time-core-0.1
   (package
     (name "rust-time-core")
@@ -79854,6 +79832,28 @@ (define-public rust-time-macros-impl-0.1
 crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-timeago-0.4
+  (package
+    (name "rust-timeago")
+    (version "0.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "timeago" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1rnh92sh1l4jbjvz4g7xvcvmfh7nk5k7mm2w56pnm9z0kmc0wwd1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-isolang" ,rust-isolang-2))))
+    (home-page "https://github.com/vi/timeago")
+    (synopsis "Time formatting library in Rust")
+    (description
+     "This package provides a time formatting library in Rust that converts
+durations into strings.  For example, \"1 hour ago\" or \"01hou\".")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-timebomb-0.1
   (package
     (name "rust-timebomb")
-- 
2.41.0

[bug#70606] [PATCH rust-team 008/101] gnu: Place rust-tikv-jemalloc-ctl-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-tikv-jemalloc-ctl-0.4): Move variable.

Change-Id: I1d929d143216f638dc55603cbd14d294fa790adf
---
 gnu/packages/crates-io.scm | 66 +++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 19d700eb74..7d96240905 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79541,6 +79541,39 @@ (define-public rust-thrift-0.13
         ("rust-ordered-float" ,rust-ordered-float-1)
         ("rust-threadpool" ,rust-threadpool-1))))))
 
+(define-public rust-tikv-jemalloc-ctl-0.4
+  (package
+    (name "rust-tikv-jemalloc-ctl")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tikv-jemalloc-ctl" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1pqs08dgnnrgbib8syldxmm8cjgyz80scs9i8jgn6mw86gj8137j"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-paste" ,rust-paste-0.1)
+        ("rust-tikv-jemalloc-sys"
+         ,rust-tikv-jemalloc-sys-0.4))
+       #:cargo-development-inputs
+       (("rust-tikv-jemallocator"
+         ,rust-tikv-jemallocator-0.4))))
+    (home-page
+     "https://github.com/tikv/jemallocator")
+    (synopsis
+     "Safe wrapper over jemalloc's control and introspection APIs")
+    (description
+     "This package provides a safe wrapper over jemalloc's control and
+introspection APIs.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-tikv-jemalloc-sys-0.4
   (package
     (name "rust-tikv-jemalloc-sys")
@@ -79598,39 +79631,6 @@ (define-public rust-tikv-jemallocator-0.4
      "This package provides a Rust allocator backed by jemalloc.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-tikv-jemalloc-ctl-0.4
-  (package
-    (name "rust-tikv-jemalloc-ctl")
-    (version "0.4.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "tikv-jemalloc-ctl" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1pqs08dgnnrgbib8syldxmm8cjgyz80scs9i8jgn6mw86gj8137j"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-paste" ,rust-paste-0.1)
-        ("rust-tikv-jemalloc-sys"
-         ,rust-tikv-jemalloc-sys-0.4))
-       #:cargo-development-inputs
-       (("rust-tikv-jemallocator"
-         ,rust-tikv-jemallocator-0.4))))
-    (home-page
-     "https://github.com/tikv/jemallocator")
-    (synopsis
-     "Safe wrapper over jemalloc's control and introspection APIs")
-    (description
-     "This package provides a safe wrapper over jemalloc's control and
-introspection APIs.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-time-0.3
   (package
     (name "rust-time")
-- 
2.41.0

[bug#70606] [PATCH rust-team 009/101] gnu: Place rust-tectonic-engine-xdvipdfmx-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-tectonic-engine-xdvipdfmx-0.4): Move
variable.

Change-Id: I02315d50d6571cc1fde78f9eb9b00f30f0acc161
---
 gnu/packages/crates-io.scm | 60 +++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7d96240905..5b8cd25da8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77405,74 +77405,74 @@ (define-public rust-tectonic-engine-spx2html-0.1
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-tera" ,rust-tera-1))))))
 
-(define-public rust-tectonic-engine-xetex-0.4
+(define-public rust-tectonic-engine-xdvipdfmx-0.4
   (package
-    (name "rust-tectonic-engine-xetex")
-    (version "0.4.4")
+    (name "rust-tectonic-engine-xdvipdfmx")
+    (version "0.4.1")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "tectonic_engine_xetex" version))
+       (uri (crate-uri "tectonic_engine_xdvipdfmx" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "11if3zyzp8149gf1j4fhwk8kbbs2agxkk5la1lhmq4icrj6szwrf"))))
+        (base32 "1h8lslv1h6g8971787sa818g6yhpqr00g13sw6ij14m6k9bi1dq7"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-cc" ,rust-cc-1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-tectonic-bridge-core" ,rust-tectonic-bridge-core-0.3)
-        ("rust-tectonic-bridge-flate" ,rust-tectonic-bridge-flate-0.1)
-        ("rust-tectonic-bridge-graphite2" ,rust-tectonic-bridge-graphite2-0.2)
-        ("rust-tectonic-bridge-harfbuzz" ,rust-tectonic-bridge-harfbuzz-0.2)
-        ("rust-tectonic-cfg-support" ,rust-tectonic-cfg-support-0.1)
         ("rust-tectonic-errors" ,rust-tectonic-errors-0.2)
-        ("rust-tectonic-pdf-io" ,rust-tectonic-pdf-io-0.4)
-        ("rust-tectonic-xetex-layout" ,rust-tectonic-xetex-layout-0.2))))
+        ("rust-tectonic-pdf-io" ,rust-tectonic-pdf-io-0.4))))
     (native-inputs
      (list pkg-config))
     (inputs
-     (list fontconfig
-           freetype
-           graphite2
-           harfbuzz
-           icu4c
-           zlib))
+     (list libpng zlib))
     (home-page "https://tectonic-typesetting.github.io/")
-    (synopsis "XeTeX engine as a reusable crate")
+    (synopsis "@code{xdvipdfmx} program as a reusable crate")
     (description
-     "This crate is part of the Tectonic project.  It provides the XeTeX
-engine as a reusable crate.")
+     "This crate is part of the Tectonic project.  It provides XeTeX’s
+@code{xdvipdfmx} program as a reusable crate.")
     (license license:expat)))
 
-(define-public rust-tectonic-engine-xdvipdfmx-0.4
+(define-public rust-tectonic-engine-xetex-0.4
   (package
-    (name "rust-tectonic-engine-xdvipdfmx")
-    (version "0.4.1")
+    (name "rust-tectonic-engine-xetex")
+    (version "0.4.4")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "tectonic_engine_xdvipdfmx" version))
+       (uri (crate-uri "tectonic_engine_xetex" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1h8lslv1h6g8971787sa818g6yhpqr00g13sw6ij14m6k9bi1dq7"))))
+        (base32 "11if3zyzp8149gf1j4fhwk8kbbs2agxkk5la1lhmq4icrj6szwrf"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-cc" ,rust-cc-1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-tectonic-bridge-core" ,rust-tectonic-bridge-core-0.3)
+        ("rust-tectonic-bridge-flate" ,rust-tectonic-bridge-flate-0.1)
+        ("rust-tectonic-bridge-graphite2" ,rust-tectonic-bridge-graphite2-0.2)
+        ("rust-tectonic-bridge-harfbuzz" ,rust-tectonic-bridge-harfbuzz-0.2)
+        ("rust-tectonic-cfg-support" ,rust-tectonic-cfg-support-0.1)
         ("rust-tectonic-errors" ,rust-tectonic-errors-0.2)
-        ("rust-tectonic-pdf-io" ,rust-tectonic-pdf-io-0.4))))
+        ("rust-tectonic-pdf-io" ,rust-tectonic-pdf-io-0.4)
+        ("rust-tectonic-xetex-layout" ,rust-tectonic-xetex-layout-0.2))))
     (native-inputs
      (list pkg-config))
     (inputs
-     (list libpng zlib))
+     (list fontconfig
+           freetype
+           graphite2
+           harfbuzz
+           icu4c
+           zlib))
     (home-page "https://tectonic-typesetting.github.io/")
-    (synopsis "@code{xdvipdfmx} program as a reusable crate")
+    (synopsis "XeTeX engine as a reusable crate")
     (description
-     "This crate is part of the Tectonic project.  It provides XeTeX’s
-@code{xdvipdfmx} program as a reusable crate.")
+     "This crate is part of the Tectonic project.  It provides the XeTeX
+engine as a reusable crate.")
     (license license:expat)))
 
 (define-public rust-tectonic-errors-0.2
-- 
2.41.0

[bug#70606] [PATCH rust-team 010/101] gnu: Place rust-synchronoise-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-synchronoise-1): Move variable.

Change-Id: I667a4af01355324ead56d3d7049ed749d4caec8b
---
 gnu/packages/crates-io.scm | 43 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5b8cd25da8..93064455b3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -75990,28 +75990,6 @@ (define-public rust-syn-test-suite-0.0.0
     (description "Test suite of the syn crate.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-synchronoise-1
-  (package
-    (name "rust-synchronoise")
-    (version "1.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "synchronoise" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1wnylkdf84520ks7a70fnwds2wibxmnkgqzz3j6ww9n61wwh3g1x"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-crossbeam-queue" ,rust-crossbeam-queue-0.3))))
-    (home-page "https://github.com/QuietMisdreavus/synchronoise")
-    (synopsis "Synchronization primitives")
-    (description
-     "This package provides synchronization primitives that build upon the
-standard library.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-sync-wrapper-0.1
   (package
     (name "rust-sync-wrapper")
@@ -76037,6 +76015,27 @@ (define-public rust-sync-wrapper-0.1
 the absence of concurrency.")
     (license license:asl2.0)))
 
+(define-public rust-synchronoise-1
+  (package
+    (name "rust-synchronoise")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "synchronoise" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1wnylkdf84520ks7a70fnwds2wibxmnkgqzz3j6ww9n61wwh3g1x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-crossbeam-queue" ,rust-crossbeam-queue-0.3))))
+    (home-page "https://github.com/QuietMisdreavus/synchronoise")
+    (synopsis "Synchronization primitives")
+    (description
+     "This package provides synchronization primitives that build upon the
+standard library.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-synom-0.11
   (package
     (name "rust-synom")
-- 
2.41.0

[bug#70606] [PATCH rust-team 011/101] gnu: Place rust-symphonia-metadata-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-symphonia-metadata-0.4,
rust-symphonia-core-0.4): Move variable.

Change-Id: I43dfc16d95f261024e6a943530e4405ac4436acb
---
 gnu/packages/crates-io.scm | 101 +++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 93064455b3..762903070a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -75497,56 +75497,6 @@ (define-public rust-symphonia-bundle-flac-0.4
 and decoder.")
     (license license:mpl2.0)))
 
-(define-public rust-symphonia-core-0.4
-  (package
-    (name "rust-symphonia-core")
-    (version "0.4.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "symphonia-core" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1j84q4a9p9qa23976spxap9s6ns3fm6fzrfz65n6cjhgpsbmw4zs"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.7)
-                       ("rust-bitflags" ,rust-bitflags-1)
-                       ("rust-bytemuck" ,rust-bytemuck-1)
-                       ("rust-lazy-static" ,rust-lazy-static-1)
-                       ("rust-log" ,rust-log-0.4))))
-    (home-page "https://github.com/pdeljanov/Symphonia")
-    (synopsis "Shared elements for Symphonia a Rust audio library")
-    (description
-     "Symphonia is a pure Rust audio decoding and media demuxing
-library supporting a wide range of audio formats.  This package contains
-shared structs, traits, and features.")
-    (license license:mpl2.0)))
-
-(define-public rust-symphonia-metadata-0.4
-  (package
-    (name "rust-symphonia-metadata")
-    (version "0.4.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "symphonia-metadata" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "06lvwy24kirc84r6d23ncad544525fsb6gna0plqz3d1mffmjq2j"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-encoding-rs" ,rust-encoding-rs-0.8)
-                       ("rust-lazy-static" ,rust-lazy-static-1)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-symphonia-core" ,rust-symphonia-core-0.4))))
-    (home-page "https://github.com/pdeljanov/Symphonia")
-    (synopsis "Multimedia tag and metadata readers for the Symphonia library")
-    (description "Symphonia is a pure Rust audio decoding and media demuxing
-library supporting a wide range of audio formats.  This package contains
-multimedia tag and metadata readers.")
-    (license license:mpl2.0)))
-
 (define-public rust-symphonia-bundle-mp3-0.4
   (package
     (name "rust-symphonia-bundle-mp3")
@@ -75644,6 +75594,32 @@ (define-public rust-symphonia-codec-vorbis-0.4
 decoder.")
     (license license:mpl2.0)))
 
+(define-public rust-symphonia-core-0.4
+  (package
+    (name "rust-symphonia-core")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "symphonia-core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1j84q4a9p9qa23976spxap9s6ns3fm6fzrfz65n6cjhgpsbmw4zs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.7)
+                       ("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-bytemuck" ,rust-bytemuck-1)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-log" ,rust-log-0.4))))
+    (home-page "https://github.com/pdeljanov/Symphonia")
+    (synopsis "Shared elements for Symphonia a Rust audio library")
+    (description
+     "Symphonia is a pure Rust audio decoding and media demuxing
+library supporting a wide range of audio formats.  This package contains
+shared structs, traits, and features.")
+    (license license:mpl2.0)))
+
 (define-public rust-symphonia-format-isomp4-0.4
   (package
     (name "rust-symphonia-format-isomp4")
@@ -75716,6 +75692,31 @@ (define-public rust-symphonia-format-wav-0.4
 supports a wide range of audio formats.  This package is a WAV demuxer.")
     (license license:mpl2.0)))
 
+(define-public rust-symphonia-metadata-0.4
+  (package
+    (name "rust-symphonia-metadata")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "symphonia-metadata" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06lvwy24kirc84r6d23ncad544525fsb6gna0plqz3d1mffmjq2j"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-encoding-rs" ,rust-encoding-rs-0.8)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-symphonia-core" ,rust-symphonia-core-0.4))))
+    (home-page "https://github.com/pdeljanov/Symphonia")
+    (synopsis "Multimedia tag and metadata readers for the Symphonia library")
+    (description
+     "Symphonia is a pure Rust audio decoding and media demuxing
+library supporting a wide range of audio formats.  This package contains
+multimedia tag and metadata readers.")
+    (license license:mpl2.0)))
+
 (define-public rust-symphonia-utils-xiph-0.4
   (package
     (name "rust-symphonia-utils-xiph")
-- 
2.41.0

[bug#70606] [PATCH rust-team 012/101] gnu: Place rust-sxd-xpath-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-sxd-xpath-0.4,
rust-sxd-document-0.3): Move variable.

Change-Id: I6748ea927a50e07ebc0e059659f716d1c5e7d8c1
---
 gnu/packages/crates-io.scm | 88 +++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 45 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 762903070a..8a3cd15f78 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -75165,51 +75165,6 @@ (define-public rust-svgtypes-0.5
     (description "This package provides SVG types parser.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-sxd-document-0.3
-  (package
-    (name "rust-sxd-document")
-    (version "0.3.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "sxd-document" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0y10shqmy9xb73g403rg1108wsagny9d8jrcm081pbwzpqvjzn4l"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-peresil" ,rust-peresil-0.3)
-        ("rust-typed-arena" ,rust-typed-arena-1))))
-    (home-page "https://github.com/shepmaster/sxd-document")
-    (synopsis "Rust XML DOM library")
-    (description "This package provides a Rust XML DOM library.")
-    (license license:expat)))
-
-(define-public rust-sxd-xpath-0.4
-  (package
-    (name "rust-sxd-xpath")
-    (version "0.4.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "sxd-xpath" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1sin3g8lzans065gjcwrpm7gdpwdpdg4rpi91rlvb1q8sfjrvqrn"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-peresil" ,rust-peresil-0.3)
-        ("rust-quick-error" ,rust-quick-error-1)
-        ("rust-sxd-document" ,rust-sxd-document-0.3))))
-    (home-page "https://github.com/shepmaster/sxd-xpath")
-    (synopsis "Rust XML XPath library")
-    (description "This package provides a Rust XML XPath library.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-swayipc-3
   (package
     (name "rust-swayipc")
@@ -75324,6 +75279,49 @@ (define-public rust-swayipc-types-1
 sway's IPC interface.")
     (license license:expat)))
 
+(define-public rust-sxd-document-0.3
+  (package
+    (name "rust-sxd-document")
+    (version "0.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sxd-document" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0y10shqmy9xb73g403rg1108wsagny9d8jrcm081pbwzpqvjzn4l"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-peresil" ,rust-peresil-0.3)
+                       ("rust-typed-arena" ,rust-typed-arena-1))))
+    (home-page "https://github.com/shepmaster/sxd-document")
+    (synopsis "Rust XML DOM library")
+    (description "This package provides a Rust XML DOM library.")
+    (license license:expat)))
+
+(define-public rust-sxd-xpath-0.4
+  (package
+    (name "rust-sxd-xpath")
+    (version "0.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sxd-xpath" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1sin3g8lzans065gjcwrpm7gdpwdpdg4rpi91rlvb1q8sfjrvqrn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-peresil" ,rust-peresil-0.3)
+                       ("rust-quick-error" ,rust-quick-error-1)
+                       ("rust-sxd-document" ,rust-sxd-document-0.3))))
+    (home-page "https://github.com/shepmaster/sxd-xpath")
+    (synopsis "Rust XML XPath library")
+    (description "This package provides a Rust XML XPath library.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-symbolic-common-12
   (package
     (name "rust-symbolic-common")
-- 
2.41.0

[bug#70606] [PATCH rust-team 013/101] gnu: Place rust-spirv-types-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-spirv-types-0.4, rust-spirv-std-0.4):
Swap variables.

Change-Id: I4701d99a269d9372b6b3efc99b4837878918947e
---
 gnu/packages/crates-io.scm | 62 +++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8a3cd15f78..b9257501b5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -72347,23 +72347,31 @@ (define-public rust-spinning-top-0.2
 provided by @code{lock_api}.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-spirv-types-0.4
+(define-public rust-spirv-std-0.4
   (package
-    (name "rust-spirv-types")
-    (version "0.4.0-alpha.12")
+    (name "rust-spirv-std")
+    ;; We use a slightly older version here, because of problems building glam
+    ;; 0.13.1 with more recent versions.
+    (version "0.4.0-alpha.7")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "spirv-types" version))
+       (uri (crate-uri "spirv-std" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0sxcic2n04xzywww3c7mj9ah8iwr20vz3d6xvsgla1y7gs7lpk3i"))))
+        (base32 "14npd838bqnw09iab0zq94xs4yl69m6c0cdfzxa9fal0zxqlqv3j"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-spirv-std-macros" ,rust-spirv-std-macros-0.4)
+        ("rust-spirv-types" ,rust-spirv-types-0.4))))
     (home-page "https://github.com/EmbarkStudios/rust-gpu")
-    (synopsis "SPIR-V types shared between spirv-std and spirv-std-macros")
-    (description "This package provides SPIR-V types shared between spirv-std
-and spirv-std-macros.")
+    (synopsis "Standard functions and types for SPIR-V")
+    (description "This package provides standard functions and types for
+SPIR-V.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-spirv-std-macros-0.4
@@ -72380,42 +72388,34 @@ (define-public rust-spirv-std-macros-0.4
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-heck" ,rust-heck-0.3)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-spirv-types" ,rust-spirv-types-0.4)
-        ("rust-syn" ,rust-syn-1))))
+       #:cargo-inputs (("rust-heck" ,rust-heck-0.3)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-spirv-types" ,rust-spirv-types-0.4)
+                       ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/EmbarkStudios/rust-gpu")
     (synopsis "Macros for spirv-std")
     (description "This package provides macros for spirv-std.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-spirv-std-0.4
+(define-public rust-spirv-types-0.4
   (package
-    (name "rust-spirv-std")
-    ;; We use a slightly older version here, because of problems building glam
-    ;; 0.13.1 with more recent versions.
-    (version "0.4.0-alpha.7")
+    (name "rust-spirv-types")
+    (version "0.4.0-alpha.12")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "spirv-std" version))
+       (uri (crate-uri "spirv-types" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "14npd838bqnw09iab0zq94xs4yl69m6c0cdfzxa9fal0zxqlqv3j"))))
+        (base32 "0sxcic2n04xzywww3c7mj9ah8iwr20vz3d6xvsgla1y7gs7lpk3i"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-num-traits" ,rust-num-traits-0.2)
-        ("rust-spirv-std-macros" ,rust-spirv-std-macros-0.4)
-        ("rust-spirv-types" ,rust-spirv-types-0.4))))
+     `(#:skip-build? #t))
     (home-page "https://github.com/EmbarkStudios/rust-gpu")
-    (synopsis "Standard functions and types for SPIR-V")
-    (description "This package provides standard functions and types for
-SPIR-V.")
+    (synopsis "SPIR-V types shared between spirv-std and spirv-std-macros")
+    (description "This package provides SPIR-V types shared between spirv-std
+and spirv-std-macros.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-spmc-0.3
-- 
2.41.0

[bug#70606] [PATCH rust-team 014/101] gnu: Place rust-snapbox-macros-0.3 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-snapbox-macros-0.3): Move variable.

Change-Id: I6ddcea4d2d1bb31099651828e24381b98a67d6af
---
 gnu/packages/crates-io.scm | 71 ++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b9257501b5..23a1db2bc4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71770,48 +71770,6 @@ (define-public rust-snap-0.2
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-snappy-cpp" ,rust-snappy-cpp-0.1))))))
 
-(define-public rust-snapbox-macros-0.3
-  (package
-    (name "rust-snapbox-macros")
-    (version "0.3.8")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "snapbox-macros" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0h6yy5h83y17bghi1lq9pw3knbqba1rwns20flian5axn0wbii71"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-anstream" ,rust-anstream-0.6))))
-    (home-page "https://github.com/assert-rs/trycmd/tree/main/crates/snapbox")
-    (synopsis "Snapshot testing toolbox")
-    (description
-     "Snapbox is a snapshot-testing toolbox that is ready to use for verifying
-output from
-
-@itemize
-@item Function return values
-@item CLI stdout/stderr
-@item Filesystem changes
-@end itemize
-
-It is also flexible enough to build your own test harness like @code{trycmd}.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-snapbox-macros-0.2
-  (package
-    (inherit rust-snapbox-macros-0.3)
-    (name "rust-snapbox-macros")
-    (version "0.2.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "snapbox-macros" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0c79lnjcs9yp62y665swv5y5y6088qc256bfr3s7xcnb0izfl7f0"))))))
-
 (define-public rust-snapbox-0.5
   (package
     (name "rust-snapbox")
@@ -71927,6 +71885,35 @@ (define-public rust-snapbox-0.2
         ("rust-walkdir" ,rust-walkdir-2)
         ("rust-yansi" ,rust-yansi-0.5))))))
 
+(define-public rust-snapbox-macros-0.3
+  (package
+    (name "rust-snapbox-macros")
+    (version "0.3.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "snapbox-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0h6yy5h83y17bghi1lq9pw3knbqba1rwns20flian5axn0wbii71"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anstream" ,rust-anstream-0.6))))
+    (home-page "https://github.com/assert-rs/trycmd/tree/main/crates/snapbox")
+    (synopsis "Snapshot testing toolbox")
+    (description
+     "Snapbox is a snapshot-testing toolbox that is ready to use for verifying
+output from
+
+@itemize
+@item Function return values
+@item CLI stdout/stderr
+@item Filesystem changes
+@end itemize
+
+It is also flexible enough to build your own test harness like @code{trycmd}.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-snappy-cpp-0.1
   (package
     (name "rust-snappy-cpp")
-- 
2.41.0

[bug#70606] [PATCH rust-team 015/101] gnu: Place rust-snafu-0.8 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-snafu-0.8, rust-snafu-0.7): Move
variables.

Change-Id: I461d181fcb1d3534f1cf9915827edfac3f672947
---
 gnu/packages/crates-io.scm | 102 ++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 23a1db2bc4..178e3bb854 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71618,6 +71618,57 @@ (define-public rust-smol-str-0.1
                                    ("rust-serde" ,rust-serde-1)
                                    ("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-snafu-0.8
+  (package
+    (name "rust-snafu")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "snafu" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15ph0zr3zw6lh4cw0s0k1wvcvi18bmrzvjbx1l9jjh7560bwahnk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=backtrace_contains_function_names"
+         "--skip=delegation::backtrace_comes_from_delegated_error"
+         "--skip=delegation::backtrace_comes_from_renamed_delegated_error"
+         "--skip=whatever_nested::backtrace_method_delegates_to_nested_whatever"
+         "--skip=has_a_backtrace")
+         #:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-pin-project" ,rust-pin-project-1)
+                       ("rust-snafu-derive" ,rust-snafu-derive-0.8))))
+    (home-page "https://github.com/shepmaster/snafu")
+    (synopsis "Ergonomic error handling library")
+    (description "Snafu aims to be an ergonomic error handling library.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-snafu-0.7
+  (package
+    (inherit rust-snafu-0.8)
+    (name "rust-snafu")
+    (version "0.7.5")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "snafu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1mj2j2gfbf8mm1hr02zrbrqrh2zp01f61xgkx0lpln2w0ankgpp4"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-backtrace" ,rust-backtrace-0.3)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-pin-project" ,rust-pin-project-1)
+        ("rust-snafu-derive" ,rust-snafu-derive-0.7))))))
+
 (define-public rust-snafu-derive-0.8
   (package
     (name "rust-snafu-derive")
@@ -71678,57 +71729,6 @@ (define-public rust-snafu-derive-0.6
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-snafu-0.8
-  (package
-    (name "rust-snafu")
-    (version "0.8.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "snafu" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "15ph0zr3zw6lh4cw0s0k1wvcvi18bmrzvjbx1l9jjh7560bwahnk"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-test-flags
-       '("--release" "--"
-         "--skip=backtrace_contains_function_names"
-         "--skip=delegation::backtrace_comes_from_delegated_error"
-         "--skip=delegation::backtrace_comes_from_renamed_delegated_error"
-         "--skip=whatever_nested::backtrace_method_delegates_to_nested_whatever"
-         "--skip=has_a_backtrace")
-         #:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3)
-                       ("rust-futures" ,rust-futures-0.3)
-                       ("rust-futures-core" ,rust-futures-core-0.3)
-                       ("rust-pin-project" ,rust-pin-project-1)
-                       ("rust-snafu-derive" ,rust-snafu-derive-0.8))))
-    (home-page "https://github.com/shepmaster/snafu")
-    (synopsis "Ergonomic error handling library")
-    (description "Snafu aims to be an ergonomic error handling library.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-snafu-0.7
-  (package
-    (inherit rust-snafu-0.8)
-    (name "rust-snafu")
-    (version "0.7.5")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "snafu" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1mj2j2gfbf8mm1hr02zrbrqrh2zp01f61xgkx0lpln2w0ankgpp4"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-backtrace" ,rust-backtrace-0.3)
-        ("rust-doc-comment" ,rust-doc-comment-0.3)
-        ("rust-futures" ,rust-futures-0.3)
-        ("rust-futures-core" ,rust-futures-core-0.3)
-        ("rust-pin-project" ,rust-pin-project-1)
-        ("rust-snafu-derive" ,rust-snafu-derive-0.7))))))
-
 (define-public rust-snap-1
   (package
     (name "rust-snap")
-- 
2.41.0

[bug#70606] [PATCH rust-team 016/101] gnu: Place rust-paw-structopt-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-paw-structopt-1, rust-paw-raw-1,
rust-paw-attributes-1, rust-paw-1, rust-pathfinder-simd-0.5,
rust-pathfinder-geometry-0.5): Move variables.

Change-Id: I89b70db9548968c120a46381ce9d9a0adbd6fbed
---
 gnu/packages/crates-io.scm | 270 ++++++++++++++++++-------------------
 1 file changed, 135 insertions(+), 135 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 178e3bb854..bfe5514539 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51252,6 +51252,141 @@ (define-public rust-pathdiff-0.2
 path.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-pathfinder-geometry-0.5
+  (package
+    (name "rust-pathfinder-geometry")
+    (version "0.5.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "pathfinder_geometry" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "1lssir0s1cmrpzzrk49jm31nkssh2j715gryww6700x79rxpwyqb"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-log" ,rust-log-0.4)
+         ("rust-pathfinder-simd" ,rust-pathfinder-simd-0.5))))
+    (home-page "https://github.com/servo/pathfinder")
+    (synopsis "Basic SIMD-accelerated geometry/linear algebra")
+    (description "This package provides basic SIMD-accelerated geometry/linear
+algebra.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-pathfinder-simd-0.5
+  (package
+    (name "rust-pathfinder-simd")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pathfinder_simd" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zx6yjch2zwlnbrsq3ljnkwzs9jdf4cbh5wwjkjradahqnn4dzir"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-rustc-version" ,rust-rustc-version-0.3))))
+    (home-page "https://github.com/servo/pathfinder")
+    (synopsis "Simple SIMD Rust library")
+    (description "This package provides a simple SIMD Rust library.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-paw-1
+  (package
+    (name "rust-paw")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "paw" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1sc481y42rb08hmww525m4539ppl8k0w14kwxp13vg2dasdzrh09"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; `async_await` has been stable since `1.39.0`
+       #:cargo-inputs
+       (("rust-paw-attributes" ,rust-paw-attributes-1)
+        ("rust-paw-raw" ,rust-paw-raw-1))
+       #:cargo-development-inputs
+       (("rust-paw-structopt" ,rust-paw-structopt-1)
+        ("rust-runtime" ,rust-runtime-0.3)
+        ("rust-structopt" ,rust-structopt-0.2))))
+    (home-page "https://github.com/rust-cli/paw")
+    (synopsis "CLI argument parser")
+    (description "This package provides a CLI argument parser.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-paw-attributes-1
+  (package
+    (name "rust-paw-attributes")
+    (version "1.0.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "paw-attributes" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "0fda1v7y5pfmg8d2v7m0pyvif6c44qjz914jjn718pdyclrmhd8g"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-proc-macro2" ,rust-proc-macro2-1)
+         ("rust-quote" ,rust-quote-1)
+         ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/rust-cli/paw")
+    (synopsis "Proc Macro attributes for the Paw crate")
+    (description "This package provides Proc Macro attributes for the Paw
+crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-paw-raw-1
+  (package
+    (name "rust-paw-raw")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "paw-raw" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1wk76ipp34gjh42vivmgdkb2rgr26gwhn34gk7z5l378ixk5j2vz"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/rust-cli/paw")
+    (synopsis "Traits to implement custom Paw implementations")
+    (description "This package provides traits to implement custom Paw
+implementations.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-paw-structopt-1
+  (package
+    (name "rust-paw-structopt")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "paw-structopt" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1iwg83xqjpfgpy8wrq173cy7zgkyxfryd230sh34f5qsjdx7zap4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; use of undeclared crate or module `paw`
+       #:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-0.4)
+        ("rust-quote" ,rust-quote-0.6)
+        ("rust-structopt" ,rust-structopt-0.2)
+        ("rust-syn" ,rust-syn-0.15))))
+    (home-page "https://github.com/rust-cli/paw")
+    (synopsis "Structopt support for the Paw crate")
+    (description "This package provides Structopt support for the Paw crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-pcap-1
   (package
     (name "rust-pcap")
@@ -70789,141 +70924,6 @@ (define-public rust-slab-0.4
 data type.")
     (license license:expat)))
 
-(define-public rust-pathfinder-geometry-0.5
-  (package
-    (name "rust-pathfinder-geometry")
-    (version "0.5.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "pathfinder_geometry" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "1lssir0s1cmrpzzrk49jm31nkssh2j715gryww6700x79rxpwyqb"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-log" ,rust-log-0.4)
-         ("rust-pathfinder-simd" ,rust-pathfinder-simd-0.5))))
-    (home-page "https://github.com/servo/pathfinder")
-    (synopsis "Basic SIMD-accelerated geometry/linear algebra")
-    (description "This package provides basic SIMD-accelerated geometry/linear
-algebra.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-pathfinder-simd-0.5
-  (package
-    (name "rust-pathfinder-simd")
-    (version "0.5.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pathfinder_simd" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1zx6yjch2zwlnbrsq3ljnkwzs9jdf4cbh5wwjkjradahqnn4dzir"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-rustc-version" ,rust-rustc-version-0.3))))
-    (home-page "https://github.com/servo/pathfinder")
-    (synopsis "Simple SIMD Rust library")
-    (description "This package provides a simple SIMD Rust library.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-paw-1
-  (package
-    (name "rust-paw")
-    (version "1.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "paw" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1sc481y42rb08hmww525m4539ppl8k0w14kwxp13vg2dasdzrh09"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f  ; `async_await` has been stable since `1.39.0`
-       #:cargo-inputs
-       (("rust-paw-attributes" ,rust-paw-attributes-1)
-        ("rust-paw-raw" ,rust-paw-raw-1))
-       #:cargo-development-inputs
-       (("rust-paw-structopt" ,rust-paw-structopt-1)
-        ("rust-runtime" ,rust-runtime-0.3)
-        ("rust-structopt" ,rust-structopt-0.2))))
-    (home-page "https://github.com/rust-cli/paw")
-    (synopsis "CLI argument parser")
-    (description "This package provides a CLI argument parser.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-paw-attributes-1
-  (package
-    (name "rust-paw-attributes")
-    (version "1.0.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "paw-attributes" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "0fda1v7y5pfmg8d2v7m0pyvif6c44qjz914jjn718pdyclrmhd8g"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-proc-macro2" ,rust-proc-macro2-1)
-         ("rust-quote" ,rust-quote-1)
-         ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/rust-cli/paw")
-    (synopsis "Proc Macro attributes for the Paw crate")
-    (description "This package provides Proc Macro attributes for the Paw
-crate.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-paw-raw-1
-  (package
-    (name "rust-paw-raw")
-    (version "1.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "paw-raw" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1wk76ipp34gjh42vivmgdkb2rgr26gwhn34gk7z5l378ixk5j2vz"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/rust-cli/paw")
-    (synopsis "Traits to implement custom Paw implementations")
-    (description "This package provides traits to implement custom Paw
-implementations.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-paw-structopt-1
-  (package
-    (name "rust-paw-structopt")
-    (version "1.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "paw-structopt" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1iwg83xqjpfgpy8wrq173cy7zgkyxfryd230sh34f5qsjdx7zap4"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f      ; use of undeclared crate or module `paw`
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-0.4)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-structopt" ,rust-structopt-0.2)
-        ("rust-syn" ,rust-syn-0.15))))
-    (home-page "https://github.com/rust-cli/paw")
-    (synopsis "Structopt support for the Paw crate")
-    (description "This package provides Structopt support for the Paw crate.")
-    (license (list license:expat license:asl2.0))))
-
 ;; TODO: Unbundle sleef.
 (define-public rust-sleef-sys-0.1
   (package
-- 
2.41.0

[bug#70606] [PATCH rust-team 017/101] gnu: Place rust-simplerand-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-simplerand-1, rust-simplelog-0.12):
Move variables.

Change-Id: Ica91b97d824a0c3717d3ee84d4186e4e2acada88
---
 gnu/packages/crates-io.scm | 99 +++++++++++++++++++-------------------
 1 file changed, 50 insertions(+), 49 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bfe5514539..317bcba35e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70526,55 +70526,6 @@ (define-public rust-similar-asserts-1
 diff output.")
     (license license:asl2.0)))
 
-(define-public rust-simplelog-0.12
-  (package
-    (name "rust-simplelog")
-    (version "0.12.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "simplelog" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0sa3hjdifxhcb9lnlg549fr2cc7vz89nygwbih2dbqsx3h20ivmc"))
-       (snippet
-        #~(begin (use-modules (guix build utils))
-                 (substitute* "Cargo.toml"
-                   (("1\\.1\\.\\*") "1.1"))))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-paris" ,rust-paris-1)
-                       ("rust-termcolor" ,rust-termcolor-1)
-                       ("rust-time" ,rust-time-0.3))))
-    (home-page "https://github.com/drakulix/simplelog.rs")
-    (synopsis "Simple and easy-to-use logging facility for Rust's log crate")
-    (description
-     "This package provides a simple and easy-to-use logging facility for Rust's
-@code{log} crate.  It aims to be a maintainable, easy to integrate facility for
-small to medium sized project")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-simplerand-1
-  (package
-    (name "rust-simplerand")
-    (version "1.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "simplerand" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0yw9p3sk5c57gwz60ydpvsbx9kkwyccwlcv0z3q4v66b4455libh"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1))))
-    (home-page "https://github.com/PumpkinSeed/srand")
-    (synopsis "Random number generator")
-    (description "Simple and fast random number generator.")
-    (license license:expat)))
-
 (define-public rust-simple-logger-4
   (package
     (name "rust-simple-logger")
@@ -70686,6 +70637,56 @@ (define-public rust-simple-mutex-1
 simpler than @code{parking_lot}.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-simplelog-0.12
+  (package
+    (name "rust-simplelog")
+    (version "0.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "simplelog" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0sa3hjdifxhcb9lnlg549fr2cc7vz89nygwbih2dbqsx3h20ivmc"))
+       (snippet #~(begin
+                    (use-modules (guix build utils))
+                    (substitute* "Cargo.toml"
+                      (("1\\.1\\.\\*")
+                       "1.1"))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-paris" ,rust-paris-1)
+                       ("rust-termcolor" ,rust-termcolor-1)
+                       ("rust-time" ,rust-time-0.3))))
+    (home-page "https://github.com/drakulix/simplelog.rs")
+    (synopsis "Simple and easy-to-use logging facility for Rust's log crate")
+    (description
+     "This package provides a simple and easy-to-use logging facility for Rust's
+@code{log} crate.  It aims to be a maintainable, easy to integrate facility for
+small to medium sized project")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-simplerand-1
+  (package
+    (name "rust-simplerand")
+    (version "1.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "simplerand" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0yw9p3sk5c57gwz60ydpvsbx9kkwyccwlcv0z3q4v66b4455libh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1))))
+    (home-page "https://github.com/PumpkinSeed/srand")
+    (synopsis "Random number generator")
+    (description "Simple and fast random number generator.")
+    (license license:expat)))
+
 (define-public rust-siphasher-0.3
   (package
     (name "rust-siphasher")
-- 
2.41.0

[bug#70606] [PATCH rust-team 018/101] gnu: Place rust-sensors-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-sensors-0.2): Move variable.

Change-Id: If1e6c9795ff21c358b132d897d5e2cfd83aa9ffc
---
 gnu/packages/crates-io.scm | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 317bcba35e..bea3f2027e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67809,6 +67809,28 @@ (define-public rust-send-wrapper-0.4
         (base32 "1l7s28vfnwdbjyrrk3lx81jy4f0dcrv4iwyah2wj6vndxhqxaf7n"))))
     (arguments `(#:skip-build? #t))))
 
+(define-public rust-sensors-0.2
+  (package
+    (name "rust-sensors")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sensors" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1l6nvmbbbbl9mdkd9806mmls68d6hvqb2nl0nm14chva5xwz8fks"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-libsensors-sys" ,rust-libsensors-sys-0.2))))
+    (inputs (list (list lm-sensors "lib")))
+    (home-page "https://github.com/nyantec/sensors")
+    (synopsis "Rust-friendly interface to lm-sensors")
+    (description
+     "This package provides a Rust-friendly interface to lm-sensors.")
+    (license license:miros)))
+
 (define-public rust-seq-io-0.3
   (package
     (name "rust-seq-io")
@@ -69693,28 +69715,6 @@ (define-public rust-servo-fontconfig-sys-5
      "This package provides a Rust wrapper around Fontxonfig.")
     (license license:expat)))
 
-(define-public rust-sensors-0.2
-  (package
-    (name "rust-sensors")
-    (version "0.2.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "sensors" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1l6nvmbbbbl9mdkd9806mmls68d6hvqb2nl0nm14chva5xwz8fks"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
-                       ("rust-libsensors-sys" ,rust-libsensors-sys-0.2))))
-    (inputs (list (list lm-sensors "lib")))
-    (home-page "https://github.com/nyantec/sensors")
-    (synopsis "Rust-friendly interface to lm-sensors")
-    (description
-     "This package provides a Rust-friendly interface to lm-sensors.")
-    (license license:miros)))
-
 (define-public rust-shadow-rs-0.26
   (package
     (name "rust-shadow-rs")
-- 
2.41.0

[bug#70606] [PATCH rust-team 019/101] gnu: Place rust-serial-test-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serial-test-0.4,
rust-serial-test-derive-0.4): Move variable.

Change-Id: I99f8f124d58b62f20f16da15e73155ca17c3b8c5
---
 gnu/packages/crates-io.scm | 102 ++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bea3f2027e..eb01cbaf5e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -69405,6 +69405,31 @@ (define-public rust-serial-test-0.5
         ("rust-parking-lot" ,rust-parking-lot-0.11)
         ("rust-serial-test-derive" ,rust-serial-test-derive-0.5))))))
 
+(define-public rust-serial-test-0.4
+  (package
+    (name "rust-serial-test")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serial_test" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1mkz246ax07nar0bmh3m98kl27lacja98vywi9cjqbsb8g3zgxgy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+("rust-parking-lot" ,rust-parking-lot-0.10)
+("rust-serial-test-derive" ,rust-serial-test-derive-0.4))))
+    (home-page
+     "https://github.com/palfrey/serial_test/")
+    (synopsis "Serialising Rust tests")
+    (description "Serialising Rust tests")
+    (license license:expat)))
+
 (define-public rust-serial-test-0.1
   (package
     (inherit rust-serial-test-0.5)
@@ -69551,6 +69576,32 @@ (define-public rust-serial-test-derive-0.5
        #:cargo-development-inputs
        (("rust-env-logger" ,rust-env-logger-0.7))))))
 
+(define-public rust-serial-test-derive-0.4
+  (package
+    (name "rust-serial-test-derive")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serial_test_derive" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "05b5xr36zi8damfg3bmbh1kwdxc3k1y2r8b8pmi7q8jb0bc3i0yh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-env-logger" ,rust-env-logger-0.7)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page
+     "https://github.com/palfrey/serial_test_derive/")
+    (synopsis "Serialising Rust tests")
+    (description "Serialising Rust tests")
+    (license license:expat)))
+
 (define-public rust-serial-test-derive-0.1
   (package
     (inherit rust-serial-test-derive-0.5)
@@ -69614,57 +69665,6 @@ (define-public rust-servo-arc-0.1
         ("rust-serde" ,rust-serde-1)
         ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))))
 
-(define-public rust-serial-test-derive-0.4
-  (package
-    (name "rust-serial-test-derive")
-    (version "0.4.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "serial_test_derive" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "05b5xr36zi8damfg3bmbh1kwdxc3k1y2r8b8pmi7q8jb0bc3i0yh"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-env-logger" ,rust-env-logger-0.7)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page
-     "https://github.com/palfrey/serial_test_derive/")
-    (synopsis "Serialising Rust tests")
-    (description "Serialising Rust tests")
-    (license license:expat)))
-
-(define-public rust-serial-test-0.4
-  (package
-    (name "rust-serial-test")
-    (version "0.4.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "serial_test" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1mkz246ax07nar0bmh3m98kl27lacja98vywi9cjqbsb8g3zgxgy"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-lazy-static" ,rust-lazy-static-1)
-("rust-parking-lot" ,rust-parking-lot-0.10)
-("rust-serial-test-derive" ,rust-serial-test-derive-0.4))))
-    (home-page
-     "https://github.com/palfrey/serial_test/")
-    (synopsis "Serialising Rust tests")
-    (description "Serialising Rust tests")
-    (license license:expat)))
-
 (define-public rust-servo-fontconfig-0.5
   (package
     (name "rust-servo-fontconfig")
-- 
2.41.0

[bug#70606] [PATCH rust-team 020/101] gnu: Place rust-serde-wasm-bindgen-0.3 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serde-wasm-bindgen-0.3): Move
variable.

Change-Id: I3d219d14a134e75bca7b9cad5022688567947305
---
 gnu/packages/crates-io.scm | 58 +++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index eb01cbaf5e..c44f96e2de 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68942,6 +68942,35 @@ (define-public rust-serde-value-0.7
 for later processing.")
     (license license:expat)))
 
+(define-public rust-serde-wasm-bindgen-0.3
+  (package
+    (name "rust-serde-wasm-bindgen")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serde-wasm-bindgen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xzh1a3rhapirlca4rbvh6bycphxg5yjmdwjsqij3hl6wpl6b0v1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-fnv" ,rust-fnv-1)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
+       #:cargo-development-inputs
+       (("rust-maplit" ,rust-maplit-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/cloudflare/serde-wasm-bindgen")
+    (synopsis "Native Serde adapter for wasm-bindgen")
+    (description "Native Serde adapter for wasm-bindgen.")
+    (license license:expat)))
+
 (define-public rust-serde-with-3
   (package
     (name "rust-serde-with")
@@ -69234,35 +69263,6 @@ (define-public rust-serde-yaml-0.8
         ("rust-indoc" ,rust-indoc-1)
         ("rust-serde-derive" ,rust-serde-derive-1))))))
 
-(define-public rust-serde-wasm-bindgen-0.3
-  (package
-    (name "rust-serde-wasm-bindgen")
-    (version "0.3.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "serde-wasm-bindgen" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1xzh1a3rhapirlca4rbvh6bycphxg5yjmdwjsqij3hl6wpl6b0v1"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-fnv" ,rust-fnv-1)
-        ("rust-js-sys" ,rust-js-sys-0.3)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
-       #:cargo-development-inputs
-       (("rust-maplit" ,rust-maplit-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-bytes" ,rust-serde-bytes-0.11)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
-    (home-page "https://github.com/cloudflare/serde-wasm-bindgen")
-    (synopsis "Native Serde adapter for wasm-bindgen")
-    (description "Native Serde adapter for wasm-bindgen.")
-    (license license:expat)))
-
 (define-public rust-serial-test-3
   (package
     (name "rust-serial-test")
-- 
2.41.0

[bug#70606] [PATCH rust-team 021/101] gnu: Place rust-serdeconv-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serdeconv-0.4, rust-serde-hjson-0.9,
rust-serde-indextree-0.2, rust-serde-html-form-0.2, rust-serde-fmt-1):
Move variables.

Change-Id: I6543d57ab1d471a361e659f69366048418c05c96
---
 gnu/packages/crates-io.scm | 259 ++++++++++++++++++-------------------
 1 file changed, 129 insertions(+), 130 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c44f96e2de..1374fdfa4e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68201,136 +68201,6 @@ (define-public rust-serde-codegen-internals-0.14
      "Unstable AST representation used by Serde codegen.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-serde-fmt-1
-  (package
-    (name "rust-serde-fmt")
-    (version "1.0.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "serde_fmt" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "195sp3zxbdgrnaqxwn9z3pij04fd7yyihnm4fpfc261r5fdacqr9"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-serde" ,rust-serde-1))))
-    (home-page "https://github.com/KodrAus/serde_fmt.git")
-    (synopsis "Write any @code{serde::Serialize} using standard formatting APIs")
-    (description
-     "This package allows one to Write any @code{serde::Serialize} using the
-standard formatting APIs.")
-    (license (list license:asl2.0 license:expat))))
-
-(define-public rust-serde-html-form-0.2
-  (package
-    (name "rust-serde-html-form")
-    (version "0.2.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "serde_html_form" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "133ycw4zdw4jymnw38n4vnjnvhxf5im3hh6g4akr4rps3ip0dq90"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-form-urlencoded" ,rust-form-urlencoded-1)
-                       ("rust-indexmap" ,rust-indexmap-2)
-                       ("rust-itoa" ,rust-itoa-1)
-                       ("rust-ryu" ,rust-ryu-1)
-                       ("rust-serde" ,rust-serde-1))
-       #:cargo-development-inputs (("rust-assert-matches2" ,rust-assert-matches2-0.1)
-                                   ("rust-serde" ,rust-serde-1))))
-    (home-page "https://github.com/jplatte/serde_html_form")
-    (synopsis
-     "(De-)serialization support for the `application/x-www-form-urlencoded` format")
-    (description
-     "This package provies (de-)serialization support for the
-`application/x-www-form-urlencoded` format.")
-    (license license:expat)))
-
-(define-public rust-serde-indextree-0.2
-  (package
-    (name "rust-serde-indextree")
-    (version "0.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "serde_indextree" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0kzp3dk6smfy0509fd1sih9ai4a31kgpb1rshsxb0m2l01c7s3m7"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-indextree" ,rust-indextree-4)
-                       ("rust-serde" ,rust-serde-1))))
-    (home-page "https://github.com/PoiScript/serde_indextree")
-    (synopsis "Serializing indextree structure")
-    (description "Serializing indextree structure.")
-    (license license:expat)))
-
-(define-public rust-serde-hjson-0.9
-  (package
-    (name "rust-serde-hjson")
-    (version "0.9.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "serde-hjson" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1y3lzs8556bxqa9jfdyg38pd5jjffblczikckwh571d8m074wfka"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-clippy" ,rust-clippy-0.0)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-linked-hash-map" ,rust-linked-hash-map-0.3)
-        ("rust-num-traits" ,rust-num-traits-0.1)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-serde" ,rust-serde-0.8))))
-    (home-page "https://github.com/hjson/hjson-rust")
-    (synopsis "Human JSON (Hjson) serialization file format")
-    (description
-     "This crate is a Rust library for parsing and generating Human JSON
-Hjson.  It is built upon Serde, a high performance generic serialization
-framework.")
-    (license license:expat)))
-
-(define-public rust-serdeconv-0.4
-  (package
-    (name "rust-serdeconv")
-    (version "0.4.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "serdeconv" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0cal6qkzps92g7csycqij4ik1df3ccxn5sxnjvfvm473phnwbvbi"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-rmp-serde" ,rust-rmp-serde-0.15)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-toml" ,rust-toml-0.5)
-        ("rust-trackable" ,rust-trackable-1))
-       #:cargo-development-inputs
-       (("rust-serde-derive" ,rust-serde-derive-1))))
-    (home-page "https://github.com/sile/serdeconv")
-    (synopsis
-     "Convert between TOML/JSON/MessagePack strings and serializable values")
-    (description
-     "This crate provides traits and functions for converting between
-TOML/JSON/MessagePack strings and serializable values.")
-    (license license:expat)))
-
 (define-public rust-serde-derive-1
   (package
     (name "rust-serde-derive")
@@ -68427,6 +68297,85 @@ (define-public rust-serde-derive-internals-0.25
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-serde-fmt-1
+  (package
+    (name "rust-serde-fmt")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serde_fmt" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "195sp3zxbdgrnaqxwn9z3pij04fd7yyihnm4fpfc261r5fdacqr9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/KodrAus/serde_fmt.git")
+    (synopsis "Write any @code{serde::Serialize} using standard formatting APIs")
+    (description
+     "This package allows one to Write any @code{serde::Serialize} using the
+standard formatting APIs.")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-serde-hjson-0.9
+  (package
+    (name "rust-serde-hjson")
+    (version "0.9.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serde-hjson" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1y3lzs8556bxqa9jfdyg38pd5jjffblczikckwh571d8m074wfka"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-clippy" ,rust-clippy-0.0)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-linked-hash-map" ,rust-linked-hash-map-0.3)
+        ("rust-num-traits" ,rust-num-traits-0.1)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-serde" ,rust-serde-0.8))))
+    (home-page "https://github.com/hjson/hjson-rust")
+    (synopsis "Human JSON (Hjson) serialization file format")
+    (description
+     "This crate is a Rust library for parsing and generating Human JSON
+Hjson.  It is built upon Serde, a high performance generic serialization
+framework.")
+    (license license:expat)))
+
+(define-public rust-serde-html-form-0.2
+  (package
+    (name "rust-serde-html-form")
+    (version "0.2.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serde_html_form" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "133ycw4zdw4jymnw38n4vnjnvhxf5im3hh6g4akr4rps3ip0dq90"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-form-urlencoded" ,rust-form-urlencoded-1)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-itoa" ,rust-itoa-1)
+                       ("rust-ryu" ,rust-ryu-1)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-assert-matches2" ,rust-assert-matches2-0.1)
+                                   ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/jplatte/serde_html_form")
+    (synopsis
+     "(De-)serialization support for the `application/x-www-form-urlencoded` format")
+    (description "This package provies (de-)serialization support for the
+`application/x-www-form-urlencoded` format.")
+    (license license:expat)))
+
 (define-public rust-serde-ignored-0.1
   (package
     (name "rust-serde-ignored")
@@ -68452,6 +68401,26 @@ (define-public rust-serde-ignored-0.1
 @code{Deserializer} and invokes a callback on every ignored field.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-serde-indextree-0.2
+  (package
+    (name "rust-serde-indextree")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "serde_indextree" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0kzp3dk6smfy0509fd1sih9ai4a31kgpb1rshsxb0m2l01c7s3m7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-indextree" ,rust-indextree-4)
+                       ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/PoiScript/serde_indextree")
+    (synopsis "Serializing indextree structure")
+    (description "Serializing indextree structure.")
+    (license license:expat)))
+
 (define-public rust-serde-json-1
   (package
     (name "rust-serde-json")
@@ -69263,6 +69232,36 @@ (define-public rust-serde-yaml-0.8
         ("rust-indoc" ,rust-indoc-1)
         ("rust-serde-derive" ,rust-serde-derive-1))))))
 
+(define-public rust-serdeconv-0.4
+  (package
+    (name "rust-serdeconv")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serdeconv" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cal6qkzps92g7csycqij4ik1df3ccxn5sxnjvfvm473phnwbvbi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-rmp-serde" ,rust-rmp-serde-0.15)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-toml" ,rust-toml-0.5)
+        ("rust-trackable" ,rust-trackable-1))
+       #:cargo-development-inputs
+       (("rust-serde-derive" ,rust-serde-derive-1))))
+    (home-page "https://github.com/sile/serdeconv")
+    (synopsis
+     "Convert between TOML/JSON/MessagePack strings and serializable values")
+    (description
+     "This crate provides traits and functions for converting between
+TOML/JSON/MessagePack strings and serializable values.")
+    (license license:expat)))
+
 (define-public rust-serial-test-3
   (package
     (name "rust-serial-test")
-- 
2.41.0

[bug#70606] [PATCH rust-team 022/101] gnu: Place rust-salsa-macros-0.17 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-salsa-macros-0.17, rust-salsa-0.17):
Move variables.

Change-Id: Iab85cbd9519740677ad2a7ea77ffca49a3cd66a7
---
 gnu/packages/crates-io.scm | 133 +++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 73 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1374fdfa4e..87cb265bd9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66129,79 +66129,6 @@ (define-public rust-s3handler-0.7
      "This package is a s3 handler for S3 Rich Support client (S3RS).")
     (license license:expat)))
 
-(define-public rust-salsa-macros-0.17
-  (package
-    (name "rust-salsa-macros")
-    (version "0.17.0-pre.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "salsa-macros" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1xrgb38l5fhv3lqx2lwnqc3s2zrgxmj63cd7kl0vyl7m5lsjwv5c"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build?
-       #t
-       #:cargo-inputs
-       (("rust-heck" ,rust-heck-0.3)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/salsa-rs/salsa")
-    (synopsis
-     "Procedural macros for the salsa crate")
-    (description
-     "This package provides a procedural macros for the salsa crate.")
-    (license (list license:asl2.0 license:expat))))
-
-(define-public rust-salsa-0.17
-  (package
-    (name "rust-salsa")
-    (version "0.17.0-pre.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "salsa" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0ypiig0p9969nkb7k0ydxm5bnc3jva815dfh8hqpackcnk63s8lv"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build?
-       #t
-       #:cargo-inputs
-       (("rust-crossbeam-utils"
-         ,rust-crossbeam-utils-0.8)
-        ("rust-indexmap" ,rust-indexmap-1.7)
-        ("rust-lock-api" ,rust-lock-api-0.4)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-oorandom" ,rust-oorandom-11)
-        ("rust-parking-lot" ,rust-parking-lot-0.11)
-        ("rust-rustc-hash" ,rust-rustc-hash-1)
-        ("rust-salsa-macros" ,rust-salsa-macros-0.17)
-        ("rust-smallvec" ,rust-smallvec-1))
-       #:cargo-development-inputs
-       (("rust-diff" ,rust-diff-0.1)
-        ("rust-env-logger" ,rust-env-logger-0.7)
-        ("rust-linked-hash-map"
-         ,rust-linked-hash-map-0.5)
-        ("rust-rand" ,rust-rand-0.7)
-        ("rust-rand-distr" ,rust-rand-distr-0.2))))
-    (home-page "https://github.com/salsa-rs/salsa")
-    (synopsis
-     "Generic framework for on-demand, incrementalized computation
-(experimental)")
-    (description
-     "This package provides a generic framework for on-demand, incrementalized
-computation (experimental)")
-    (license (list license:asl2.0 license:expat))))
-
 (define-public rust-safe-arch-0.7
   (package
     (name "rust-safe-arch")
@@ -66275,6 +66202,66 @@ (define-public rust-safemem-0.3
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-salsa-0.17
+  (package
+    (name "rust-salsa")
+    (version "0.17.0-pre.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "salsa" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ypiig0p9969nkb7k0ydxm5bnc3jva815dfh8hqpackcnk63s8lv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+                       ("rust-indexmap" ,rust-indexmap-1.7)
+                       ("rust-lock-api" ,rust-lock-api-0.4)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-oorandom" ,rust-oorandom-11)
+                       ("rust-parking-lot" ,rust-parking-lot-0.11)
+                       ("rust-rustc-hash" ,rust-rustc-hash-1)
+                       ("rust-salsa-macros" ,rust-salsa-macros-0.17)
+                       ("rust-smallvec" ,rust-smallvec-1))
+       #:cargo-development-inputs (("rust-diff" ,rust-diff-0.1)
+                                   ("rust-env-logger" ,rust-env-logger-0.7)
+                                   ("rust-linked-hash-map" ,rust-linked-hash-map-0.5)
+                                   ("rust-rand" ,rust-rand-0.7)
+                                   ("rust-rand-distr" ,rust-rand-distr-0.2))))
+    (home-page "https://github.com/salsa-rs/salsa")
+    (synopsis "Generic framework for on-demand, incrementalized computation
+(experimental)")
+    (description
+     "This package provides a generic framework for on-demand, incrementalized
+computation (experimental)")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-salsa-macros-0.17
+  (package
+    (name "rust-salsa-macros")
+    (version "0.17.0-pre.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "salsa-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xrgb38l5fhv3lqx2lwnqc3s2zrgxmj63cd7kl0vyl7m5lsjwv5c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-heck" ,rust-heck-0.3)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/salsa-rs/salsa")
+    (synopsis "Procedural macros for the salsa crate")
+    (description
+     "This package provides a procedural macros for the salsa crate.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-same-file-1
   (package
     (name "rust-same-file")
-- 
2.41.0

[bug#70606] [PATCH rust-team 023/101] gnu: Place rust-rkyv-derive-0.7 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rkyv-derive-0.7,
rust-rkyv-derive-0.6, rust-rkyv-0.7, rust-rkyv-0.6): Move variables.

Change-Id: I0a763a643fa223c9ff6c33142b028ace06dc27ab
---
 gnu/packages/crates-io.scm | 191 ++++++++++++++++++-------------------
 1 file changed, 95 insertions(+), 96 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 87cb265bd9..d3ebcf4539 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62162,6 +62162,101 @@ (define-public rust-ringbuf-0.2
 First In First Out} ring buffer with direct access to inner data.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rkyv-0.7
+  (package
+    (name "rust-rkyv")
+    (version "0.7.44")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rkyv" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1h4rpjn15bfldwb2j3zlmv3zaksvizzl1yf6vg24yfdk5534dfjw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-arrayvec" ,rust-arrayvec-0.7)
+        ("rust-bitvec" ,rust-bitvec-1)
+        ("rust-bytecheck" ,rust-bytecheck-0.6)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-hashbrown" ,rust-hashbrown-0.12)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-ptr-meta" ,rust-ptr-meta-0.1)
+        ("rust-rend" ,rust-rend-0.4)
+        ("rust-rkyv-derive" ,rust-rkyv-derive-0.7)
+        ("rust-seahash" ,rust-seahash-4)
+        ("rust-smallvec" ,rust-smallvec-1)
+        ("rust-smol-str" ,rust-smol-str-0.2)
+        ("rust-tinyvec" ,rust-tinyvec-1)
+        ("rust-uuid" ,rust-uuid-1))))
+    (home-page "https://github.com/rkyv/rkyv")
+    (synopsis "Zero-copy deserialization framework for Rust")
+    (description "Rkyv is a zero-copy deserialization framework for Rust.")
+    (license license:expat)))
+
+(define-public rust-rkyv-0.6
+  (package
+    (inherit rust-rkyv-0.7)
+    (name "rust-rkyv")
+    (version "0.6.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rkyv" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01wsn0i8gsw958j892w8i4fyzjdsyhrh7c5zajig049kbqz5n4yb"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bytecheck" ,rust-bytecheck-0.5)
+        ("rust-memoffset" ,rust-memoffset-0.6)
+        ("rust-ptr-meta" ,rust-ptr-meta-0.1)
+        ("rust-rkyv-derive" ,rust-rkyv-derive-0.6)
+        ("rust-seahash" ,rust-seahash-4))))))
+
+(define-public rust-rkyv-derive-0.7
+  (package
+    (name "rust-rkyv-derive")
+    (version "0.7.44")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rkyv_derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0rbwvbxka171bvhj60yjaxn77ipi5d1nwknnp5i6ypp2ipzxzpd7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/rkyv/rkyv")
+    (synopsis "Derive macro for zero-copy deserialization framework")
+    (description "This package provides a Derive macro for the rkyv
+deserialization framework.")
+    (license license:expat)))
+
+(define-public rust-rkyv-derive-0.6
+  (package
+    (inherit rust-rkyv-derive-0.7)
+    (name "rust-rkyv-derive")
+    (version "0.6.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rkyv_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mc7rnps41gdywahsffqlypsp9jqmp0r6hlh2nxm31bddfgli3xs"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-rle-decode-fast-1
   (package
     (name "rust-rle-decode-fast")
@@ -65961,102 +66056,6 @@ (define-public rust-ruzstd-0.4
        #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3)
                                    ("rust-rand" ,rust-rand-0.8))))))
 
-(define-public rust-rkyv-0.7
-  (package
-    (name "rust-rkyv")
-    (version "0.7.44")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "rkyv" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1h4rpjn15bfldwb2j3zlmv3zaksvizzl1yf6vg24yfdk5534dfjw"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-arrayvec" ,rust-arrayvec-0.7)
-        ("rust-bitvec" ,rust-bitvec-1)
-        ("rust-bytecheck" ,rust-bytecheck-0.6)
-        ("rust-bytes" ,rust-bytes-1)
-        ("rust-hashbrown" ,rust-hashbrown-0.12)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-ptr-meta" ,rust-ptr-meta-0.1)
-        ("rust-rend" ,rust-rend-0.4)
-        ("rust-rkyv-derive" ,rust-rkyv-derive-0.7)
-        ("rust-seahash" ,rust-seahash-4)
-        ("rust-smallvec" ,rust-smallvec-1)
-        ("rust-smol-str" ,rust-smol-str-0.2)
-        ("rust-tinyvec" ,rust-tinyvec-1)
-        ("rust-uuid" ,rust-uuid-1))))
-    (home-page "https://github.com/rkyv/rkyv")
-    (synopsis "Zero-copy deserialization framework for Rust")
-    (description "Rkyv is a zero-copy deserialization framework for Rust.")
-    (license license:expat)))
-
-(define-public rust-rkyv-0.6
-  (package
-    (inherit rust-rkyv-0.7)
-    (name "rust-rkyv")
-    (version "0.6.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rkyv" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "01wsn0i8gsw958j892w8i4fyzjdsyhrh7c5zajig049kbqz5n4yb"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bytecheck" ,rust-bytecheck-0.5)
-        ("rust-memoffset" ,rust-memoffset-0.6)
-        ("rust-ptr-meta" ,rust-ptr-meta-0.1)
-        ("rust-rkyv-derive" ,rust-rkyv-derive-0.6)
-        ("rust-seahash" ,rust-seahash-4))))))
-
-
-(define-public rust-rkyv-derive-0.7
-  (package
-    (name "rust-rkyv-derive")
-    (version "0.7.44")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "rkyv_derive" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0rbwvbxka171bvhj60yjaxn77ipi5d1nwknnp5i6ypp2ipzxzpd7"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quote" ,rust-quote-1)
-                       ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/rkyv/rkyv")
-    (synopsis "Derive macro for zero-copy deserialization framework")
-    (description "This package provides a Derive macro for the rkyv
-deserialization framework.")
-    (license license:expat)))
-
-(define-public rust-rkyv-derive-0.6
-  (package
-    (inherit rust-rkyv-derive-0.7)
-    (name "rust-rkyv-derive")
-    (version "0.6.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rkyv_derive" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1mc7rnps41gdywahsffqlypsp9jqmp0r6hlh2nxm31bddfgli3xs"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))))
-
 (define-public rust-ryu-1
   (package
     (name "rust-ryu")
-- 
2.41.0

[bug#70606] [PATCH rust-team 024/101] gnu: Place rust-hawktracer-proc-macro-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-hawktracer-proc-macro-0.4,
rust-hawktracer-normal-macro-0.4): Swap variables.

Change-Id: I8d0f1b56947517d3d625dd37828215ea5ead03a4
---
 gnu/packages/crates-io.scm | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d3ebcf4539..97a1718b2c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64419,55 +64419,55 @@ (define-public rust-rust-hawktracer-0.7
      "Rust bindings for hawktracer profiling library.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-rust-hawktracer-proc-macro-0.4
+(define-public rust-rust-hawktracer-normal-macro-0.4
   (package
-    (name "rust-rust-hawktracer-proc-macro")
+    (name "rust-rust-hawktracer-normal-macro")
     (version "0.4.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri "rust_hawktracer_proc_macro" version))
+        (uri (crate-uri
+               "rust_hawktracer_normal_macro"
+               version))
         (file-name
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1qfksscfv8rbbzv2zb0i9sbbqmig0dr0vrma3c1kzsfmpsynlqnb"))))
+          "1sfjmipdbb5s498c150czr6wihjlkwwgla2jyg3cs7cyjich0mwa"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-rust-hawktracer-sys" ,rust-rust-hawktracer-sys-0.4))))
-    (home-page "https://github.com/AlexEne/rust_hawktracer_proc_macro")
-    (synopsis
-     "Helper crate for hawktracer profiling library")
+    (home-page "https://github.com/AlexEne/rust_hawktracer_normal_macro")
+    (synopsis "Helper crate for hawktracer profiling library")
     (description
-     "This package is a helper crate for hawktracer profiling library.")
+     "This package provides a helper crate for hawktracer profiling library.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-rust-hawktracer-normal-macro-0.4
+(define-public rust-rust-hawktracer-proc-macro-0.4
   (package
-    (name "rust-rust-hawktracer-normal-macro")
+    (name "rust-rust-hawktracer-proc-macro")
     (version "0.4.1")
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri
-               "rust_hawktracer_normal_macro"
-               version))
+        (uri (crate-uri "rust_hawktracer_proc_macro" version))
         (file-name
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1sfjmipdbb5s498c150czr6wihjlkwwgla2jyg3cs7cyjich0mwa"))))
+          "1qfksscfv8rbbzv2zb0i9sbbqmig0dr0vrma3c1kzsfmpsynlqnb"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-rust-hawktracer-sys" ,rust-rust-hawktracer-sys-0.4))))
-    (home-page "https://github.com/AlexEne/rust_hawktracer_normal_macro")
-    (synopsis "Helper crate for hawktracer profiling library")
+    (home-page "https://github.com/AlexEne/rust_hawktracer_proc_macro")
+    (synopsis
+     "Helper crate for hawktracer profiling library")
     (description
-     "This package provides a helper crate for hawktracer profiling library.")
+     "This package is a helper crate for hawktracer profiling library.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-rust-hawktracer-sys-0.4
-- 
2.41.0

[bug#70606] [PATCH rust-team 025/101] gnu: Place rust-etherparse-0.9 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-etherparse-0.13, rust-etherparse-0.9,
rust-eml-parser-0.1, rust-equivalent-1, rust-ethtool-0.2): Move
variables.

Change-Id: I1bc66c9de7dc5d72006686dfc6dd7fd23652eac8
---
 gnu/packages/crates-io.scm | 228 ++++++++++++++++++-------------------
 1 file changed, 114 insertions(+), 114 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 97a1718b2c..dd68a649d4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23053,6 +23053,28 @@ (define-public rust-embedded-io-0.4
                        ("rust-log" ,rust-log-0.4)
                        ("rust-tokio" ,rust-tokio-1))))))
 
+(define-public rust-eml-parser-0.1
+  (package
+    (name "rust-eml-parser")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "eml-parser" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0f82z4ryz4wchr0n99gj20s093ygx8ps0dqq6pr01ljcw8a0vqyr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/aeshirey/EmlParser/")
+    (synopsis "Library for parsing @file{.eml} files")
+    (description
+     "This package provides a library for parsing @file{.eml} files.")
+    (license license:asl2.0)))
+
 (define-public rust-emojis-0.5
   (package
     (name "rust-emojis")
@@ -24205,6 +24227,23 @@ (define-public rust-envy-0.4
 deserialized from environment variables.")
      (license license:expat)))
 
+(define-public rust-equivalent-1
+  (package
+    (name "rust-equivalent")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "equivalent" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1malmx5f4lkfvqasz319lq6gb3ddg19yzf9s8cykfsgzdmyq0hsl"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/cuviper/equivalent")
+    (synopsis "Traits for key comparison in maps")
+    (description "Traits for key comparison in maps.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-erased-serde-0.4
   (package
     (name "rust-erased-serde")
@@ -24533,6 +24572,46 @@ (define-public rust-etcetera-0.8
 they follow.  Etcetera, on the other hand, gives you the choice.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-etherparse-0.13
+  (package
+    (name "rust-etherparse")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "etherparse" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "146rcbnhlpcbl6c6csfhvz0227wbiwhk13md6acq8211b7m94wl2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.7))
+       #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
+                                   ("rust-proptest" ,rust-proptest-1))))
+    (home-page "https://github.com/JulianSchmid/etherparse")
+    (synopsis "Library for parsing & writing a bunch of packet based protocols")
+    (description
+     "This package provides a library for parsing & writing a bunch of packet
+based protocols (@code{EthernetII}, IPv4, IPv6, UDP, TCP ...).")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-etherparse-0.9
+  (package
+    (inherit rust-etherparse-0.13)
+    (name "rust-etherparse")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "etherparse" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01s86nj0k663mgxpj3r7y5wr50l5c3aq0pm4rpzyb7hz50i0k8ig"))))
+    (arguments
+     `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1))
+       #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
+                                   ("rust-proptest" ,rust-proptest-0.9))))))
+
 (define-public rust-ethnum-1
   (package
     (name "rust-ethnum")
@@ -24575,6 +24654,41 @@ (define-public rust-ethnum-intrinsics-1
      "This package contains LLVM generated 256-bit integer intrinsics.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ethtool-0.2
+  (package
+    (name "rust-ethtool")
+    (version "0.2.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ethtool" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0nivim6pzfvrnmyb0p7qv39q54vraa0z6jy0ims7gp0panih93hx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--release" "--"
+                            "--skip=test_dump_link_modes")
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-async-std" ,rust-async-std-1)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-genetlink" ,rust-genetlink-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-netlink-packet-core" ,rust-netlink-packet-core-0.7)
+                       ("rust-netlink-packet-generic" ,rust-netlink-packet-generic-0.3)
+                       ("rust-netlink-packet-utils" ,rust-netlink-packet-utils-0.5)
+                       ("rust-netlink-proto" ,rust-netlink-proto-0.11)
+                       ("rust-netlink-sys" ,rust-netlink-sys-0.8)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.9)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://docs.rs/ethtool/latest/ethtool/")
+    (synopsis "Linux Ethtool Communication Library")
+    (description "Linux Ethtool Communication Library.")
+    (license license:expat)))
+
 (define-public rust-eui48-1
   (package
     (name "rust-eui48")
@@ -64279,120 +64393,6 @@ (define-public rust-rust-embed-utils-5
     (arguments
      `(#:cargo-inputs (("rust-walkdir" ,rust-walkdir-2))))))
 
-(define-public rust-eml-parser-0.1
-  (package
-    (name "rust-eml-parser")
-    (version "0.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "eml-parser" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0f82z4ryz4wchr0n99gj20s093ygx8ps0dqq6pr01ljcw8a0vqyr"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-regex" ,rust-regex-1))))
-    (home-page "https://github.com/aeshirey/EmlParser/")
-    (synopsis "Library for parsing @file{.eml} files")
-    (description
-     "This package provides a library for parsing @file{.eml} files.")
-    (license license:asl2.0)))
-
-(define-public rust-equivalent-1
-  (package
-    (name "rust-equivalent")
-    (version "1.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "equivalent" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1malmx5f4lkfvqasz319lq6gb3ddg19yzf9s8cykfsgzdmyq0hsl"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/cuviper/equivalent")
-    (synopsis "Traits for key comparison in maps")
-    (description "Traits for key comparison in maps.")
-    (license (list license:asl2.0 license:expat))))
-
-(define-public rust-ethtool-0.2
-  (package
-    (name "rust-ethtool")
-    (version "0.2.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "ethtool" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0nivim6pzfvrnmyb0p7qv39q54vraa0z6jy0ims7gp0panih93hx"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-test-flags '("--release" "--"
-                            "--skip=test_dump_link_modes")
-       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
-                       ("rust-async-std" ,rust-async-std-1)
-                       ("rust-byteorder" ,rust-byteorder-1)
-                       ("rust-futures" ,rust-futures-0.3)
-                       ("rust-genetlink" ,rust-genetlink-0.2)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-netlink-packet-core" ,rust-netlink-packet-core-0.7)
-                       ("rust-netlink-packet-generic" ,rust-netlink-packet-generic-0.3)
-                       ("rust-netlink-packet-utils" ,rust-netlink-packet-utils-0.5)
-                       ("rust-netlink-proto" ,rust-netlink-proto-0.11)
-                       ("rust-netlink-sys" ,rust-netlink-sys-0.8)
-                       ("rust-thiserror" ,rust-thiserror-1)
-                       ("rust-tokio" ,rust-tokio-1))
-       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.9)
-                                   ("rust-tokio" ,rust-tokio-1))))
-    (home-page "https://docs.rs/ethtool/latest/ethtool/")
-    (synopsis "Linux Ethtool Communication Library")
-    (description "Linux Ethtool Communication Library.")
-    (license license:expat)))
-
-(define-public rust-etherparse-0.13
-  (package
-    (name "rust-etherparse")
-    (version "0.13.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "etherparse" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "146rcbnhlpcbl6c6csfhvz0227wbiwhk13md6acq8211b7m94wl2"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.7))
-       #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
-                                   ("rust-proptest" ,rust-proptest-1))))
-    (home-page "https://github.com/JulianSchmid/etherparse")
-    (synopsis "Library for parsing & writing a bunch of packet based protocols")
-    (description
-     "This package provides a library for parsing & writing a bunch of packet
-based protocols (@code{EthernetII}, IPv4, IPv6, UDP, TCP ...).")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-etherparse-0.9
-  (package
-    (inherit rust-etherparse-0.13)
-    (name "rust-etherparse")
-    (version "0.9.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "etherparse" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "01s86nj0k663mgxpj3r7y5wr50l5c3aq0pm4rpzyb7hz50i0k8ig"))))
-    (arguments
-     `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1))
-       #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
-                                   ("rust-proptest" ,rust-proptest-0.9))))))
-
 (define-public rust-rust-hawktracer-0.7
   (package
     (name "rust-rust-hawktracer")
-- 
2.41.0

[bug#70606] [PATCH rust-team 026/101] gnu: Place rust-rust-htslib-0.38 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rust-htslib-0.38): Move variable.

Change-Id: I0792e821d5ee8951abc1de89f0ad74e24d5e4406
---
 gnu/packages/crates-io.scm | 83 ++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 43 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dd68a649d4..902da28db8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64090,49 +64090,6 @@ (define-public rust-rusqlite-macros-0.1
      `(#:cargo-inputs (("rust-fallible-iterator" ,rust-fallible-iterator-0.3)
                        ("rust-sqlite3-parser" ,rust-sqlite3-parser-0.12))))))
 
-(define-public rust-rust-htslib-0.38
-  (package
-    (name "rust-rust-htslib")
-    (version "0.38.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "rust-htslib" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "070sihnvyiyqcw8yjkdl8hvav598bsw36m722phgd2b394k6djia"))))
-    (build-system cargo-build-system)
-    (arguments
-     ;; TODO: cannot find openssl_src
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bio-types" ,rust-bio-types-0.12)
-        ("rust-byteorder" ,rust-byteorder-1)
-        ("rust-custom-derive" ,rust-custom-derive-0.1)
-        ("rust-derive-new" ,rust-derive-new-0.5)
-        ("rust-hts-sys" ,rust-hts-sys-2)
-        ("rust-ieee754" ,rust-ieee754-0.2)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-linear-map" ,rust-linear-map-1)
-        ("rust-newtype-derive" ,rust-newtype-derive-0.1)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-bytes" ,rust-serde-bytes-0.11)
-        ("rust-thiserror" ,rust-thiserror-1)
-        ("rust-url" ,rust-url-2))
-       #:cargo-development-inputs
-       (("rust-bincode" ,rust-bincode-1)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-0.6))))
-    (inputs (list openssl))
-    (native-inputs (list pkg-config))
-    (home-page "https://github.com/rust-bio/rust-htslib.git")
-    (synopsis "HTSlib bindings and API for reading and writing BAM files")
-    (description
-     "This library provides HTSlib bindings and a high level Rust API for
-reading and writing BAM files.")
-    (license license:expat)))
-
 (define-public rust-rust-base58-0.0
   (package
     (name "rust-rust-base58")
@@ -64515,6 +64472,46 @@ (define-public rust-rust-hawktracer-sys-0.4
      "This package provides a sys crate for the rust_hawktracer library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rust-htslib-0.38
+  (package
+    (name "rust-rust-htslib")
+    (version "0.38.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rust-htslib" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "070sihnvyiyqcw8yjkdl8hvav598bsw36m722phgd2b394k6djia"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-bio-types" ,rust-bio-types-0.12)
+                       ("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-custom-derive" ,rust-custom-derive-0.1)
+                       ("rust-derive-new" ,rust-derive-new-0.5)
+                       ("rust-hts-sys" ,rust-hts-sys-2)
+                       ("rust-ieee754" ,rust-ieee754-0.2)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-linear-map" ,rust-linear-map-1)
+                       ("rust-newtype-derive" ,rust-newtype-derive-0.1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1)
+                                   ("rust-pretty-assertions" ,rust-pretty-assertions-0.6))))
+    (inputs (list openssl))
+    (native-inputs (list pkg-config))
+    (home-page "https://github.com/rust-bio/rust-htslib.git")
+    (synopsis "HTSlib bindings and API for reading and writing BAM files")
+    (description
+     "This library provides HTSlib bindings and a high level Rust API for
+reading and writing BAM files.")
+    (license license:expat)))
+
 (define-public rust-rust-ini-0.18
   (package
     (name "rust-rust-ini")
-- 
2.41.0

[bug#70606] [PATCH rust-team 027/101] gnu: Place rust-rust-rawkey-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rust-rawkey-0.1): Move variable.

Change-Id: I0720cd82837761d45c3139317f07cb72b87a4e25
---
 gnu/packages/crates-io.scm | 50 +++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 902da28db8..0a0d8e59ed 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60789,6 +60789,31 @@ (define-public rust-raw-cpuid-8
         ("rust-libc" ,rust-libc-0.2)
         ("rust-rustversion" ,rust-rustversion-0.1))))))
 
+(define-public rust-rawkey-0.1
+  (package
+    (name "rust-rawkey")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rawkey" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1bgbb0pd8wbhbwib2d39x2r1m8kasw8x3w13bdb4s17g6nnfzmks"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-readkey" ,rust-readkey-0.1)
+        ("rust-user32-sys" ,rust-user32-sys-0.2)
+        ("rust-winapi" ,rust-winapi-0.3)
+        ("rust-x11" ,rust-x11-2))))
+    (home-page "https://github.com/jonathandturner/rawkey")
+    (synopsis "Raw terminal key input")
+    (description
+     "This package provides support for raw key input in terminals.")
+    (license license:expat)))
+
 (define-public rust-rawpointer-0.2
   (package
     (name "rust-rawpointer")
@@ -60901,31 +60926,6 @@ (define-public rust-rayon-0.8
        ("rust-rand" ,rust-rand-0.3)
        ("rust-rustc-serialize" ,rust-rustc-serialize-0.3))))))
 
-(define-public rust-rawkey-0.1
-  (package
-    (name "rust-rawkey")
-    (version "0.1.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rawkey" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1bgbb0pd8wbhbwib2d39x2r1m8kasw8x3w13bdb4s17g6nnfzmks"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-readkey" ,rust-readkey-0.1)
-        ("rust-user32-sys" ,rust-user32-sys-0.2)
-        ("rust-winapi" ,rust-winapi-0.3)
-        ("rust-x11" ,rust-x11-2))))
-    (home-page "https://github.com/jonathandturner/rawkey")
-    (synopsis "Raw terminal key input")
-    (description
-     "This package provides support for raw key input in terminals.")
-    (license license:expat)))
-
 (define-public rust-rayon-core-1
   (package
     (name "rust-rayon-core")
-- 
2.41.0

[bug#70606] [PATCH rust-team 028/101] gnu: Place rust-pyo3-* packages in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pyo3-0.20, rust-pyo3-0.18,
rust-pyo3-0.16, rust-pyo3-0.15, rust-pyo3-0.13,
rust-pyo3-macros-backend-0.20, rust-pyo3-macros-backend-0.19,
rust-pyo3-macros-backend-0.18, rust-pyo3-macros-backend-0.16,
rust-pyo3-macros-backend-0.15, rust-pyo3-macros-backend-0.13,
rust-pyo3-macros-0.13): Swap variables.

Change-Id: I54f4219b5ffe840ccdaef0eb9bac973488eb1daf
---
 gnu/packages/crates-io.scm | 712 ++++++++++++++++++-------------------
 1 file changed, 356 insertions(+), 356 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0a0d8e59ed..395fb72ecf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57806,6 +57806,285 @@ (define-public rust-pwd-1
     (description "This package provides a safe interface to @code{pwd.h}.")
     (license license:public-domain)))
 
+(define-public rust-pyo3-0.20
+  (package
+    (name "rust-pyo3")
+    (version "0.20.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pyo3" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1q3g7ppg2qskigbgqg3w9280klkil5is9hhyps1ykl2hb1xdr2cs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-either" ,rust-either-1)
+                       ("rust-eyre" ,rust-eyre-0.6)
+                       ("rust-hashbrown" ,rust-hashbrown-0.14)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-indoc" ,rust-indoc-2)
+                       ("rust-inventory" ,rust-inventory-0.3)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-memoffset" ,rust-memoffset-0.9)
+                       ("rust-num-bigint" ,rust-num-bigint-0.4)
+                       ("rust-num-complex" ,rust-num-complex-0.4)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.20)
+                       ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.20)
+                       ("rust-pyo3-macros" ,rust-pyo3-macros-0.20)
+                       ("rust-rust-decimal" ,rust-rust-decimal-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-unindent" ,rust-unindent-0.2))
+       #:cargo-development-inputs (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
+                                   ("rust-chrono" ,rust-chrono-0.4)
+                                   ("rust-proptest" ,rust-proptest-1)
+                                   ("rust-rayon" ,rust-rayon-1)
+                                   ("rust-send-wrapper" ,rust-send-wrapper-0.6)
+                                   ("rust-serde" ,rust-serde-1)
+                                   ("rust-serde-json" ,rust-serde-json-1)
+                                   ("rust-trybuild" ,rust-trybuild-1)
+                                   ("rust-widestring" ,rust-widestring-0.5))))
+    (inputs (list python))
+    (home-page "https://github.com/pyo3/pyo3")
+    (synopsis "Rust bindings for the Python interpreter")
+    (description
+     "This package provides Rust bindings for Python, including tools for
+creating native Python extension modules.  Running and interacting with
+Python code from a Rust binary is also supported.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-pyo3-0.19
+  (package
+    (inherit rust-pyo3-0.20)
+    (name "rust-pyo3")
+    (version "0.19.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0f1aqx947mzsrk05zdm9w2702lj5k9s97y9w9lxwkp2avk7sd0g6"))))
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=exceptions::PyUnicodeDecodeError::new_utf8")
+       #:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-eyre" ,rust-eyre-0.6)
+        ("rust-hashbrown" ,rust-hashbrown-0.14)
+        ("rust-indexmap" ,rust-indexmap-2)
+        ("rust-indoc" ,rust-indoc-1)
+        ("rust-inventory" ,rust-inventory-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-memoffset" ,rust-memoffset-0.9)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
+        ("rust-num-complex" ,rust-num-complex-0.4)
+        ("rust-parking-lot" ,rust-parking-lot-0.12)
+        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.19)
+        ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.19)
+        ("rust-pyo3-macros" ,rust-pyo3-macros-0.19)
+        ("rust-rust-decimal" ,rust-rust-decimal-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-unindent" ,rust-unindent-0.1))
+       #:cargo-development-inputs
+       (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-proptest" ,rust-proptest-0.10)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rust-decimal" ,rust-rust-decimal-1)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-send-wrapper" ,rust-send-wrapper-0.6)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-widestring" ,rust-widestring-0.5))))))
+
+(define-public rust-pyo3-0.18
+  (package
+    (inherit rust-pyo3-0.19)
+    (name "rust-pyo3")
+    (version "0.18.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "02914yszvcg7qzh1kkrhiz8qqi0p9pbzi1cpmbyk9fii6xdsrcg3"))))
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=test_compile_errors"
+         "--skip=exceptions::PyUnicodeDecodeError::new_utf8")
+       #:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-eyre" ,rust-eyre-0.6)
+        ("rust-hashbrown" ,rust-hashbrown-0.12)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-indoc" ,rust-indoc-1)
+        ("rust-inventory" ,rust-inventory-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-memoffset" ,rust-memoffset-0.8)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
+        ("rust-num-complex" ,rust-num-complex-0.4)
+        ("rust-parking-lot" ,rust-parking-lot-0.12)
+        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.18)
+        ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.18)
+        ("rust-pyo3-macros" ,rust-pyo3-macros-0.18)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-unindent" ,rust-unindent-0.1))
+       #:cargo-development-inputs
+       (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-proptest" ,rust-proptest-0.10)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-send-wrapper" ,rust-send-wrapper-0.6)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-widestring" ,rust-widestring-0.5))))))
+
+(define-public rust-pyo3-0.16
+  (package
+    (inherit rust-pyo3-0.19)
+    (name "rust-pyo3")
+    (version "0.16.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pyo3" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1jn6nhp9a8i5kfwds6fzy3hzb938qim8bajp8gfkkcn9892c8802"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-eyre" ,rust-eyre-0.6)
+        ("rust-hashbrown" ,rust-hashbrown-0.11)
+        ("rust-indexmap" ,rust-indexmap-1.7)
+        ("rust-indoc" ,rust-indoc-1)
+        ("rust-inventory" ,rust-inventory-0.2)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
+        ("rust-num-complex" ,rust-num-complex-0.4)
+        ("rust-parking-lot" ,rust-parking-lot-0.11)
+        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16)
+        ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.16)
+        ("rust-pyo3-macros" ,rust-pyo3-macros-0.16)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-unindent" ,rust-unindent-0.1))
+       #:cargo-development-inputs
+       (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-proptest" ,rust-proptest-0.10)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-send-wrapper" ,rust-send-wrapper-0.5)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-widestring" ,rust-widestring-0.5))
+       ;; SIGSEGV: invalid memory reference
+       #:tests? #f))))
+
+(define-public rust-pyo3-0.15
+  (package
+    (inherit rust-pyo3-0.16)
+    (name "rust-pyo3")
+    (version "0.15.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pyo3" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ljp3m1frg8y50al4cbadwxfwwrgsvslmljclp4cf20y4ykm07fl"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* "Cargo.toml"
+                  (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                   (string-append "\"^" version)))))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-eyre" ,rust-eyre-0.6)
+        ("rust-hashbrown" ,rust-hashbrown-0.11)
+        ("rust-indexmap" ,rust-indexmap-1.7)
+        ("rust-indoc" ,rust-indoc-0.3)
+        ("rust-inventory" ,rust-inventory-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
+        ("rust-num-complex" ,rust-num-complex-0.4)
+        ("rust-parking-lot" ,rust-parking-lot-0.11)
+        ("rust-paste" ,rust-paste-0.1)
+        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.15)
+        ("rust-pyo3-macros" ,rust-pyo3-macros-0.15)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-unindent" ,rust-unindent-0.1))
+       #:cargo-development-inputs
+       (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
+        ("rust-bitflags" ,rust-bitflags-1)
+        ("rust-clap" ,rust-clap-2)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-half" ,rust-half-1)
+        ("rust-proptest" ,rust-proptest-0.10)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-trybuild" ,rust-trybuild-1))
+       ;; FIXME: fails to initialize Python interpreter.
+       #:tests? #f))))
+
+(define-public rust-pyo3-0.13
+  (package
+    (inherit rust-pyo3-0.15)
+    (name "rust-pyo3")
+    (version "0.13.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1hq965lgi25dn578fpn9hjva6zjr1c8rl7lxywijq44aw7lbhds8"))))
+    (arguments
+     `(#:skip-build? #true
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-ctor" ,rust-ctor-0.1)
+        ("rust-hashbrown" ,rust-hashbrown-0.9)
+        ("rust-indoc" ,rust-indoc-0.3)
+        ("rust-inventory" ,rust-inventory-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-num-bigint" ,rust-num-bigint-0.3)
+        ("rust-num-complex" ,rust-num-complex-0.3)
+        ("rust-parking-lot" ,rust-parking-lot-0.11)
+        ("rust-paste" ,rust-paste-0.1)
+        ("rust-pyo3-macros" ,rust-pyo3-macros-0.13)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-unindent" ,rust-unindent-0.1))
+       #:cargo-development-inputs
+       (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
+        ("rust-bitflags" ,rust-bitflags-1.2)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-half" ,rust-half-1)
+        ("rust-proptest" ,rust-proptest-0.10)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-trybuild" ,rust-trybuild-1))))))
+
 (define-public rust-pyo3-build-config-0.20
   (package
     (name "rust-pyo3-build-config")
@@ -58009,103 +58288,6 @@ (define-public rust-pyo3-log-0.8
 extension to python.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-pyo3-macros-backend-0.20
-  (package
-    (name "rust-pyo3-macros-backend")
-    (version "0.20.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pyo3-macros-backend" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "07w8x1wxm1ksx72jb0w1p2ssmg9zh95dsv4xmxyq4iqqhpa11j8g"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4)
-                       ("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quote" ,rust-quote-1)
-                       ("rust-syn" ,rust-syn-2))))
-    (home-page "https://github.com/pyo3/pyo3")
-    (synopsis "Code generation for PyO3")
-    (description
-     "This package provides code generation backends for PyO3.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-pyo3-macros-backend-0.19
-  (package
-    (inherit rust-pyo3-macros-backend-0.20)
-    (name "rust-pyo3-macros-backend")
-    (version "0.19.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "pyo3-macros-backend" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0dlm4pg29hjmlqx15gcy9cmnabvc8ycy60hcvjg8hm62flhw2zcl"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))))
-
-(define-public rust-pyo3-macros-backend-0.18
-  (package
-    (inherit rust-pyo3-macros-backend-0.19)
-    (name "rust-pyo3-macros-backend")
-    (version "0.18.3")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "pyo3-macros-backend" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "062rxf7cj1dn82yiaws3dmxw5qq9ssccq92jgdc210y4lh4gznlp"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))))
-
-(define-public rust-pyo3-macros-backend-0.16
-  (package
-    (inherit rust-pyo3-macros-backend-0.19)
-    (name "rust-pyo3-macros-backend")
-    (version "0.16.6")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "pyo3-macros-backend" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1f0y9vxmyq1cidk544pwg3my30f6xfqfgf42grw4gx4q5pl687v1"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))))
-
-(define-public rust-pyo3-macros-backend-0.15
-  (package
-    (inherit rust-pyo3-macros-backend-0.16)
-    (name "rust-pyo3-macros-backend")
-    (version "0.15.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pyo3-macros-backend" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "15bhc1xib9yz4l1sd2lk3nc7scbqsjfvgvlr3mj0xq0jqh92i32s"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.15)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (native-inputs (list python))))
-
 (define-public rust-pyo3-macros-0.20
   (package
     (name "rust-pyo3-macros")
@@ -58167,25 +58349,6 @@ (define-public rust-pyo3-macros-0.18
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-pyo3-macros-backend-0.13
-  (package
-    (inherit rust-pyo3-macros-backend-0.15)
-    (name "rust-pyo3-macros-backend")
-    (version "0.13.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "pyo3-macros-backend" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0rjxayd78l10hnyphk03bcvhm0jpsvnzn07lczhy7jsgv3jrgc47"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))))
-
 (define-public rust-pyo3-macros-0.16
   (package
     (inherit rust-pyo3-macros-0.19)
@@ -58224,303 +58387,140 @@ (define-public rust-pyo3-macros-0.15
         ("rust-syn" ,rust-syn-1))))
     (native-inputs (list python))))
 
-(define-public rust-pyo3-0.20
+(define-public rust-pyo3-macros-0.13
   (package
-    (name "rust-pyo3")
+    (inherit rust-pyo3-macros-0.15)
+    (name "rust-pyo3-macros")
+    (version "0.13.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3-macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1fxi5lx5dl7xh469gr5xckyjy3r3c5dqypzxcj0fbhzf1hq2qzx4"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.13)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
+
+(define-public rust-pyo3-macros-backend-0.20
+  (package
+    (name "rust-pyo3-macros-backend")
     (version "0.20.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (crate-uri "pyo3" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1q3g7ppg2qskigbgqg3w9280klkil5is9hhyps1ykl2hb1xdr2cs"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
-                       ("rust-cfg-if" ,rust-cfg-if-1)
-                       ("rust-chrono" ,rust-chrono-0.4)
-                       ("rust-either" ,rust-either-1)
-                       ("rust-eyre" ,rust-eyre-0.6)
-                       ("rust-hashbrown" ,rust-hashbrown-0.14)
-                       ("rust-indexmap" ,rust-indexmap-2)
-                       ("rust-indoc" ,rust-indoc-2)
-                       ("rust-inventory" ,rust-inventory-0.3)
-                       ("rust-libc" ,rust-libc-0.2)
-                       ("rust-memoffset" ,rust-memoffset-0.9)
-                       ("rust-num-bigint" ,rust-num-bigint-0.4)
-                       ("rust-num-complex" ,rust-num-complex-0.4)
-                       ("rust-parking-lot" ,rust-parking-lot-0.12)
-                       ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.20)
-                       ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.20)
-                       ("rust-pyo3-macros" ,rust-pyo3-macros-0.20)
-                       ("rust-rust-decimal" ,rust-rust-decimal-1)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-smallvec" ,rust-smallvec-1)
-                       ("rust-unindent" ,rust-unindent-0.2))
-       #:cargo-development-inputs (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
-                                   ("rust-chrono" ,rust-chrono-0.4)
-                                   ("rust-proptest" ,rust-proptest-1)
-                                   ("rust-rayon" ,rust-rayon-1)
-                                   ("rust-send-wrapper" ,rust-send-wrapper-0.6)
-                                   ("rust-serde" ,rust-serde-1)
-                                   ("rust-serde-json" ,rust-serde-json-1)
-                                   ("rust-trybuild" ,rust-trybuild-1)
-                                   ("rust-widestring" ,rust-widestring-0.5))))
-    (inputs (list python))
+       (method url-fetch)
+       (uri (crate-uri "pyo3-macros-backend" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07w8x1wxm1ksx72jb0w1p2ssmg9zh95dsv4xmxyq4iqqhpa11j8g"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
     (home-page "https://github.com/pyo3/pyo3")
-    (synopsis "Rust bindings for the Python interpreter")
+    (synopsis "Code generation for PyO3")
     (description
-     "This package provides Rust bindings for Python, including tools for
-creating native Python extension modules.  Running and interacting with
-Python code from a Rust binary is also supported.")
+     "This package provides code generation backends for PyO3.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-pyo3-0.19
+(define-public rust-pyo3-macros-backend-0.19
   (package
-    (inherit rust-pyo3-0.20)
-    (name "rust-pyo3")
+    (inherit rust-pyo3-macros-backend-0.20)
+    (name "rust-pyo3-macros-backend")
     (version "0.19.2")
     (source (origin
               (method url-fetch)
-              (uri (crate-uri "pyo3" version))
+              (uri (crate-uri "pyo3-macros-backend" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0f1aqx947mzsrk05zdm9w2702lj5k9s97y9w9lxwkp2avk7sd0g6"))))
+                "0dlm4pg29hjmlqx15gcy9cmnabvc8ycy60hcvjg8hm62flhw2zcl"))))
     (arguments
-     `(#:cargo-test-flags
-       '("--release" "--"
-         "--skip=exceptions::PyUnicodeDecodeError::new_utf8")
-       #:cargo-inputs
-       (("rust-anyhow" ,rust-anyhow-1)
-        ("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-eyre" ,rust-eyre-0.6)
-        ("rust-hashbrown" ,rust-hashbrown-0.14)
-        ("rust-indexmap" ,rust-indexmap-2)
-        ("rust-indoc" ,rust-indoc-1)
-        ("rust-inventory" ,rust-inventory-0.3)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-memoffset" ,rust-memoffset-0.9)
-        ("rust-num-bigint" ,rust-num-bigint-0.4)
-        ("rust-num-complex" ,rust-num-complex-0.4)
-        ("rust-parking-lot" ,rust-parking-lot-0.12)
-        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.19)
-        ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.19)
-        ("rust-pyo3-macros" ,rust-pyo3-macros-0.19)
-        ("rust-rust-decimal" ,rust-rust-decimal-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-unindent" ,rust-unindent-0.1))
-       #:cargo-development-inputs
-       (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-proptest" ,rust-proptest-0.10)
-        ("rust-rayon" ,rust-rayon-1)
-        ("rust-rust-decimal" ,rust-rust-decimal-1)
-        ("rust-rustversion" ,rust-rustversion-1)
-        ("rust-send-wrapper" ,rust-send-wrapper-0.6)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-trybuild" ,rust-trybuild-1)
-        ("rust-widestring" ,rust-widestring-0.5))))))
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-pyo3-0.18
+(define-public rust-pyo3-macros-backend-0.18
   (package
-    (inherit rust-pyo3-0.19)
-    (name "rust-pyo3")
+    (inherit rust-pyo3-macros-backend-0.19)
+    (name "rust-pyo3-macros-backend")
     (version "0.18.3")
     (source (origin
               (method url-fetch)
-              (uri (crate-uri "pyo3" version))
+              (uri (crate-uri "pyo3-macros-backend" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "02914yszvcg7qzh1kkrhiz8qqi0p9pbzi1cpmbyk9fii6xdsrcg3"))))
-    (arguments
-     `(#:cargo-test-flags
-       '("--release" "--"
-         "--skip=test_compile_errors"
-         "--skip=exceptions::PyUnicodeDecodeError::new_utf8")
-       #:cargo-inputs
-       (("rust-anyhow" ,rust-anyhow-1)
-        ("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-eyre" ,rust-eyre-0.6)
-        ("rust-hashbrown" ,rust-hashbrown-0.12)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-indoc" ,rust-indoc-1)
-        ("rust-inventory" ,rust-inventory-0.3)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-memoffset" ,rust-memoffset-0.8)
-        ("rust-num-bigint" ,rust-num-bigint-0.4)
-        ("rust-num-complex" ,rust-num-complex-0.4)
-        ("rust-parking-lot" ,rust-parking-lot-0.12)
-        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.18)
-        ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.18)
-        ("rust-pyo3-macros" ,rust-pyo3-macros-0.18)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-unindent" ,rust-unindent-0.1))
-       #:cargo-development-inputs
-       (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-criterion" ,rust-criterion-0.3)
-        ("rust-proptest" ,rust-proptest-0.10)
-        ("rust-rayon" ,rust-rayon-1)
-        ("rust-rustversion" ,rust-rustversion-1)
-        ("rust-send-wrapper" ,rust-send-wrapper-0.6)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-trybuild" ,rust-trybuild-1)
-        ("rust-widestring" ,rust-widestring-0.5))))))
-
-(define-public rust-pyo3-0.16
-  (package
-    (inherit rust-pyo3-0.19)
-    (name "rust-pyo3")
-    (version "0.16.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pyo3" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1jn6nhp9a8i5kfwds6fzy3hzb938qim8bajp8gfkkcn9892c8802"))))
+                "062rxf7cj1dn82yiaws3dmxw5qq9ssccq92jgdc210y4lh4gznlp"))))
     (arguments
      `(#:cargo-inputs
-       (("rust-anyhow" ,rust-anyhow-1)
-        ("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-eyre" ,rust-eyre-0.6)
-        ("rust-hashbrown" ,rust-hashbrown-0.11)
-        ("rust-indexmap" ,rust-indexmap-1.7)
-        ("rust-indoc" ,rust-indoc-1)
-        ("rust-inventory" ,rust-inventory-0.2)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-num-bigint" ,rust-num-bigint-0.4)
-        ("rust-num-complex" ,rust-num-complex-0.4)
-        ("rust-parking-lot" ,rust-parking-lot-0.11)
-        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16)
-        ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.16)
-        ("rust-pyo3-macros" ,rust-pyo3-macros-0.16)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-unindent" ,rust-unindent-0.1))
-       #:cargo-development-inputs
-       (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
-        ("rust-criterion" ,rust-criterion-0.3)
-        ("rust-proptest" ,rust-proptest-0.10)
-        ("rust-rustversion" ,rust-rustversion-1)
-        ("rust-send-wrapper" ,rust-send-wrapper-0.5)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-trybuild" ,rust-trybuild-1)
-        ("rust-widestring" ,rust-widestring-0.5))
-       ;; SIGSEGV: invalid memory reference
-       #:tests? #f))))
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-pyo3-macros-0.13
+(define-public rust-pyo3-macros-backend-0.16
   (package
-    (inherit rust-pyo3-macros-0.15)
-    (name "rust-pyo3-macros")
-    (version "0.13.2")
+    (inherit rust-pyo3-macros-backend-0.19)
+    (name "rust-pyo3-macros-backend")
+    (version "0.16.6")
     (source (origin
               (method url-fetch)
-              (uri (crate-uri "pyo3-macros" version))
+              (uri (crate-uri "pyo3-macros-backend" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1fxi5lx5dl7xh469gr5xckyjy3r3c5dqypzxcj0fbhzf1hq2qzx4"))))
+                "1f0y9vxmyq1cidk544pwg3my30f6xfqfgf42grw4gx4q5pl687v1"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.13)
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-pyo3-0.15
+(define-public rust-pyo3-macros-backend-0.15
   (package
-    (inherit rust-pyo3-0.16)
-    (name "rust-pyo3")
+    (inherit rust-pyo3-macros-backend-0.16)
+    (name "rust-pyo3-macros-backend")
     (version "0.15.2")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "pyo3" version))
+       (uri (crate-uri "pyo3-macros-backend" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0ljp3m1frg8y50al4cbadwxfwwrgsvslmljclp4cf20y4ykm07fl"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin (substitute* "Cargo.toml"
-                  (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
-                   (string-append "\"^" version)))))))
+        (base32 "15bhc1xib9yz4l1sd2lk3nc7scbqsjfvgvlr3mj0xq0jqh92i32s"))))
     (arguments
      `(#:cargo-inputs
-       (("rust-anyhow" ,rust-anyhow-1)
-        ("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-eyre" ,rust-eyre-0.6)
-        ("rust-hashbrown" ,rust-hashbrown-0.11)
-        ("rust-indexmap" ,rust-indexmap-1.7)
-        ("rust-indoc" ,rust-indoc-0.3)
-        ("rust-inventory" ,rust-inventory-0.1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-num-bigint" ,rust-num-bigint-0.4)
-        ("rust-num-complex" ,rust-num-complex-0.4)
-        ("rust-parking-lot" ,rust-parking-lot-0.11)
-        ("rust-paste" ,rust-paste-0.1)
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.15)
-        ("rust-pyo3-macros" ,rust-pyo3-macros-0.15)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-unindent" ,rust-unindent-0.1))
-       #:cargo-development-inputs
-       (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
-        ("rust-bitflags" ,rust-bitflags-1)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-criterion" ,rust-criterion-0.3)
-        ("rust-half" ,rust-half-1)
-        ("rust-proptest" ,rust-proptest-0.10)
-        ("rust-rustversion" ,rust-rustversion-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-trybuild" ,rust-trybuild-1))
-       ;; FIXME: fails to initialize Python interpreter.
-       #:tests? #f))))
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (native-inputs (list python))))
 
-(define-public rust-pyo3-0.13
+(define-public rust-pyo3-macros-backend-0.13
   (package
-    (inherit rust-pyo3-0.15)
-    (name "rust-pyo3")
+    (inherit rust-pyo3-macros-backend-0.15)
+    (name "rust-pyo3-macros-backend")
     (version "0.13.2")
     (source (origin
               (method url-fetch)
-              (uri (crate-uri "pyo3" version))
+              (uri (crate-uri "pyo3-macros-backend" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1hq965lgi25dn578fpn9hjva6zjr1c8rl7lxywijq44aw7lbhds8"))))
+                "0rjxayd78l10hnyphk03bcvhm0jpsvnzn07lczhy7jsgv3jrgc47"))))
     (arguments
-     `(#:skip-build? #true
+     `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-ctor" ,rust-ctor-0.1)
-        ("rust-hashbrown" ,rust-hashbrown-0.9)
-        ("rust-indoc" ,rust-indoc-0.3)
-        ("rust-inventory" ,rust-inventory-0.1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-num-bigint" ,rust-num-bigint-0.3)
-        ("rust-num-complex" ,rust-num-complex-0.3)
-        ("rust-parking-lot" ,rust-parking-lot-0.11)
-        ("rust-paste" ,rust-paste-0.1)
-        ("rust-pyo3-macros" ,rust-pyo3-macros-0.13)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-unindent" ,rust-unindent-0.1))
-       #:cargo-development-inputs
-       (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
-        ("rust-bitflags" ,rust-bitflags-1.2)
-        ("rust-criterion" ,rust-criterion-0.3)
-        ("rust-half" ,rust-half-1)
-        ("rust-proptest" ,rust-proptest-0.10)
-        ("rust-rustversion" ,rust-rustversion-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-trybuild" ,rust-trybuild-1))))))
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-pyproject-toml-0.8
   (package
-- 
2.41.0

[bug#70606] [PATCH rust-team 029/101] gnu: Place rust-pulldown-cmark-to-cmark-7 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pulldown-cmark-to-cmark-10,
rust-pulldown-cmark-to-cmark-7): Move variables.

Change-Id: I707a24ac468e3216ac84ae74b49d408f1f14de79
---
 gnu/packages/crates-io.scm | 100 ++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 52 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 395fb72ecf..f4419d1071 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57540,36 +57540,6 @@ (define-public rust-puffin-0.18
     (description "Simple instrumentation profiler for games.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-pulldown-cmark-to-cmark-10
-  (package
-    (name "rust-pulldown-cmark-to-cmark")
-    (version "10.0.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pulldown-cmark-to-cmark" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0gc366cmd5jxal9m95l17rvqsm4dn62lywc8v5gwq8vcjvhyd501"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9))
-       #:cargo-development-inputs
-       (("rust-indoc" ,rust-indoc-1)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-0.7))))
-    (home-page "https://github.com/Byron/pulldown-cmark-to-cmark")
-    (synopsis
-     "Convert pulldown-cmark Events back to the string they were parsed from")
-    (description
-     "A utility library which translates Event back to markdown.  It's the
-prerequisite for writing markdown filters which can work as
-@code{mdbook-preprocessors}.
-
-This library takes great pride in supporting everything that
-@code{pulldown-cmark} supports, including tables and footnotes and codeblocks
-in codeblocks, while assuring quality with a powerful test suite.")
-    (license license:asl2.0)))
-
 (define-public rust-pulldown-cmark-0.9
   (package
     (name "rust-pulldown-cmark")
@@ -57634,28 +57604,6 @@ (define-public rust-pulldown-cmark-0.8
          ("rust-regex" ,rust-regex-1)
          ("rust-tendril" ,rust-tendril-0.4))))))
 
-(define-public rust-pulldown-cmark-to-cmark-7
-  (package
-    (inherit rust-pulldown-cmark-to-cmark-10)
-    (name "rust-pulldown-cmark-to-cmark")
-    (version "7.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pulldown-cmark-to-cmark" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "03f6bnqjzchmzs4qaf63pirgj95b0x3l2rlp1wj1z27mp734phcb"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-pulldown-cmark" ,rust-pulldown-cmark-0.8))
-       #:cargo-development-inputs
-       (("rust-indoc" ,rust-indoc-1)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-0.7))))))
-
 (define-public rust-pulldown-cmark-0.4
   (package
     (inherit rust-pulldown-cmark-0.8)
@@ -57729,6 +57677,54 @@ (define-public rust-pulldown-cmark-0.1
        (("rust-bitflags" ,rust-bitflags-0.9)
         ("rust-getopts" ,rust-getopts-0.2))))))
 
+(define-public rust-pulldown-cmark-to-cmark-10
+  (package
+    (name "rust-pulldown-cmark-to-cmark")
+    (version "10.0.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pulldown-cmark-to-cmark" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gc366cmd5jxal9m95l17rvqsm4dn62lywc8v5gwq8vcjvhyd501"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9))
+       #:cargo-development-inputs (("rust-indoc" ,rust-indoc-1)
+                                   ("rust-pretty-assertions" ,rust-pretty-assertions-0.7))))
+    (home-page "https://github.com/Byron/pulldown-cmark-to-cmark")
+    (synopsis
+     "Convert pulldown-cmark Events back to the string they were parsed from")
+    (description
+     "A utility library which translates Event back to markdown.  It's the
+prerequisite for writing markdown filters which can work as
+@code{mdbook-preprocessors}.
+
+This library takes great pride in supporting everything that
+@code{pulldown-cmark} supports, including tables and footnotes and codeblocks
+in codeblocks, while assuring quality with a powerful test suite.")
+    (license license:asl2.0)))
+
+(define-public rust-pulldown-cmark-to-cmark-7
+  (package
+    (inherit rust-pulldown-cmark-to-cmark-10)
+    (name "rust-pulldown-cmark-to-cmark")
+    (version "7.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pulldown-cmark-to-cmark" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03f6bnqjzchmzs4qaf63pirgj95b0x3l2rlp1wj1z27mp734phcb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-pulldown-cmark" ,rust-pulldown-cmark-0.8))
+       #:cargo-development-inputs (("rust-indoc" ,rust-indoc-1)
+                                   ("rust-pretty-assertions" ,rust-pretty-assertions-0.7))))))
+
 (define-public rust-pulse-0.5
   (package
     (name "rust-pulse")
-- 
2.41.0

[bug#70606] [PATCH rust-team 030/101] gnu: Place rust-publicsuffix-2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-publicsuffix-2, rust-publicsuffix-1):
Move variables.

Change-Id: I4aa22027c285f2715c6ae401fb79b3d60f571aa2
---
 gnu/packages/crates-io.scm | 97 ++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 51 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f4419d1071..dc9324793b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57396,57 +57396,6 @@ (define-public rust-ptyprocess-0.4
      "This package provides a library to work with PTY/TTY on Unix systems.")
     (license license:expat)))
 
-(define-public rust-publicsuffix-2
-  (package
-    (name "rust-publicsuffix")
-    (version "2.2.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "publicsuffix" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0mvls29klp6xk16n8114sr1llhahy6fy8qi9kbwzf6mflnyw3a4n"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-hashbrown" ,rust-hashbrown-0.12)
-        ("rust-idna" ,rust-idna-0.3)
-        ("rust-psl-types" ,rust-psl-types-2)
-        ("rust-unicase" ,rust-unicase-2))
-       #:cargo-development-inputs
-       (("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-rspec" ,rust-rspec-1))))
-    (home-page "https://github.com/rushmorem/publicsuffix")
-    (synopsis "Domain name parsing and email address validation")
-    (description "This package provides robust domain name parsing and RFC
-compliant email address validation.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-publicsuffix-1
-  (package
-    (inherit rust-publicsuffix-2)
-    (name "rust-publicsuffix")
-    (version "1.5.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "publicsuffix" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0yvmjpywfyypfr17kxiwy6ssykgv8nmcdhfakas6548pfn8a9fiv"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-error-chain" ,rust-error-chain-0.12)
-        ("rust-idna" ,rust-idna-0.2)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-native-tls" ,rust-native-tls-0.2)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-url" ,rust-url-2))))))
-
 (define-public rust-public-api-0.33
   (package
     (name "rust-public-api")
@@ -57509,6 +57458,52 @@ (define-public rust-public-api-0.32
                                    ("rust-rustdoc-json" ,rust-rustdoc-json-0.8)
                                    ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-publicsuffix-2
+  (package
+    (name "rust-publicsuffix")
+    (version "2.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "publicsuffix" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0mvls29klp6xk16n8114sr1llhahy6fy8qi9kbwzf6mflnyw3a4n"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-hashbrown" ,rust-hashbrown-0.12)
+                       ("rust-idna" ,rust-idna-0.3)
+                       ("rust-psl-types" ,rust-psl-types-2)
+                       ("rust-unicase" ,rust-unicase-2))
+       #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1)
+                                   ("rust-rspec" ,rust-rspec-1))))
+    (home-page "https://github.com/rushmorem/publicsuffix")
+    (synopsis "Domain name parsing and email address validation")
+    (description "This package provides robust domain name parsing and RFC
+compliant email address validation.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-publicsuffix-1
+  (package
+    (inherit rust-publicsuffix-2)
+    (name "rust-publicsuffix")
+    (version "1.5.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "publicsuffix" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0yvmjpywfyypfr17kxiwy6ssykgv8nmcdhfakas6548pfn8a9fiv"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-error-chain" ,rust-error-chain-0.12)
+                       ("rust-idna" ,rust-idna-0.2)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-native-tls" ,rust-native-tls-0.2)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-url" ,rust-url-2))))))
+
 (define-public rust-puffin-0.18
   (package
     (name "rust-puffin")
-- 
2.41.0

[bug#70606] [PATCH rust-team 031/101] gnu: Place rust-pretty-hex-0.3 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pretty-hex-0.3): Move variable.

Change-Id: Ieb7c62fbd2f99dfc66b2bb02123f300562dca11a
---
 gnu/packages/crates-io.scm | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dc9324793b..75d962ffc7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55590,6 +55590,25 @@ (define-public rust-pretty-env-logger-0.3
         ("rust-chrono" ,rust-chrono-0.4)
         ("rust-env-logger" ,rust-env-logger-0.6))))))
 
+(define-public rust-pretty-hex-0.3
+  (package
+    (name "rust-pretty-hex")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pretty-hex" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mf8xvlfri4impj2paj4azx7hxh7l0i38cjyib1hiikwvlqhiyn6"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list #:cargo-development-inputs `(("rust-heapless" ,rust-heapless-0.5))))
+    (home-page "https://github.com/wolandr/pretty-hex")
+    (synopsis "Prettified output of hexadecimal byte slices")
+    (description "Pretty hex dump of byte slices in the common style.")
+    (license license:expat)))
+
 (define-public rust-prettyplease-0.2
   (package
     (name "rust-prettyplease")
@@ -55633,25 +55652,6 @@ (define-public rust-prettyplease-0.1
        #:cargo-development-inputs
        (("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-pretty-hex-0.3
-  (package
-    (name "rust-pretty-hex")
-    (version "0.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pretty-hex" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1mf8xvlfri4impj2paj4azx7hxh7l0i38cjyib1hiikwvlqhiyn6"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:cargo-development-inputs `(("rust-heapless" ,rust-heapless-0.5))))
-    (home-page "https://github.com/wolandr/pretty-hex")
-    (synopsis "Prettified output of hexadecimal byte slices")
-    (description "Pretty hex dump of byte slices in the common style.")
-    (license license:expat)))
-
 (define-public rust-prettytable-rs-0.8
   (package
     (name "rust-prettytable-rs")
-- 
2.41.0

[bug#70606] [PATCH rust-team 032/101] gnu: Place rust-ping-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ping-0.4): Move variable.

Change-Id: I6f637b72f0682922b1ae485de2dd603937198715
---
 gnu/packages/crates-io.scm | 45 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 75d962ffc7..caf03a9d2d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53043,29 +53043,6 @@ (define-public rust-pin-project-1
      "This package provides a crate for safe and ergonomic pin-projection.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-ping-0.4
-  (package
-    (name "rust-ping")
-    (version "0.4.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "ping" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0h8iyphd5c6k609635ja813isyplnzrlz8hgp0pfrb2v39xahw33"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f          ; Tests require network access.
-       #:cargo-inputs
-       (("rust-rand" ,rust-rand-0.8)
-        ("rust-socket2" ,rust-socket2-0.4)
-        ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/aisk/ping")
-    (synopsis "ICMP library for Rust")
-    (description "This package provides an ICMP library for Rust.")
-    (license license:expat)))
-
 (define-public rust-pin-project-0.4
   (package
     (inherit rust-pin-project-1)
@@ -53209,6 +53186,28 @@ (define-public rust-pin-utils-0.1
     (description "This crate provides utilities for pinning values on the stack.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ping-0.4
+  (package
+    (name "rust-ping")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ping" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0h8iyphd5c6k609635ja813isyplnzrlz8hgp0pfrb2v39xahw33"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs (("rust-rand" ,rust-rand-0.8)
+                       ("rust-socket2" ,rust-socket2-0.4)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/aisk/ping")
+    (synopsis "ICMP library for Rust")
+    (description "This package provides an ICMP library for Rust.")
+    (license license:expat)))
+
 (define-public rust-pinot-0.1
   (package
     (name "rust-pinot")
-- 
2.41.0

[bug#70606] [PATCH rust-team 033/101] gnu: Place rust-perf-event-open-sys-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-perf-event-open-sys-1): Move
variable.

Change-Id: I3b2880b3bf4a5089ceb66ddd715bcc4c0ee62106
---
 gnu/packages/crates-io.scm | 50 ++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index caf03a9d2d..45b68e87b9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -52152,33 +52152,6 @@ (define-public rust-peresil-0.3
      "This package provides a simple and simplistic string parsing library.")
     (license license:expat)))
 
-(define-public rust-perf-event-open-sys-1
-  (package
-    (name "rust-perf-event-open-sys")
-    (version "1.0.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "perf-event-open-sys" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "06jnb2jkwjinpj4hc41kbwsqbxdb1ywy5vci4ggly8rcvbsyv6yf"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2))))
-    (home-page
-     "https://github.com/jimblandy/perf-event-open-sys.git")
-    (synopsis
-     "Unsafe, direct bindings for Linux's perf_event_open system call")
-    (description
-     "This package provides a unsafe, direct bindings for Linux's
-perf_event_open system call, with associated types and constants.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-perf-event-0.4
   (package
     (name "rust-perf-event")
@@ -52206,6 +52179,29 @@ (define-public rust-perf-event-0.4
      "This package provides a Rust interface to Linux performance monitoring.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-perf-event-open-sys-1
+  (package
+    (name "rust-perf-event-open-sys")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "perf-event-open-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06jnb2jkwjinpj4hc41kbwsqbxdb1ywy5vci4ggly8rcvbsyv6yf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://github.com/jimblandy/perf-event-open-sys.git")
+    (synopsis
+     "Unsafe, direct bindings for Linux's perf_event_open system call")
+    (description
+     "This package provides a unsafe, direct bindings for Linux's
+perf_event_open system call, with associated types and constants.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-permutohedron-0.2
   (package
     (name "rust-permutohedron")
-- 
2.41.0

[bug#70606] [PATCH rust-team 034/101] gnu: Place rust-parasail-sys-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-parasail-sys-0.2): Move variable.

Change-Id: Ib1c25e9f2ac8ae70db6da056f3c82c6257425264
---
 gnu/packages/crates-io.scm | 65 +++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 45b68e87b9..a53207af16 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -50120,39 +50120,6 @@ (define-public rust-pancurses-0.16
     (description "@code{pancurses} is a @code{curses} library for Rust.")
     (license license:expat)))
 
-(define-public rust-parasail-sys-0.2
-  (package
-    (name "rust-parasail-sys")
-    (version "0.2.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "parasail-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "156fwfdbcfpzmx4k274jqdp8jzmllmdnhd1ibnh7kgd9cp7ni6ac"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-build-flags '("-vv")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'set-shell-for-configure-script
-           (lambda _
-             (setenv "SHELL" (which "sh"))
-             (setenv "CONFIG_SHELL" (which "sh")))))
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2))))
-    (inputs
-     (list zlib))
-    (native-inputs
-     (list libtool))
-    (home-page "https://github.com/anp/parasailors")
-    (synopsis "Bindings to the parasail pairwise genetic sequence alignment library")
-    (description
-     "This packgae provides native bindings to the parasail pairwise genetic
-sequence alignment library.")
-    (license license:expat)))
-
 (define-public rust-pandoc-0.8
   (package
     (name "rust-pandoc")
@@ -50198,6 +50165,38 @@ (define-public rust-papergrid-0.10
     (description "Papergrid is a core library to print a table.")
     (license license:expat)))
 
+(define-public rust-parasail-sys-0.2
+  (package
+    (name "rust-parasail-sys")
+    (version "0.2.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "parasail-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "156fwfdbcfpzmx4k274jqdp8jzmllmdnhd1ibnh7kgd9cp7ni6ac"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-build-flags '("-vv")
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'set-shell-for-configure-script
+                    (lambda _
+                      (setenv "SHELL"
+                              (which "sh"))
+                      (setenv "CONFIG_SHELL"
+                              (which "sh")))))
+       #:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
+    (inputs (list zlib))
+    (native-inputs (list libtool))
+    (home-page "https://github.com/anp/parasailors")
+    (synopsis
+     "Bindings to the parasail pairwise genetic sequence alignment library")
+    (description
+     "This packgae provides native bindings to the parasail pairwise genetic
+sequence alignment library.")
+    (license license:expat)))
+
 (define-public rust-parasailors-0.3
   (package
     (name "rust-parasailors")
-- 
2.41.0

[bug#70606] [PATCH rust-team 035/101] gnu: Place rust-owo-colors-4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-owo-colors-4, rust-owo-colors-3):
Move variables.

Change-Id: Ib40b15c9f410365881f8f0eb9a746c31b8ed609d
---
 gnu/packages/crates-io.scm | 72 +++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a53207af16..607bb76de4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49773,42 +49773,6 @@ (define-public rust-owned-ttf-parser-0.19
      "This package provides a ttf-parser plus support for owned data.")
     (license license:asl2.0)))
 
-(define-public rust-owo-colors-4
-  (package
-    (name "rust-owo-colors")
-    (version "4.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "owo-colors" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0grsk47cllj0s4nc4qxvy4gdhj2lyiglbqx4lmw2m7grdmq59zya"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-supports-color" ,rust-supports-color-2))))
-    (home-page "https://github.com/jam1garner/owo-colors")
-    (synopsis "Zero-allocation terminal colors that'll make people go owo")
-    (description
-     "This package provides zero-allocation terminal colors that'll make people go
-owo.")
-    (license license:expat)))
-
-(define-public rust-owo-colors-3
-  (package
-    (inherit rust-owo-colors-4)
-    (name "rust-owo-colors")
-    (version "3.5.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "owo-colors" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0vyvry6ba1xmpd45hpi6savd8mbx09jpmvnnwkf6z62pk6s4zc61"))))
-    (arguments
-     `(#:cargo-inputs (("rust-supports-color" ,rust-supports-color-1))))))
-
 (define-public rust-owned-ttf-parser-0.6
   (package
     (name "rust-owned-ttf-parser")
@@ -49871,6 +49835,42 @@ (define-public rust-owning-ref-0.3
      (list #:cargo-inputs
            `(("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))))
 
+(define-public rust-owo-colors-4
+  (package
+    (name "rust-owo-colors")
+    (version "4.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "owo-colors" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0grsk47cllj0s4nc4qxvy4gdhj2lyiglbqx4lmw2m7grdmq59zya"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-supports-color" ,rust-supports-color-2))))
+    (home-page "https://github.com/jam1garner/owo-colors")
+    (synopsis "Zero-allocation terminal colors that'll make people go owo")
+    (description
+     "This package provides zero-allocation terminal colors that'll make people go
+owo.")
+    (license license:expat)))
+
+(define-public rust-owo-colors-3
+  (package
+    (inherit rust-owo-colors-4)
+    (name "rust-owo-colors")
+    (version "3.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "owo-colors" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vyvry6ba1xmpd45hpi6savd8mbx09jpmvnnwkf6z62pk6s4zc61"))))
+    (arguments
+     `(#:cargo-inputs (("rust-supports-color" ,rust-supports-color-1))))))
+
 (define-public rust-packed-simd-0.3
   (package
     (name "rust-packed-simd")
-- 
2.41.0

[bug#70606] [PATCH rust-team 036/101] gnu: Place rust-ouroborus-macro-0.17 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ouroborus-macro-0.17,
rust-ouroborus-macro-0.15, rust-ouroborus-macro-0.14): Move variables.

Change-Id: I7a49cdf7536e857df70d7fb4a5116d1904716203
---
 gnu/packages/crates-io.scm | 107 ++++++++++++++++++-------------------
 1 file changed, 53 insertions(+), 54 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 607bb76de4..348f43ea1f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49620,118 +49620,117 @@ (define-public rust-os-str-bytes-2
          "11agh8n3x2l4sr3sxvx6byc1j3ryb1g6flb1ywn0qhq7xv1y3cmg"))))
     (arguments `(#:skip-build? #t))))
 
-(define-public rust-ouroboros-macro-0.17
+(define-public rust-ouroboros-0.17
   (package
-    (name "rust-ouroboros-macro")
+    (name "rust-ouroboros")
     (version "0.17.2")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "ouroboros_macro" version))
+       (uri (crate-uri "ouroboros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1y5nmgnng4i23g333cvp8p7j3i3438r9g85fq1wafk4vqqjn4k7c"))))
+        (base32 "0m69j8288k3b3iyblngdfgraahnk9d5maw5a5y4fmprr1lr0gfp2"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4)
-                       ("rust-proc-macro-error" ,rust-proc-macro-error-1)
-                       ("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quote" ,rust-quote-1)
-                       ("rust-syn" ,rust-syn-2))))
+     `(#:cargo-inputs (("rust-aliasable" ,rust-aliasable-0.1)
+                       ("rust-ouroboros-macro" ,rust-ouroboros-macro-0.17)
+                       ("rust-static-assertions" ,rust-static-assertions-1))))
     (home-page "https://github.com/someguynamedjosh/ouroboros")
-    (synopsis "Proc macro for ouroboros")
-    (description
-     "This package provides a proc macro for the @code{ouroboros} crate.")
+    (synopsis "Self-referential struct generation")
+    (description "Easy, safe self-referential struct generation for Rust.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-ouroboros-macro-0.15
+(define-public rust-ouroboros-0.15
   (package
-    (inherit rust-ouroboros-macro-0.17)
-    (name "rust-ouroboros-macro")
+    (inherit rust-ouroboros-0.17)
+    (name "rust-ouroboros")
     (version "0.15.6")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "ouroboros_macro" version))
+       (uri (crate-uri "ouroboros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1dsn37vds4qpkzscmwaw17dv3m5m7a7j9qby8dsac19ks3622zaz"))))
+        (base32 "1nvjra9dana2g6kxv3397qrgpyw6lknzya6lzs1s1llbap8qndg1"))))
     (arguments
      `(#:cargo-inputs
-       (("rust-inflector" ,rust-inflector-0.11)
-        ("rust-proc-macro-error" ,rust-proc-macro-error-1)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))))
+       (("rust-aliasable" ,rust-aliasable-0.1)
+        ("rust-ouroboros-macro" ,rust-ouroboros-macro-0.15))))))
 
-(define-public rust-ouroboros-macro-0.14
+(define-public rust-ouroboros-0.14
   (package
-    (inherit rust-ouroboros-macro-0.15)
-    (name "rust-ouroboros-macro")
+    (inherit rust-ouroboros-0.15)
+    (name "rust-ouroboros")
     (version "0.14.0")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "ouroboros_macro" version))
+       (uri (crate-uri "ouroboros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "11cav04x82liknlrv50lpl1i1ln2jw4isdqzdjnjsg0pcpvwik9r"))))))
+        (base32 "1ih1lna1d2is3a6aicmc7lpfhqmg046kssxpryk24kwg8j42ymh6"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-aliasable" ,rust-aliasable-0.1)
+        ("rust-ouroboros-macro" ,rust-ouroboros-macro-0.14)
+        ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))))
 
-(define-public rust-ouroboros-0.17
+(define-public rust-ouroboros-macro-0.17
   (package
-    (name "rust-ouroboros")
+    (name "rust-ouroboros-macro")
     (version "0.17.2")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "ouroboros" version))
+       (uri (crate-uri "ouroboros_macro" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0m69j8288k3b3iyblngdfgraahnk9d5maw5a5y4fmprr1lr0gfp2"))))
+        (base32 "1y5nmgnng4i23g333cvp8p7j3i3438r9g85fq1wafk4vqqjn4k7c"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-aliasable" ,rust-aliasable-0.1)
-                       ("rust-ouroboros-macro" ,rust-ouroboros-macro-0.17)
-                       ("rust-static-assertions" ,rust-static-assertions-1))))
+     `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4)
+                       ("rust-proc-macro-error" ,rust-proc-macro-error-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
     (home-page "https://github.com/someguynamedjosh/ouroboros")
-    (synopsis "Self-referential struct generation")
-    (description "Easy, safe self-referential struct generation for Rust.")
+    (synopsis "Proc macro for ouroboros")
+    (description
+     "This package provides a proc macro for the @code{ouroboros} crate.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-ouroboros-0.15
+(define-public rust-ouroboros-macro-0.15
   (package
-    (inherit rust-ouroboros-0.17)
-    (name "rust-ouroboros")
+    (inherit rust-ouroboros-macro-0.17)
+    (name "rust-ouroboros-macro")
     (version "0.15.6")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "ouroboros" version))
+       (uri (crate-uri "ouroboros_macro" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1nvjra9dana2g6kxv3397qrgpyw6lknzya6lzs1s1llbap8qndg1"))))
+        (base32 "1dsn37vds4qpkzscmwaw17dv3m5m7a7j9qby8dsac19ks3622zaz"))))
     (arguments
-     `(#:cargo-inputs
-       (("rust-aliasable" ,rust-aliasable-0.1)
-        ("rust-ouroboros-macro" ,rust-ouroboros-macro-0.15))))))
+     `(#:cargo-inputs (("rust-inflector" ,rust-inflector-0.11)
+                       ("rust-proc-macro-error" ,rust-proc-macro-error-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-ouroboros-0.14
+(define-public rust-ouroboros-macro-0.14
   (package
-    (inherit rust-ouroboros-0.15)
-    (name "rust-ouroboros")
+    (inherit rust-ouroboros-macro-0.15)
+    (name "rust-ouroboros-macro")
     (version "0.14.0")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "ouroboros" version))
+       (uri (crate-uri "ouroboros_macro" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1ih1lna1d2is3a6aicmc7lpfhqmg046kssxpryk24kwg8j42ymh6"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-aliasable" ,rust-aliasable-0.1)
-        ("rust-ouroboros-macro" ,rust-ouroboros-macro-0.14)
-        ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))))
+        (base32 "11cav04x82liknlrv50lpl1i1ln2jw4isdqzdjnjsg0pcpvwik9r"))))))
 
 (define-public rust-overload-0.1
   (package
-- 
2.41.0

[bug#70606] [PATCH rust-team 037/101] gnu: Place rust-openssl-macros-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-openssl-macros-0.1): Move variable.

Change-Id: I8bc257e191e4f897ea523400298d2c8a2d2e2464
---
 gnu/packages/crates-io.scm | 47 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 348f43ea1f..6d3392b063 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48730,30 +48730,6 @@ (define-public rust-openpgp-cert-d-0.1
     (description "Shared OpenPGP Certificate Directory")
     (license license:expat)))
 
-(define-public rust-openssl-macros-0.1
-  (package
-    (name "rust-openssl-macros")
-    (version "0.1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "openssl-macros" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0v3kgnzbadrf9c06q4cqmbjas53av73n5w7wwz3n0nb6257y80dm"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/sfackler/rust-openssl")
-    (synopsis "Internal macros used by the openssl crate")
-    (description "This package provides internal macros used by the openssl
-crate.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-openssl-0.10
   (package
     (name "rust-openssl")
@@ -48826,6 +48802,29 @@ (define-public rust-openssl-0.7
                ((", path =.*}") "}"))
              #t)))))))
 
+(define-public rust-openssl-macros-0.1
+  (package
+    (name "rust-openssl-macros")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "openssl-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0v3kgnzbadrf9c06q4cqmbjas53av73n5w7wwz3n0nb6257y80dm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/sfackler/rust-openssl")
+    (synopsis "Internal macros used by the openssl crate")
+    (description "This package provides internal macros used by the openssl
+crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-openssl-probe-0.1
   (package
     (name "rust-openssl-probe")
-- 
2.41.0

[bug#70606] [PATCH rust-team 038/101] gnu: Place rust-once-cell-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-once-cell-1): Move variable.

Change-Id: I74f6c9f3389cc6f86e88f985362dbfa2751120c3
---
 gnu/packages/crates-io.scm | 60 +++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6d3392b063..1acf8dd6c3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48420,6 +48420,36 @@ (define-public rust-omnipath-0.1
     (description "This package provides a path utility library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-once-cell-1
+  (package
+    (name "rust-once-cell")
+    (version "1.19.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "once_cell" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "14kvw7px5z96dk4dwdm1r9cqhhy2cyj1l5n5b29mynbb8yr15nrz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-critical-section" ,rust-critical-section-1)
+        ("rust-parking-lot-core" ,rust-parking-lot-core-0.9)
+        ("rust-portable-atomic" ,rust-portable-atomic-1))
+       #:cargo-development-inputs
+       (("rust-critical-section" ,rust-critical-section-1)
+        ("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/matklad/once_cell")
+    (synopsis "Single assignment cells and lazy values")
+    (description
+     "This package provides two new cell-like types, @code{unsync::OnceCell}
+and @code{sync::OnceCell}.  OnceCell might store arbitrary non-copy types, can
+be assigned to at most once and provide direct access to the stored
+contents.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-onig-6
   (package
     (name "rust-onig")
@@ -48473,36 +48503,6 @@ (define-public rust-onig-sys-69.6
 other crates to create safe wrappers around Oniguruma.")
     (license license:expat)))
 
-(define-public rust-once-cell-1
-  (package
-    (name "rust-once-cell")
-    (version "1.19.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "once_cell" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "14kvw7px5z96dk4dwdm1r9cqhhy2cyj1l5n5b29mynbb8yr15nrz"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-critical-section" ,rust-critical-section-1)
-        ("rust-parking-lot-core" ,rust-parking-lot-core-0.9)
-        ("rust-portable-atomic" ,rust-portable-atomic-1))
-       #:cargo-development-inputs
-       (("rust-critical-section" ,rust-critical-section-1)
-        ("rust-regex" ,rust-regex-1))))
-    (home-page "https://github.com/matklad/once_cell")
-    (synopsis "Single assignment cells and lazy values")
-    (description
-     "This package provides two new cell-like types, @code{unsync::OnceCell}
-and @code{sync::OnceCell}.  OnceCell might store arbitrary non-copy types, can
-be assigned to at most once and provide direct access to the stored
-contents.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-oorandom-11
   (package
     (name "rust-oorandom")
-- 
2.41.0

[bug#70606] [PATCH rust-team 039/101] gnu: Place rust-ntest-proc-macro-helper-0.8 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ntest-proc-macro-helper-0.8,
rust-ntest-proc-macro-helper-0.7): Move variables.

Change-Id: I8bf4624e8a8a056e543b4f05844a596452c49637
---
 gnu/packages/crates-io.scm | 60 +++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1acf8dd6c3..0469cb8f50 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46800,6 +46800,36 @@ (define-public rust-ntest-0.7
         ("rust-ntest-timeout" ,rust-ntest-timeout-0.7))
        #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1))))))
 
+(define-public rust-ntest-proc-macro-helper-0.8
+  (package
+    (name "rust-ntest-proc-macro-helper")
+    (version "0.8.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ntest_proc_macro_helper" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "154r3r9nnnp6qjzlayc54213bdrgdk8b68jjnn1xcyd6cz92iqx0"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/becheran/ntest")
+    (synopsis "Helper functions for the procedural macros used in ntest")
+    (description "This package provides helper functions for the procedural
+macros used in ntest.")
+    (license license:expat)))
+
+(define-public rust-ntest-proc-macro-helper-0.7
+  (package
+    (inherit rust-ntest-proc-macro-helper-0.8)
+    (name "rust-ntest-proc-macro-helper")
+    (version "0.7.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ntest_proc_macro_helper" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0lkyfx97aynbm7cnhzyc9cr0rpq1xzng1hwmzizbf1a6855y6llg"))))))
+
 (define-public rust-ntest-test-cases-0.9
   (package
     (name "rust-ntest-test-cases")
@@ -46917,36 +46947,6 @@ (define-public rust-ntest-timeout-0.7
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-ntest-proc-macro-helper-0.8
-  (package
-    (name "rust-ntest-proc-macro-helper")
-    (version "0.8.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "ntest_proc_macro_helper" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "154r3r9nnnp6qjzlayc54213bdrgdk8b68jjnn1xcyd6cz92iqx0"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/becheran/ntest")
-    (synopsis "Helper functions for the procedural macros used in ntest")
-    (description "This package provides helper functions for the procedural
-macros used in ntest.")
-    (license license:expat)))
-
-(define-public rust-ntest-proc-macro-helper-0.7
-  (package
-    (inherit rust-ntest-proc-macro-helper-0.8)
-    (name "rust-ntest-proc-macro-helper")
-    (version "0.7.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "ntest_proc_macro_helper" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0lkyfx97aynbm7cnhzyc9cr0rpq1xzng1hwmzizbf1a6855y6llg"))))))
-
 (define-public rust-ntex-bytes-0.1
   (package
     (name "rust-ntex-bytes")
-- 
2.41.0

[bug#70606] [PATCH rust-team 040/101] gnu: Place rust-notify-debouncer-mini-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-notify-debouncer-mini-0.4): Move
variable.

Change-Id: Iee9b5c73b1d7c225c52bffca310fc471b92942d1
---
 gnu/packages/crates-io.scm | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0469cb8f50..6f6d46e88a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46561,28 +46561,6 @@ (define-public rust-notify-4
        (("rust-tempfile" ,rust-tempfile-3))))
     (license license:cc0)))
 
-(define-public rust-notify-debouncer-mini-0.4
-  (package
-    (name "rust-notify-debouncer-mini")
-    (version "0.4.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "notify-debouncer-mini" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0hwxdbzyx01pzwyld1dk7sc7ak5k3xkjz2l59ppwa7rajwhv4h2x"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-notify" ,rust-notify-6)
-                       ("rust-serde" ,rust-serde-1))))
-    (home-page "https://github.com/notify-rs/notify")
-    (synopsis "Notify mini debouncer")
-    (description "This crate is notify mini debouncer for events.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-notify-debouncer-full-0.3
   (package
     (name "rust-notify-debouncer-full")
@@ -46615,6 +46593,28 @@ (define-public rust-notify-debouncer-full-0.3
      "This package provides a notify event debouncer optimized for ease of use.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-notify-debouncer-mini-0.4
+  (package
+    (name "rust-notify-debouncer-mini")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "notify-debouncer-mini" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hwxdbzyx01pzwyld1dk7sc7ak5k3xkjz2l59ppwa7rajwhv4h2x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-notify" ,rust-notify-6)
+                       ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/notify-rs/notify")
+    (synopsis "Notify mini debouncer")
+    (description "This crate is notify mini debouncer for events.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-notmuch-0.8
   (package
     (name "rust-notmuch")
-- 
2.41.0

[bug#70606] [PATCH rust-team 041/101] gnu: Place rust-normalize-path-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-normalize-path-0.2): Move variable.

Change-Id: Ie3c28402b475dc62d324e9e0e1739581177cd2b4
---
 gnu/packages/crates-io.scm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6f6d46e88a..14f5bad330 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46312,24 +46312,6 @@ (define-public rust-noop-proc-macro-0.3
 nothing.")
     (license license:expat)))
 
-(define-public rust-normalize-path-0.2
-  (package
-    (name "rust-normalize-path")
-    (version "0.2.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "normalize-path" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0bc919zp34b9312wqd92jbi3xa9gxljxh8nfw7v6sk7znb98shzm"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/cargo-bins/cargo-binstall")
-    (synopsis "Like canonicalize, but without performing I/O")
-    (description "This package provides a rust function like canonicalize, but
-without performing I/O.")
-    (license (list license:asl2.0 license:expat))))
-
 (define-public rust-normalize-line-endings-0.3
   (package
     (name "rust-normalize-line-endings")
@@ -46367,6 +46349,24 @@ (define-public rust-normalize-line-endings-0.2
         (base32
          "1a1knz9j1w5a1pl2q6whmjphm3z6p64r5njnam7syp5rx8wil2if"))))))
 
+(define-public rust-normalize-path-0.2
+  (package
+    (name "rust-normalize-path")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "normalize-path" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0bc919zp34b9312wqd92jbi3xa9gxljxh8nfw7v6sk7znb98shzm"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/cargo-bins/cargo-binstall")
+    (synopsis "Like canonicalize, but without performing I/O")
+    (description "This package provides a rust function like canonicalize, but
+without performing I/O.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-normpath-1
   (package
     (name "rust-normpath")
-- 
2.41.0

[bug#70606] [PATCH rust-team 042/101] gnu: Place rust-nom8-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-nom8-0.2): Move variable.

Change-Id: Ie9e55483a63242f08ba329219c139f9ef479d4f0
---
 gnu/packages/crates-io.scm | 47 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 14f5bad330..4ef0efef0e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46200,30 +46200,6 @@ (define-public rust-nom-1
       ;; This is an ancient version and all inputs are optional.
      `(#:skip-build? #t))))
 
-(define-public rust-nom8-0.2
-  (package
-    (name "rust-nom8")
-    (version "0.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "nom8" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "1y6jzabxyrl05vxnh63r66ac2fh0symg5fnynxm4ii3zkif580df"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f              ; Not all files included.
-       #:cargo-inputs
-       (("rust-memchr" ,rust-memchr-2))
-       #:cargo-development-inputs
-       (("rust-doc-comment" ,rust-doc-comment-0.3)
-        ("rust-proptest" ,rust-proptest-1))))
-    (home-page "https://github.com/epage/nom-experimental")
-    (synopsis "Byte-oriented, zero-copy, parser combinators library")
-    (description "This package provides a byte-oriented, zero-copy, parser
-combinators library (fork for proposals for v8)")
-    (license license:expat)))
-
 (define-public rust-nom-derive-0.10
   (package
     (name "rust-nom-derive")
@@ -46272,6 +46248,29 @@ (define-public rust-nom-derive-impl-0.10
     (description "This package provides custom derive nom parsers from structs.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-nom8-0.2
+  (package
+    (name "rust-nom8")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nom8" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1y6jzabxyrl05vxnh63r66ac2fh0symg5fnynxm4ii3zkif580df"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs (("rust-memchr" ,rust-memchr-2))
+       #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)
+                                   ("rust-proptest" ,rust-proptest-1))))
+    (home-page "https://github.com/epage/nom-experimental")
+    (synopsis "Byte-oriented, zero-copy, parser combinators library")
+    (description "This package provides a byte-oriented, zero-copy, parser
+combinators library (fork for proposals for v8)")
+    (license license:expat)))
+
 (define-public rust-nonempty-0.7
   (package
     (name "rust-nonempty")
-- 
2.41.0

[bug#70606] [PATCH rust-team 043/101] gnu: Place rust-nispor-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-nispor-1): Move variable.

Change-Id: I3ee474366ba2cd10be48d51d690dcec9c36bcc1b
---
 gnu/packages/crates-io.scm | 68 +++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4ef0efef0e..9c34aebd9a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45187,6 +45187,40 @@ (define-public rust-nibble-vec-0.1
     (description "NibbleVec is a data structure for storing a sequence of half-bytes.")
     (license license:expat)))
 
+(define-public rust-nispor-1
+  (package
+    (name "rust-nispor")
+    (version "1.2.17")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nispor" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jp0fs6sy8cpg0gi7jkh215czbx3b8p0kygimpx0abgg6mx2955b"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Tests can't run in the build environment.
+       #:cargo-inputs (("rust-ethtool" ,rust-ethtool-0.2)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-mptcp-pm" ,rust-mptcp-pm-0.1)
+                       ("rust-netlink-packet-route" ,rust-netlink-packet-route-0.19)
+                       ("rust-netlink-packet-utils" ,rust-netlink-packet-utils-0.5)
+                       ("rust-netlink-sys" ,rust-netlink-sys-0.8)
+                       ("rust-rtnetlink" ,rust-rtnetlink-0.14)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs (("rust-pretty-assertions"
+                                    ,rust-pretty-assertions-1)
+                                   ("rust-serde-yaml" ,rust-serde-yaml-0.9))))
+    (home-page "https://github.com/nispor/nispor")
+    (synopsis "Unified interface for Linux network state querying")
+    (description "Unified interface for Linux network state querying.")
+    (license license:asl2.0)))
+
 (define-public rust-nitrokey-0.9
   (package
     (name "rust-nitrokey")
@@ -45309,40 +45343,6 @@ (define-public rust-nitrokey-test-state-0.1
 nitrokey-test crate.")
     (license license:gpl3+)))
 
-(define-public rust-nispor-1
-  (package
-    (name "rust-nispor")
-    (version "1.2.17")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "nispor" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0jp0fs6sy8cpg0gi7jkh215czbx3b8p0kygimpx0abgg6mx2955b"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f      ; Tests can't run in the build environment.
-       #:cargo-inputs (("rust-ethtool" ,rust-ethtool-0.2)
-                       ("rust-futures" ,rust-futures-0.3)
-                       ("rust-libc" ,rust-libc-0.2)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-mptcp-pm" ,rust-mptcp-pm-0.1)
-                       ("rust-netlink-packet-route" ,rust-netlink-packet-route-0.19)
-                       ("rust-netlink-packet-utils" ,rust-netlink-packet-utils-0.5)
-                       ("rust-netlink-sys" ,rust-netlink-sys-0.8)
-                       ("rust-rtnetlink" ,rust-rtnetlink-0.14)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-serde-json" ,rust-serde-json-1)
-                       ("rust-tokio" ,rust-tokio-1))
-       #:cargo-development-inputs (("rust-pretty-assertions"
-                                    ,rust-pretty-assertions-1)
-                                   ("rust-serde-yaml" ,rust-serde-yaml-0.9))))
-    (home-page "https://github.com/nispor/nispor")
-    (synopsis "Unified interface for Linux network state querying")
-    (description "Unified interface for Linux network state querying.")
-    (license license:asl2.0)))
-
 (define-public rust-nix-0.28
   (package
     (name "rust-nix")
-- 
2.41.0

[bug#70606] [PATCH rust-team 044/101] gnu: Place rust-nanorand-0.7 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-nanorand-0.7, rust-nanorand-0.5,
rust-nanorand-0.4, rust-nasm-rs-0.2): Move variables.

Change-Id: I1f41e034a77a19eb16736f09f05b444715a4902b
---
 gnu/packages/crates-io.scm | 182 ++++++++++++++++++-------------------
 1 file changed, 87 insertions(+), 95 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9c34aebd9a..d166c81b35 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -43364,101 +43364,6 @@ (define-public rust-mysqlclient-sys-0.2
 libmysqlclient.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-nanorand-0.7
-  (package
-    (name "rust-nanorand")
-    (version "0.7.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "nanorand" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "1hr60b8zlfy7mxjcwx2wfmhpkx7vfr3v9x12shmv1c10b0y32lba"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-getrandom" ,rust-getrandom-0.2)
-        ("rust-zeroize" ,rust-zeroize-1))
-       #:cargo-development-inputs
-       (("rust-hex" ,rust-hex-0.4))))
-    (home-page "https://github.com/Absolucy/nanorand-rs")
-    (synopsis "Tiny, fast, zero-dep library for random number generation")
-    (description
-     "This library is meant for fast, random number generation with
-quick compile time, and minimal dependencies.")
-    (license license:zlib)))
-
-(define-public rust-nanorand-0.5
-  (package
-    (inherit rust-nanorand-0.7)
-    (name "rust-nanorand")
-    (version "0.5.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "nanorand" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1ryi6jdfsfij4di33f269099g7m32rlr7sv7j4pklnjcj2xxfwri"))))
-    (arguments
-     `(#:skip-build? #true              ;error with pre-release randomize
-       #:cargo-inputs
-       (("rust-getrandom" ,rust-getrandom-0.2)
-        ("rust-zeroize" ,rust-zeroize-1))
-       #:cargo-development-inputs
-       (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-fastrand" ,rust-fastrand-1)
-        ("rust-hex" ,rust-hex-0.4)
-        ("rust-random-fast-rng" ,rust-random-fast-rng-0.1)
-        ("rust-randomize" ,rust-randomize-4))))))
-
-(define-public rust-nanorand-0.4
-  (package
-    (inherit rust-nanorand-0.5)
-    (name "rust-nanorand")
-    (version "0.4.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "nanorand" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1ifpjgir1a6lw64jkb6la5hb8j5jvqq70nmxgzjj0cjf13jd3kys"))))
-    (arguments
-     `(#:skip-build? #true              ;error with pre-release randomize
-       #:cargo-inputs
-       (("rust-getrandom" ,rust-getrandom-0.2)
-        ("rust-zeroize" ,rust-zeroize-1))
-       #:cargo-development-inputs
-       (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-fastrand" ,rust-fastrand-1)
-        ("rust-hex" ,rust-hex-0.4)
-        ("rust-random-fast-rng" ,rust-random-fast-rng-0.1)
-        ("rust-randomize" ,rust-randomize-4))))))
-
-(define-public rust-nasm-rs-0.2
-  (package
-    (name "rust-nasm-rs")
-    (version "0.2.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "nasm-rs" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1lgc3gg32hj4pcbfp07vzwy013smdm27469fyy4rqgyil3x46vx7"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-arrayvec" ,rust-arrayvec-0.5)
-         ("rust-rayon" ,rust-rayon-1))))
-    (home-page "https://github.com/medek/nasm-rs")
-    (synopsis "Run NASM during your Cargo build")
-    (description "Run NASM during your Cargo build.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-nalgebra-0.32
   (package
     (name "rust-nalgebra")
@@ -43863,6 +43768,73 @@ (define-public rust-nalgebra-macros-0.1
        (("rust-nalgebra" ,rust-nalgebra-0.26)
         ("rust-trybuild" ,rust-trybuild-1))))))
 
+(define-public rust-nanorand-0.7
+  (package
+    (name "rust-nanorand")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nanorand" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1hr60b8zlfy7mxjcwx2wfmhpkx7vfr3v9x12shmv1c10b0y32lba"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.2)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-hex" ,rust-hex-0.4))))
+    (home-page "https://github.com/Absolucy/nanorand-rs")
+    (synopsis "Tiny, fast, zero-dep library for random number generation")
+    (description
+     "This library is meant for fast, random number generation with
+quick compile time, and minimal dependencies.")
+    (license license:zlib)))
+
+(define-public rust-nanorand-0.5
+  (package
+    (inherit rust-nanorand-0.7)
+    (name "rust-nanorand")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nanorand" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ryi6jdfsfij4di33f269099g7m32rlr7sv7j4pklnjcj2xxfwri"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.2)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3)
+                                   ("rust-fastrand" ,rust-fastrand-1)
+                                   ("rust-hex" ,rust-hex-0.4)
+                                   ("rust-random-fast-rng" ,rust-random-fast-rng-0.1)
+                                   ("rust-randomize" ,rust-randomize-4))))))
+
+(define-public rust-nanorand-0.4
+  (package
+    (inherit rust-nanorand-0.5)
+    (name "rust-nanorand")
+    (version "0.4.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nanorand" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ifpjgir1a6lw64jkb6la5hb8j5jvqq70nmxgzjj0cjf13jd3kys"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.2)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3)
+                                   ("rust-fastrand" ,rust-fastrand-1)
+                                   ("rust-hex" ,rust-hex-0.4)
+                                   ("rust-random-fast-rng" ,rust-random-fast-rng-0.1)
+                                   ("rust-randomize" ,rust-randomize-4))))))
+
 (define-public rust-napi-2
   (package
     (name "rust-napi")
@@ -43992,6 +43964,26 @@ (define-public rust-napi-sys-2
     (description "This package provides a NodeJS N-API raw binding.")
     (license license:expat)))
 
+(define-public rust-nasm-rs-0.2
+  (package
+    (name "rust-nasm-rs")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nasm-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1lgc3gg32hj4pcbfp07vzwy013smdm27469fyy4rqgyil3x46vx7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.5)
+                       ("rust-rayon" ,rust-rayon-1))))
+    (home-page "https://github.com/medek/nasm-rs")
+    (synopsis "Run NASM during your Cargo build")
+    (description "Run NASM during your Cargo build.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-natord-1
   (package
     (name "rust-natord")
-- 
2.41.0

[bug#70606] [PATCH rust-team 045/101] gnu: Place rust-muldiv-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-muldiv-1): Move variable.

Change-Id: I11ca2f9cfe7f58f3204ff4decfd95462220bce6d
---
 gnu/packages/crates-io.scm | 42 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d166c81b35..4d7e1d0f15 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -43120,6 +43120,27 @@ (define-public rust-msvc-demangler-0.9
 C++ symbols mangled by MSVC.")
     (license (list license:expat license:ncsa))))
 
+(define-public rust-muldiv-1
+  (package
+    (name "rust-muldiv")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "muldiv" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1c6ljsp41n8ijsx7zicwfm135drgyhcms12668ivvsbm1r98frwm"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list #:cargo-inputs `(("rust-quickcheck" ,rust-quickcheck-1))))
+    (home-page "https://github.com/sdroege/rust-muldiv")
+    (synopsis "Trait for numeric types to combine multiplication and division")
+    (description
+     "This package provides a trait for numeric types to perform combined
+multiplication and division with overflow protection.")
+    (license license:expat)))
+
 (define-public rust-multer-3
   (package
     (name "rust-multer")
@@ -43192,27 +43213,6 @@ (define-public rust-multer-2
                                    ("rust-serde" ,rust-serde-1)
                                    ("rust-tokio" ,rust-tokio-1))))))
 
-(define-public rust-muldiv-1
-  (package
-    (name "rust-muldiv")
-    (version "1.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "muldiv" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1c6ljsp41n8ijsx7zicwfm135drgyhcms12668ivvsbm1r98frwm"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:cargo-inputs `(("rust-quickcheck" ,rust-quickcheck-1))))
-    (home-page "https://github.com/sdroege/rust-muldiv")
-    (synopsis "Trait for numeric types to combine multiplication and division")
-    (description
-     "This package provides a trait for numeric types to perform combined
-multiplication and division with overflow protection.")
-    (license license:expat)))
-
 (define-public rust-multimap-0.8
   (package
     (name "rust-multimap")
-- 
2.41.0

[bug#70606] [PATCH rust-team 046/101] gnu: Place rust-metrics-macro-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-metrics-macro-0.2): Move variable.

Change-Id: Id5c1721df578f370e21e324d981cd8ab7e1a03c9
---
 gnu/packages/crates-io.scm | 49 +++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4d7e1d0f15..e5b494e2bb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41759,31 +41759,6 @@ (define-public rust-merlin-2
          ("rust-rand-core" ,rust-rand-core-0.5)
          ("rust-zeroize" ,rust-zeroize-1))))))
 
-(define-public rust-metrics-macros-0.2
-  (package
-    (name "rust-metrics-macros")
-    (version "0.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "metrics-macros" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0yy2dc9g3m1h8df6bmnqh1sngyvrgznz1fjpkp9rz1is9p6n1b0i"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/metrics-rs/metrics")
-    (synopsis "Macros for the metrics crate")
-    (description "This package provides macros for the metrics crate.")
-    (license license:expat)))
-
 (define-public rust-metrics-0.14
   (package
     (name "rust-metrics")
@@ -41809,6 +41784,30 @@ (define-public rust-metrics-0.14
     (description "This package provides a lightweight metrics facade.")
     (license license:expat)))
 
+(define-public rust-metrics-macros-0.2
+  (package
+    (name "rust-metrics-macros")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "metrics-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0yy2dc9g3m1h8df6bmnqh1sngyvrgznz1fjpkp9rz1is9p6n1b0i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/metrics-rs/metrics")
+    (synopsis "Macros for the metrics crate")
+    (description "This package provides macros for the metrics crate.")
+    (license license:expat)))
+
 (define-public rust-metrohash-1
   (package
     (name "rust-metrohash")
-- 
2.41.0

[bug#70606] [PATCH rust-team 047/101] gnu: Place rust-merge-derive-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-merge-derive-0.1): Move variable.

Change-Id: I999a9ae1d50d2276aba95a2032158d9795e3be17
---
 gnu/packages/crates-io.scm | 47 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e5b494e2bb..6cfa3ab7c0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41653,30 +41653,6 @@ (define-public rust-memuse-0.2
     (description "Traits for measuring dynamic memory usage of types.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-merge-derive-0.1
-  (package
-    (name "rust-merge-derive")
-    (version "0.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "merge_derive" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "01wxhi7mqmp34l540wcfb24hb13vcbps4wlynas66bnsfra0g790"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-proc-macro-error" ,rust-proc-macro-error-1)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://sr.ht/~ireas/merge-rs")
-    (synopsis "Derive macro for the merge crate")
-    (description "This crate provides a derive macro for the
-@code{merge::Merge} crate.")
-    (license (list license:asl2.0 license:expat))))
-
 (define-public rust-merge-0.1
   (package
     (name "rust-merge")
@@ -41706,6 +41682,29 @@ (define-public rust-merge-0.1
 to merge two objects of the same type into one.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-merge-derive-0.1
+  (package
+    (name "rust-merge-derive")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "merge_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01wxhi7mqmp34l540wcfb24hb13vcbps4wlynas66bnsfra0g790"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro-error" ,rust-proc-macro-error-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://sr.ht/~ireas/merge-rs")
+    (synopsis "Derive macro for the merge crate")
+    (description "This crate provides a derive macro for the
+@code{merge::Merge} crate.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-merlin-3
   (package
     (name "rust-merlin")
-- 
2.41.0

[bug#70606] [PATCH rust-team 048/101] gnu: Place rust-matrixcompare-core-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matrixcompare-core-0.1): Move
variable.

Change-Id: Iccbcb7171fe4ad5dc4fe48abd903e5f96f6eb16b
---
 gnu/packages/crates-io.scm | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6cfa3ab7c0..187c81d7cf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40977,23 +40977,6 @@ (define-public rust-matchers-0.0
      `(#:cargo-inputs
        (("rust-regex-automata" ,rust-regex-automata-0.1))))))
 
-(define-public rust-matrixcompare-core-0.1
-  (package
-    (name "rust-matrixcompare-core")
-    (version "0.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "matrixcompare-core" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0wqaj028ws2x2h16rf10arwvmpfbmk7afg8b57ahb25i1nrspgdh"))))
-    (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
-    (home-page "https://github.com/Andlon/matrixcompare")
-    (synopsis "Core traits for matrixcompare")
-    (description "This package provides core traits for matrixcompare.")
-    (license license:expat)))
 
 (define-public rust-matrixcompare-0.3
   (package
@@ -41045,6 +41028,25 @@ (define-public rust-matrixcompare-0.2
 matrices.")
     (license license:expat)))
 
+(define-public rust-matrixcompare-core-0.1
+  (package
+    (name "rust-matrixcompare-core")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matrixcompare-core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0wqaj028ws2x2h16rf10arwvmpfbmk7afg8b57ahb25i1nrspgdh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://github.com/Andlon/matrixcompare")
+    (synopsis "Core traits for matrixcompare")
+    (description "This package provides core traits for matrixcompare.")
+    (license license:expat)))
+
 (define-public rust-matrixcompare-mock-0.1
   (package
     (name "rust-matrixcompare-mock")
-- 
2.41.0

[bug#70606] [PATCH rust-team 049/101] gnu: Place rust-matchit-0.7 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-matchit-0.7, rust-matches-0.1): Move
variables.

Change-Id: I2e9b5d1ffc4fefe2ea3a82b098cb963e7ec0baca
---
 gnu/packages/crates-io.scm | 76 +++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 187c81d7cf..0a1fc4574e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40872,26 +40872,6 @@ (define-public rust-mas-iana-0.7
 OAuth 2.0.")
     (license license:asl2.0)))
 
-(define-public rust-matchit-0.7
-  (package
-    (name "rust-matchit")
-    (version "0.7.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "matchit" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "156bgdmmlv4crib31qhgg49nsjk88dxkdqp80ha2pk2rk6n6ax0f"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t))   ; Cut the dependency tree.
-    (home-page "https://github.com/ibraheemdev/matchit")
-    (synopsis "High performance, zero-copy URL router")
-    (description
-     "This package provides a high performance, zero-copy URL router.")
-    (license (list license:expat license:bsd-3))))
-
 (define-public rust-match-cfg-0.1
   (package
     (name "rust-match-cfg")
@@ -40915,25 +40895,6 @@ (define-public rust-match-cfg-0.1
 statement, the first matching branch is the item that gets emitted.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-matches-0.1
-  (package
-    (name "rust-matches")
-    (version "0.1.10")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "matches" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1994402fq4viys7pjhzisj4wcw894l53g798kkm2y74laxk0jci5"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/SimonSapin/rust-std-candidates")
-    (synopsis "Macro to evaluate whether an expression matches a pattern")
-    (description "This package provides a macro to evaluate, as a boolean,
-whether an expression matches a pattern.")
-    (license license:expat)))
-
 (define-public rust-matchers-0.1
   (package
     (name "rust-matchers")
@@ -40977,6 +40938,43 @@ (define-public rust-matchers-0.0
      `(#:cargo-inputs
        (("rust-regex-automata" ,rust-regex-automata-0.1))))))
 
+(define-public rust-matches-0.1
+  (package
+    (name "rust-matches")
+    (version "0.1.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matches" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1994402fq4viys7pjhzisj4wcw894l53g798kkm2y74laxk0jci5"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/SimonSapin/rust-std-candidates")
+    (synopsis "Macro to evaluate whether an expression matches a pattern")
+    (description "This package provides a macro to evaluate, as a boolean,
+whether an expression matches a pattern.")
+    (license license:expat)))
+
+(define-public rust-matchit-0.7
+  (package
+    (name "rust-matchit")
+    (version "0.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "matchit" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "156bgdmmlv4crib31qhgg49nsjk88dxkdqp80ha2pk2rk6n6ax0f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://github.com/ibraheemdev/matchit")
+    (synopsis "High performance, zero-copy URL router")
+    (description
+     "This package provides a high performance, zero-copy URL router.")
+    (license (list license:expat license:bsd-3))))
 
 (define-public rust-matrixcompare-0.3
   (package
-- 
2.41.0

[bug#70606] [PATCH rust-team 050/101] gnu: Place rust-markup-proc-macro-0.13 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-markup-proc-macro-0.13): Move
variable.

Change-Id: I133ddcf4cd224c7c3bc9d7dbe351430176d7116b
---
 gnu/packages/crates-io.scm | 47 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0a1fc4574e..66e63b228a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40662,30 +40662,6 @@ (define-public rust-maplit-1
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-markup-proc-macro-0.13
-  (package
-    (name "rust-markup-proc-macro")
-    (version "0.13.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "markup-proc-macro" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0l41di814m9vzw3bz3j49j09j6cb3r73rc4a3a6dvjvx4c77z4hs"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/utkarshkukreti/markup.rs")
-    (synopsis "Macros for template engine for Rust")
-    (description
-     "This package provides macros for \"markup\", the fast, type-safe
-template engine for Rust.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-markup-0.13
   (package
     (name "rust-markup")
@@ -40708,6 +40684,29 @@ (define-public rust-markup-0.13
      "This package provides a fast, type-safe template engine for Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-markup-proc-macro-0.13
+  (package
+    (name "rust-markup-proc-macro")
+    (version "0.13.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "markup-proc-macro" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0l41di814m9vzw3bz3j49j09j6cb3r73rc4a3a6dvjvx4c77z4hs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/utkarshkukreti/markup.rs")
+    (synopsis "Macros for template engine for Rust")
+    (description
+     "This package provides macros for \"markup\", the fast, type-safe
+template engine for Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-markup5ever-0.11
   (package
     (name "rust-markup5ever")
-- 
2.41.0

[bug#70606] [PATCH rust-team 051/101] gnu: Place rust-magma-0.8 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-magma-0.8): Move variable.

Change-Id: Ie52195b11e8c0025dd46e6018449086c9aabb5f6
---
 gnu/packages/crates-io.scm | 43 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 66e63b228a..5fd7bbec4b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40432,28 +40432,6 @@ (define-public rust-macrotest-1
      "This package provides test harness for macro expansion in Rust.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-magma-0.8
-  (package
-    (name "rust-magma")
-    (version "0.8.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "magma" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "1w321p30599kc85bb35ps32ykqc9gzpi5b99dsw793nxrypnj9xb"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cipher" ,rust-cipher-0.4))
-       #:cargo-development-inputs
-       (("rust-cipher" ,rust-cipher-0.4)
-        ("rust-hex-literal" ,rust-hex-literal-0.3))))
-    (home-page "https://github.com/RustCrypto/block-ciphers")
-    (synopsis "Magma (GOST R 34.12-2015) block cipher")
-    (description "Magma (GOST R 34.12-2015) block cipher")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-magic-crypt-3
   (package
     (name "rust-magic-crypt")
@@ -40514,6 +40492,27 @@ (define-public rust-magic-string-0.3
      "This package provides a MagicString port driven by Rust and N-API.")
     (license license:expat)))
 
+(define-public rust-magma-0.8
+  (package
+    (name "rust-magma")
+    (version "0.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "magma" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1w321p30599kc85bb35ps32ykqc9gzpi5b99dsw793nxrypnj9xb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cipher" ,rust-cipher-0.4))
+       #:cargo-development-inputs (("rust-cipher" ,rust-cipher-0.4)
+                                   ("rust-hex-literal" ,rust-hex-literal-0.3))))
+    (home-page "https://github.com/RustCrypto/block-ciphers")
+    (synopsis "Magma (GOST R 34.12-2015) block cipher")
+    (description "Magma (GOST R 34.12-2015) block cipher")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-maildir-0.6
   (package
     (name "rust-maildir")
-- 
2.41.0

[bug#70606] [PATCH rust-team 052/101] gnu: Place rust-local-ip-address-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-local-ip-address-0.4): Move variable.

Change-Id: Ia687d844c8a2114a02ae159603e23f1dd8cbccfd
---
 gnu/packages/crates-io.scm | 52 +++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5fd7bbec4b..6d5b29451f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39271,6 +39271,32 @@ (define-public rust-local-channel-0.1
 futures-aware, FIFO queue.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-local-ip-address-0.4
+  (package
+    (name "rust-local-ip-address")
+    (version "0.4.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "local-ip-address" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xc88i6v43rx5f5im0zadd8nl3k7wvf2lv351q20d05h5w4pzawy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; Integration test with local IP address.
+       #:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-neli" ,rust-neli-0.5)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-windows-sys" ,rust-windows-sys-0.42))))
+    (home-page "https://github.com/EstebanBorai/local-ip-address")
+    (synopsis
+     "Retrieve system's local IP address and network interfaces/adapters")
+    (description
+     "This package provides retrieving the system's local IP address and
+network interfaces/adapters.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-local-waker-0.1
   (package
     (name "rust-local-waker")
@@ -39339,32 +39365,6 @@ (define-public rust-locale-config-0.3
 by inspecting the system for user preference.")
     (license license:expat)))
 
-(define-public rust-local-ip-address-0.4
-  (package
-    (name "rust-local-ip-address")
-    (version "0.4.9")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "local-ip-address" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1xc88i6v43rx5f5im0zadd8nl3k7wvf2lv351q20d05h5w4pzawy"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f  ; Integration test with local IP address.
-       #:cargo-inputs (("rust-libc" ,rust-libc-0.2)
-                       ("rust-neli" ,rust-neli-0.5)
-                       ("rust-thiserror" ,rust-thiserror-1)
-                       ("rust-windows-sys" ,rust-windows-sys-0.42))))
-    (home-page "https://github.com/EstebanBorai/local-ip-address")
-    (synopsis
-     "Retrieve system's local IP address and network interfaces/adapters")
-    (description
-     "This package provides retrieving the system's local IP address and
-network interfaces/adapters.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-lock-api-0.4
   (package
     (name "rust-lock-api")
-- 
2.41.0

[bug#70606] [PATCH rust-team 053/101] gnu: Place rust-libtest-mimic-0.3 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-libtest-mimic-0.7,
rust-libtest-mimic-0.6, rust-libtest-mimic-0.5, rust-libtest-mimic-0.3,
rust-libssh2-sys-0.3, rust-libbsh2-sys-0.2): Move variables.

Change-Id: I5856e8df66103e4bdfeccdfd58c7f9e07703bb1c
---
 gnu/packages/crates-io.scm | 298 ++++++++++++++++++-------------------
 1 file changed, 149 insertions(+), 149 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6d5b29451f..5138cc42f2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38576,6 +38576,155 @@ (define-public rust-libsqlite3-sys-0.20
         ("rust-pkg-config" ,rust-pkg-config-0.3)
         ("rust-vcpkg" ,rust-vcpkg-0.2))))))
 
+(define-public rust-libssh2-sys-0.3
+  (package
+    (name "rust-libssh2-sys")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libssh2-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1vkidqw5ll71ynqc93hgcq62iqkklzb5268zffd13ql7nwqa1j1d"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (delete-file-recursively "libssh2")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cc" ,rust-cc-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-libz-sys" ,rust-libz-sys-1)
+        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-vcpkg" ,rust-vcpkg-0.2))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list libssh2 openssl zlib))
+    (home-page "https://github.com/alexcrichton/ssh2-rs")
+    (synopsis "Native bindings to the libssh2 library")
+    (description
+     "This package provides native rust bindings to the @code{libssh2} library.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-libssh2-sys-0.2
+  (package
+    (inherit rust-libssh2-sys-0.3)
+    (name "rust-libssh2-sys")
+    (version "0.2.19")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "libssh2-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32 "0mkhw4pksbz7gldj8hia7k6npc479n1x09i8r0pm275sac424ina"))
+        (modules '((guix build utils)))
+        (snippet
+         '(begin (delete-file-recursively "libssh2") #t))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-libz-sys" ,rust-libz-sys-1)
+        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+        ;; Build dependencies:
+        ("rust-cc" ,rust-cc-1)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-vcpkg" ,rust-vcpkg-0.2))))))
+
+(define-public rust-libtest-mimic-0.7
+  (package
+    (name "rust-libtest-mimic")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libtest-mimic" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02y7l5bcwli37hl625bp6l0m95mry8cavwj3nkl55zgc8iplq3vz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-clap" ,rust-clap-4)
+                       ("rust-escape8259" ,rust-escape8259-0.5)
+                       ("rust-termcolor" ,rust-termcolor-1)
+                       ("rust-threadpool" ,rust-threadpool-1))
+       #:cargo-development-inputs
+       (("rust-fastrand" ,rust-fastrand-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1))))
+    (home-page "https://github.com/LukasKalbertodt/libtest-mimic")
+    (synopsis "Tools for writing a test harness")
+    (description
+     "Write your own test harness that looks and behaves like the built-in test
+harness used by @code{rustc --test}.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-libtest-mimic-0.6
+  (package
+    (inherit rust-libtest-mimic-0.7)
+    (name "rust-libtest-mimic")
+    (version "0.6.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "libtest-mimic" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                 "1rwwdrzc5hmfisc9c3zcvnab14rgh0zfa636c2jbhv4az5qf73bd"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-clap" ,rust-clap-4)
+        ("rust-termcolor" ,rust-termcolor-1)
+        ("rust-threadpool" ,rust-threadpool-1))
+       #:cargo-development-inputs
+       (("rust-fastrand" ,rust-fastrand-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1))))))
+
+(define-public rust-libtest-mimic-0.5
+  (package
+    (inherit rust-libtest-mimic-0.6)
+    (name "rust-libtest-mimic")
+    (version "0.5.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "libtest-mimic" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1v103c90ibs35ffr9mww9h5la3b7xxvil32v6x0szxcqq9wr8lkr"))))
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=terse_output")
+       #:cargo-inputs
+       (("rust-clap" ,rust-clap-3)
+        ("rust-termcolor" ,rust-termcolor-1)
+        ("rust-threadpool" ,rust-threadpool-1))
+       #:cargo-development-inputs
+       (("rust-fastrand" ,rust-fastrand-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1))))))
+
+(define-public rust-libtest-mimic-0.3
+  (package
+    (inherit rust-libtest-mimic-0.5)
+    (name "rust-libtest-mimic")
+    (version "0.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "libtest-mimic" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1bp2jllwpciljr14g6s9bk4835g46kszgrjwi66vxxsk3ynbi9q8"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-structopt" ,rust-structopt-0.3)
+        ("rust-termcolor" ,rust-termcolor-1))))))
+
 (define-public rust-libxml-0.3
   (package
     (name "rust-libxml")
@@ -39015,155 +39164,6 @@ (define-public rust-linux-raw-sys-0.0.46
            `(("rust-libc" ,rust-libc-0.2)
              ("rust-static-assertions" ,rust-static-assertions-1))))))
 
-(define-public rust-libssh2-sys-0.3
-  (package
-    (name "rust-libssh2-sys")
-    (version "0.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "libssh2-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1vkidqw5ll71ynqc93hgcq62iqkklzb5268zffd13ql7nwqa1j1d"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin (delete-file-recursively "libssh2")))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cc" ,rust-cc-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-libz-sys" ,rust-libz-sys-1)
-        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
-        ("rust-pkg-config" ,rust-pkg-config-0.3)
-        ("rust-vcpkg" ,rust-vcpkg-0.2))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list libssh2 openssl zlib))
-    (home-page "https://github.com/alexcrichton/ssh2-rs")
-    (synopsis "Native bindings to the libssh2 library")
-    (description
-     "This package provides native rust bindings to the @code{libssh2} library.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-libssh2-sys-0.2
-  (package
-    (inherit rust-libssh2-sys-0.3)
-    (name "rust-libssh2-sys")
-    (version "0.2.19")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "libssh2-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32 "0mkhw4pksbz7gldj8hia7k6npc479n1x09i8r0pm275sac424ina"))
-        (modules '((guix build utils)))
-        (snippet
-         '(begin (delete-file-recursively "libssh2") #t))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-libz-sys" ,rust-libz-sys-1)
-        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
-        ;; Build dependencies:
-        ("rust-cc" ,rust-cc-1)
-        ("rust-pkg-config" ,rust-pkg-config-0.3)
-        ("rust-vcpkg" ,rust-vcpkg-0.2))))))
-
-(define-public rust-libtest-mimic-0.7
-  (package
-    (name "rust-libtest-mimic")
-    (version "0.7.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "libtest-mimic" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "02y7l5bcwli37hl625bp6l0m95mry8cavwj3nkl55zgc8iplq3vz"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-clap" ,rust-clap-4)
-                       ("rust-escape8259" ,rust-escape8259-0.5)
-                       ("rust-termcolor" ,rust-termcolor-1)
-                       ("rust-threadpool" ,rust-threadpool-1))
-       #:cargo-development-inputs
-       (("rust-fastrand" ,rust-fastrand-1)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-1))))
-    (home-page "https://github.com/LukasKalbertodt/libtest-mimic")
-    (synopsis "Tools for writing a test harness")
-    (description
-     "Write your own test harness that looks and behaves like the built-in test
-harness used by @code{rustc --test}.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-libtest-mimic-0.6
-  (package
-    (inherit rust-libtest-mimic-0.7)
-    (name "rust-libtest-mimic")
-    (version "0.6.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "libtest-mimic" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                 "1rwwdrzc5hmfisc9c3zcvnab14rgh0zfa636c2jbhv4az5qf73bd"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-clap" ,rust-clap-4)
-        ("rust-termcolor" ,rust-termcolor-1)
-        ("rust-threadpool" ,rust-threadpool-1))
-       #:cargo-development-inputs
-       (("rust-fastrand" ,rust-fastrand-1)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-1))))))
-
-(define-public rust-libtest-mimic-0.5
-  (package
-    (inherit rust-libtest-mimic-0.6)
-    (name "rust-libtest-mimic")
-    (version "0.5.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "libtest-mimic" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1v103c90ibs35ffr9mww9h5la3b7xxvil32v6x0szxcqq9wr8lkr"))))
-    (arguments
-     `(#:cargo-test-flags
-       '("--release" "--"
-         "--skip=terse_output")
-       #:cargo-inputs
-       (("rust-clap" ,rust-clap-3)
-        ("rust-termcolor" ,rust-termcolor-1)
-        ("rust-threadpool" ,rust-threadpool-1))
-       #:cargo-development-inputs
-       (("rust-fastrand" ,rust-fastrand-1)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-1))))))
-
-(define-public rust-libtest-mimic-0.3
-  (package
-    (inherit rust-libtest-mimic-0.5)
-    (name "rust-libtest-mimic")
-    (version "0.3.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "libtest-mimic" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1bp2jllwpciljr14g6s9bk4835g46kszgrjwi66vxxsk3ynbi9q8"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4)
-        ("rust-rayon" ,rust-rayon-1)
-        ("rust-structopt" ,rust-structopt-0.3)
-        ("rust-termcolor" ,rust-termcolor-1))))))
-
 (define-public rust-listenfd-1
   (package
     (name "rust-listenfd")
-- 
2.41.0

[bug#70606] [PATCH rust-team 054/101] gnu: Place rust-libz-sys-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-libz-sys-1): Move variable.

Change-Id: Ie721ac54b72c17fc807de942f7e15dfc85357d3a
---
 gnu/packages/crates-io.scm | 65 ++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5138cc42f2..0f101cbd5d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38769,41 +38769,6 @@ (define-public rust-libxml-0.2
        (sha256
         (base32 "1xx1bsay6c0jy9vi7qcvliidya33lvbkxwpdfz9qmzl23f11xxxh"))))))
 
-(define-public rust-libz-sys-1
-  (package
-    (name "rust-libz-sys")
-    (version "1.1.8")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "libz-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1gqb8nk7j4ngvlcll8plm2fvjwic40p2g4qp20pwry1m74f7c0lp"))
-        (modules '((guix build utils)))
-        (snippet
-         '(begin (delete-file-recursively "src/zlib")
-                 (delete-file-recursively "src/zlib-ng")))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-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
-     (list pkg-config zlib))
-    (home-page "https://github.com/rust-lang/libz-sys")
-    (synopsis "Bindings to the system libz library")
-    (description
-     "This package provides bindings to the system @code{libz} library (also
-known as zlib).")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-libz-ng-sys-1
   (package
     (name "rust-libz-ng-sys")
@@ -38828,6 +38793,36 @@ (define-public rust-libz-ng-sys-1
 high-performance zlib library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-libz-sys-1
+  (package
+    (name "rust-libz-sys")
+    (version "1.1.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libz-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gqb8nk7j4ngvlcll8plm2fvjwic40p2g4qp20pwry1m74f7c0lp"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (delete-file-recursively "src/zlib")
+                   (delete-file-recursively "src/zlib-ng")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("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 (list pkg-config zlib))
+    (home-page "https://github.com/rust-lang/libz-sys")
+    (synopsis "Bindings to the system libz library")
+    (description
+     "This package provides bindings to the system @code{libz} library (also
+known as zlib).")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-lifeguard-0.6
   (package
     (name "rust-lifeguard")
-- 
2.41.0

[bug#70606] [PATCH rust-team 055/101] gnu: Place rust-libmimalloc-sys-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-libmimalloc-sys-0.1): Move variable.

Change-Id: I975e5415c612e7db6da238c2a1f2a5aadf044c54
---
 gnu/packages/crates-io.scm | 76 +++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0f101cbd5d..f532b66315 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37785,45 +37785,6 @@ (define-public rust-libmath-0.2
     (description "This package provides some mathematical utilities.")
     (license license:expat)))
 
-(define-public rust-libmimalloc-sys-0.1
-  (package
-    (name "rust-libmimalloc-sys")
-    (version "0.1.35")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "libmimalloc-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0r4nrd9xbmhmipw4bvh4xlbzbc7xf74frrsibqglysffgv1vay9r"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin (substitute* "Cargo.toml"
-                  (("\\[build-dependencies\\.cc\\]" all)
-                   (string-append "[build-dependencies.pkg-config]\n"
-                                  "version = \"0.3\"\n\n"
-                                  all)))
-                (delete-file "build.rs")
-                (with-output-to-file "build.rs"
-                  (lambda _
-                    (format #t "fn main() {~@
-                            println!(\"cargo:rustc-link-lib=mimalloc\");~@
-                            }~%")))))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cc" ,rust-cc-1)
-        ("rust-cty" ,rust-cty-0.2)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-pkg-config" ,rust-pkg-config-0.3))))
-    (inputs (list mimalloc))
-    (home-page "https://github.com/purpleprotocol/mimalloc_rust")
-    (synopsis "Sys crate wrapping the mimalloc allocator")
-    (description "This package provides a sys crate wrapping the mimalloc
-allocator.")
-    (license license:expat)))
-
 (define-public rust-libmdns-0.7
   (package
     (name "rust-libmdns")
@@ -37885,6 +37846,43 @@ (define-public rust-libmdns-0.6
            #:cargo-development-inputs
            `(("rust-env-logger" ,rust-env-logger-0.8))))))
 
+(define-public rust-libmimalloc-sys-0.1
+  (package
+    (name "rust-libmimalloc-sys")
+    (version "0.1.35")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libmimalloc-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0r4nrd9xbmhmipw4bvh4xlbzbc7xf74frrsibqglysffgv1vay9r"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (substitute* "Cargo.toml"
+                     (("\\[build-dependencies\\.cc\\]" all)
+                      (string-append "[build-dependencies.pkg-config]\n"
+                                     "version = \"0.3\"\n\n" all)))
+                   (delete-file "build.rs")
+                   (with-output-to-file "build.rs"
+                     (lambda _
+                       (format #t
+                        "fn main() {~@
+                            println!(\"cargo:rustc-link-lib=mimalloc\");~@
+                            }~%")))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-cty" ,rust-cty-0.2)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))
+    (inputs (list mimalloc))
+    (home-page "https://github.com/purpleprotocol/mimalloc_rust")
+    (synopsis "Sys crate wrapping the mimalloc allocator")
+    (description "This package provides a sys crate wrapping the mimalloc
+allocator.")
+    (license license:expat)))
+
 (define-public rust-libnghttp2-sys-0.1
   (package
     (name "rust-libnghttp2-sys")
-- 
2.41.0

[bug#70606] [PATCH rust-team 056/101] gnu: Place rust-lexical-6 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-lexical-6, rust-lexical-5): Move
variables.

Change-Id: Iaa26e53eb663256aa85aa9171387a12414b1dd18
---
 gnu/packages/crates-io.scm | 102 ++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f532b66315..e670d3c0d2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36994,6 +36994,57 @@ (define-public rust-lewton-0.10
 source audio format.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-lexical-6
+  (package
+    (name "rust-lexical")
+    (version "6.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "lexical" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xk8g6k17ml0sjyx388qck9zqhxjfyzjqx1l6c0ggzj3zlvgpbn7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-lexical-core" ,rust-lexical-core-0.8))))
+    (home-page "https://github.com/Alexhuszagh/rust-lexical")
+    (synopsis "Lexical, to- and from-string conversion routines")
+    (description
+     "Lexical is high-performance numeric conversion routines for use in
+a no_std environment.  This does not depend on any standard library features,
+nor a system allocator.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-lexical-5
+  (package
+    (inherit rust-lexical-6)
+    (name "rust-lexical")
+    (version "5.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "lexical" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1r8lsi523h53kbb99xgv31jabwhcp4rzqd4hfazfhcjffh5aj17l"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-lexical-core" ,rust-lexical-core-0.7)
+        ("rust-rand" ,rust-rand-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-toml" ,rust-toml-0.5))
+       #:cargo-development-inputs
+       (("rust-approx" ,rust-approx-0.4)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-dtoa" ,rust-dtoa-0.4)
+        ("rust-itoa" ,rust-itoa-0.4)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-ryu" ,rust-ryu-1))))))
+
 (define-public rust-lexical-core-0.8
   (package
     (name "rust-lexical-core")
@@ -37166,57 +37217,6 @@ (define-public rust-lexical-write-integer-0.8
      "This crate provides efficient formatting of integers to strings.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-lexical-6
-  (package
-    (name "rust-lexical")
-    (version "6.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "lexical" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1xk8g6k17ml0sjyx388qck9zqhxjfyzjqx1l6c0ggzj3zlvgpbn7"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-lexical-core" ,rust-lexical-core-0.8))))
-    (home-page "https://github.com/Alexhuszagh/rust-lexical")
-    (synopsis "Lexical, to- and from-string conversion routines")
-    (description
-     "Lexical is high-performance numeric conversion routines for use in
-a no_std environment.  This does not depend on any standard library features,
-nor a system allocator.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-lexical-5
-  (package
-    (inherit rust-lexical-6)
-    (name "rust-lexical")
-    (version "5.2.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "lexical" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1r8lsi523h53kbb99xgv31jabwhcp4rzqd4hfazfhcjffh5aj17l"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-lexical-core" ,rust-lexical-core-0.7)
-        ("rust-rand" ,rust-rand-0.4)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-toml" ,rust-toml-0.5))
-       #:cargo-development-inputs
-       (("rust-approx" ,rust-approx-0.4)
-        ("rust-criterion" ,rust-criterion-0.3)
-        ("rust-dtoa" ,rust-dtoa-0.4)
-        ("rust-itoa" ,rust-itoa-0.4)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-ryu" ,rust-ryu-1))))))
-
 (define-public rust-lexiclean-0.0.1
   (package
     (name "rust-lexiclean")
-- 
2.41.0

[bug#70606] [PATCH rust-team 057/101] gnu: Place rust-language-tags-0.3 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-language-tags-0.3,
rust-language-tags-0.2): Move variables.

Change-Id: Ifcb6d9e3871066438374df152de47c9700313ee8
---
 gnu/packages/crates-io.scm | 91 ++++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 48 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e670d3c0d2..00ae3036da 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36435,54 +36435,6 @@ (define-public rust-k9-0.11
                        ("rust-syn" ,rust-syn-1)
                        ("rust-term-size" ,rust-term-size-0.3))))))
 
-(define-public rust-language-tags-0.3
-  (package
-    (name "rust-language-tags")
-    (version "0.3.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "language-tags" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "124k6w9nx33q4xs8rpa9f7klshrsa0x4f7qngdwq890lpdj5jd6l"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-serde" ,rust-serde-1))
-       #:cargo-development-inputs
-       (("rust-bencher" ,rust-bencher-0.1)
-        ("rust-serde-json" ,rust-serde-json-1))))
-    (home-page "https://github.com/pyfisch/rust-language-tags")
-    (synopsis "Language tags for Rust")
-    (description
-     "Language tags can be used identify human languages, scripts e.g. Latin
-script, countries and other regions.  They are commonly used in HTML and HTTP
-@code{Content-Language} and @code{Accept-Language} header fields.  This package
-currently supports parsing (fully conformant parser), formatting and comparing
-language tags.")
-    (license license:expat)))
-
-(define-public rust-language-tags-0.2
-  (package
-    (inherit rust-language-tags-0.3)
-    (name "rust-language-tags")
-    (version "0.2.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "language-tags" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "16hrjdpa827carq5x4b8zhas24d8kg4s16m6nmmn1kb7cr5qh7d9"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-heapsize" ,rust-heapsize-0.3)
-        ("rust-heapsize-plugin" ,rust-heapsize-plugin-0.1))))))
-
 (define-public rust-lab-0.11
   (package
     (name "rust-lab")
@@ -36665,6 +36617,49 @@ (define-public rust-lalrpop-util-0.17
        (sha256
         (base32 "0z4bjn3g9232n1im5p6mn9mwlvw5aj5iac6hbjmljqxkhf3d2xy2"))))))
 
+(define-public rust-language-tags-0.3
+  (package
+    (name "rust-language-tags")
+    (version "0.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "language-tags" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "124k6w9nx33q4xs8rpa9f7klshrsa0x4f7qngdwq890lpdj5jd6l"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1)
+                                   ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/pyfisch/rust-language-tags")
+    (synopsis "Language tags for Rust")
+    (description
+     "Language tags can be used identify human languages, scripts e.g. Latin
+script, countries and other regions.  They are commonly used in HTML and HTTP
+@code{Content-Language} and @code{Accept-Language} header fields.  This package
+currently supports parsing (fully conformant parser), formatting and comparing
+language tags.")
+    (license license:expat)))
+
+(define-public rust-language-tags-0.2
+  (package
+    (inherit rust-language-tags-0.3)
+    (name "rust-language-tags")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "language-tags" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16hrjdpa827carq5x4b8zhas24d8kg4s16m6nmmn1kb7cr5qh7d9"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-heapsize" ,rust-heapsize-0.3)
+                       ("rust-heapsize-plugin" ,rust-heapsize-plugin-0.1))))))
+
 (define-public rust-lazy-bytes-cast-5
   (package
     (name "rust-lazy-bytes-cast")
-- 
2.41.0

[bug#70606] [PATCH rust-team 058/101] gnu: Place rust-k9-0.11 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-k9-0.11, rust-k9-0.12): Move
variables.

Change-Id: Iad2834c72bccb92010fce117800abf4dbde3f31c
---
 gnu/packages/crates-io.scm | 124 ++++++++++++++++++-------------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 00ae3036da..37aad64c01 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36205,6 +36205,68 @@ (define-public rust-juniper-0.14
 debugging.")
     (license license:bsd-2)))
 
+(define-public rust-k9-0.12
+  (package
+    (name "rust-k9")
+    (version "0.12.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "k9" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "056ngrvyla95qj737h7xjw5ja697h07mpw6pci5v3cb8bfxwx2q8"))
+              (snippet
+               #~(begin (use-modules (guix build utils))
+                        (substitute* "Cargo.toml"
+                          ;; k9@0.11.7 was yanked by upstream, provide 0.11.6.
+                          (("0\\.11\\.7") "0.11.6"))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-colored" ,rust-colored-2)
+                       ("rust-diff" ,rust-diff-0.1)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-terminal-size" ,rust-terminal-size-0.2))
+       #:cargo-development-inputs
+       (("rust-derive-builder" ,rust-derive-builder-0.9)
+        ("rust-k9" ,rust-k9-0.11)
+        ("rust-rand" ,rust-rand-0.7)
+        ("rust-sha2" ,rust-sha2-0.9)
+        ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1))))
+    (home-page "https://github.com/aaronabramov/k9")
+    (synopsis "Testing library")
+    (description "This package contains helper macros for writing unit tests.")
+    (license license:expat)))
+
+(define-public rust-k9-0.11
+  (package
+    (inherit rust-k9-0.12)
+    (name "rust-k9")
+    (version "0.11.6")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "k9" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1a8pxz6fygqzknxdlb4l835kqxgjk7snm4bjhhhn783r025vbp9j"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-colored" ,rust-colored-1)
+                       ("rust-diff" ,rust-diff-0.1)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-syn" ,rust-syn-1)
+                       ("rust-term-size" ,rust-term-size-0.3))))))
+
 (define-public rust-keccak-0.1
   (package
     (name "rust-keccak")
@@ -36373,68 +36435,6 @@ (define-public rust-kv-log-macro-1
      "This package provides a Log macro for log's kv-unstable backend.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-k9-0.12
-  (package
-    (name "rust-k9")
-    (version "0.12.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "k9" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "056ngrvyla95qj737h7xjw5ja697h07mpw6pci5v3cb8bfxwx2q8"))
-              (snippet
-               #~(begin (use-modules (guix build utils))
-                        (substitute* "Cargo.toml"
-                          ;; k9@0.11.7 was yanked by upstream, provide 0.11.6.
-                          (("0\\.11\\.7") "0.11.6"))))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
-                       ("rust-colored" ,rust-colored-2)
-                       ("rust-diff" ,rust-diff-0.1)
-                       ("rust-lazy-static" ,rust-lazy-static-1)
-                       ("rust-libc" ,rust-libc-0.2)
-                       ("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-regex" ,rust-regex-1)
-                       ("rust-syn" ,rust-syn-2)
-                       ("rust-terminal-size" ,rust-terminal-size-0.2))
-       #:cargo-development-inputs
-       (("rust-derive-builder" ,rust-derive-builder-0.9)
-        ("rust-k9" ,rust-k9-0.11)
-        ("rust-rand" ,rust-rand-0.7)
-        ("rust-sha2" ,rust-sha2-0.9)
-        ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1))))
-    (home-page "https://github.com/aaronabramov/k9")
-    (synopsis "Testing library")
-    (description "This package contains helper macros for writing unit tests.")
-    (license license:expat)))
-
-(define-public rust-k9-0.11
-  (package
-    (inherit rust-k9-0.12)
-    (name "rust-k9")
-    (version "0.11.6")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "k9" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1a8pxz6fygqzknxdlb4l835kqxgjk7snm4bjhhhn783r025vbp9j"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
-                       ("rust-colored" ,rust-colored-1)
-                       ("rust-diff" ,rust-diff-0.1)
-                       ("rust-lazy-static" ,rust-lazy-static-1)
-                       ("rust-libc" ,rust-libc-0.2)
-                       ("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-regex" ,rust-regex-1)
-                       ("rust-syn" ,rust-syn-1)
-                       ("rust-term-size" ,rust-term-size-0.3))))))
-
 (define-public rust-lab-0.11
   (package
     (name "rust-lab")
-- 
2.41.0

[bug#70606] [PATCH rust-team 059/101] gnu: Place rust-kqueue-sys-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-kqueue-sys-1): Move variable.

Change-Id: I8d602df3f859b8f79e2ad57fad21e30ad69ebfc3
---
 gnu/packages/crates-io.scm | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 37aad64c01..e33ae2832a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36341,28 +36341,6 @@ (define-public rust-khronos-api-3
      "The Khronos XML API Registry, exposed as byte string constants.")
     (license license:asl2.0)))
 
-(define-public rust-kqueue-sys-1
-  (package
-    (name "rust-kqueue-sys")
-    (version "1.0.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "kqueue-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "11z5labbms9vn9m6csi5383dmrlmdgsxq13ls9fwa6zhi5a5hrw3"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build?
-       #t
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1) ("rust-libc" ,rust-libc-0.2))))
-    (home-page "https://gitlab.com/worr/rust-kqueue-sys")
-    (synopsis "Low-level kqueue interface for BSDs")
-    (description "This package provides a low-level kqueue interface for BSDs.")
-    (license license:expat)))
-
 (define-public rust-kqueue-1
   (package
     (name "rust-kqueue")
@@ -36386,6 +36364,28 @@ (define-public rust-kqueue-1
     (description "This package provides a kqueue interface for BSDs.")
     (license license:expat)))
 
+(define-public rust-kqueue-sys-1
+  (package
+    (name "rust-kqueue-sys")
+    (version "1.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "kqueue-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "11z5labbms9vn9m6csi5383dmrlmdgsxq13ls9fwa6zhi5a5hrw3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build?
+       #t
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1) ("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://gitlab.com/worr/rust-kqueue-sys")
+    (synopsis "Low-level kqueue interface for BSDs")
+    (description "This package provides a low-level kqueue interface for BSDs.")
+    (license license:expat)))
+
 (define-public rust-kstring-2
   (package
     (name "rust-kstring")
-- 
2.41.0

[bug#70606] [PATCH rust-team 060/101] gnu: Place rust-juniper-codegen-0.14 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-juniper-codegen-0.14): Move variable.

Change-Id: I7f2530c9e9f38413707e4a44364009b65d1069c0
---
 gnu/packages/crates-io.scm | 54 +++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e33ae2832a..b72c1a497a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36138,33 +36138,6 @@ (define-public rust-juliex-0.3
 concurrency primitives and multiple allocations.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-juniper-codegen-0.14
-  (package
-    (name "rust-juniper-codegen")
-    (version "0.14.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "juniper_codegen" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "06ym8568k9p75kvnfc4ywqbkzaa4ib6gngx9vpbsjwg9v0sg42nl"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #false                  ;FIXME: fail due to unresolved import
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))
-       #:cargo-development-inputs
-       (("rust-juniper" ,rust-juniper-0.14))))
-    (home-page "https://github.com/graphql-rust/juniper")
-    (synopsis "Internal custom derive trait for Juniper GraphQL")
-    (description
-     "This package provides an internal custom derive trait for Juniper
-GraphQL.")
-    (license license:bsd-2)))
-
 (define-public rust-juniper-0.14
   (package
     (name "rust-juniper")
@@ -36205,6 +36178,33 @@ (define-public rust-juniper-0.14
 debugging.")
     (license license:bsd-2)))
 
+(define-public rust-juniper-codegen-0.14
+  (package
+    (name "rust-juniper-codegen")
+    (version "0.14.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "juniper_codegen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06ym8568k9p75kvnfc4ywqbkzaa4ib6gngx9vpbsjwg9v0sg42nl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #false                  ;FIXME: fail due to unresolved import
+       #:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-juniper" ,rust-juniper-0.14))))
+    (home-page "https://github.com/graphql-rust/juniper")
+    (synopsis "Internal custom derive trait for Juniper GraphQL")
+    (description
+     "This package provides an internal custom derive trait for Juniper
+GraphQL.")
+    (license license:bsd-2)))
+
 (define-public rust-k9-0.12
   (package
     (name "rust-k9")
-- 
2.41.0

[bug#70606] [PATCH rust-team 061/101] gnu: Place rust-jsonpath-lib-0.3 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-jsonpath-lib-0.3,
rust-jsonrpc-core-14): Move variables.

Change-Id: Ia2a121eea6511e177a26ae05b4989f8520f2dad6
---
 gnu/packages/crates-io.scm | 104 ++++++++++++++++++-------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b72c1a497a..5626623902 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -35985,58 +35985,6 @@ (define-public rust-joinery-2
 iterators with a separator.")
     (license license:expat)))
 
-(define-public rust-jsonpath-lib-0.3
-  (package
-    (name "rust-jsonpath-lib")
-    (version "0.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "jsonpath_lib" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0kvp4fargixqlwjvpb3w6f1lvmiysnmj7an5h75wqc42ss8k39pa"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-log" ,rust-log-0.4)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1))))
-    (home-page "https://github.com/freestrings/jsonpath")
-    (synopsis "JsonPath engine written in Rust")
-    (description
-     "It is JsonPath engine written in Rust.  It provides a similar API
-interface in Webassembly and Javascript too.")
-    (license license:expat)))
-
-(define-public rust-jsonrpc-core-14
-  (package
-    (name "rust-jsonrpc-core")
-    (version "14.2.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "jsonrpc-core" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0qkvgkr05sg0j25jqgw7zcw4r1agzg8gnfnrmw1rgyqz283p6x50"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-futures" ,rust-futures-0.1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-serde-json" ,rust-serde-json-1))))
-    (home-page "https://github.com/paritytech/jsonrpc")
-    (synopsis "Transport agnostic Rust implementation of JSON-RPC 2.0")
-    (description
-     "This package provides a transport agnostic Rust implementation of
-JSON-RPC 2.0 specification.")
-    (license license:expat)))
-
 (define-public rust-js-sys-0.3
   (package
     (name "rust-js-sys")
@@ -36108,6 +36056,58 @@ (define-public rust-json-deserializer-0.4
      "This package provides a performant library to deserialize JSON.")
     (license license:asl2.0)))
 
+(define-public rust-jsonpath-lib-0.3
+  (package
+    (name "rust-jsonpath-lib")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "jsonpath_lib" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0kvp4fargixqlwjvpb3w6f1lvmiysnmj7an5h75wqc42ss8k39pa"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-log" ,rust-log-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/freestrings/jsonpath")
+    (synopsis "JsonPath engine written in Rust")
+    (description
+     "It is JsonPath engine written in Rust.  It provides a similar API
+interface in Webassembly and Javascript too.")
+    (license license:expat)))
+
+(define-public rust-jsonrpc-core-14
+  (package
+    (name "rust-jsonrpc-core")
+    (version "14.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "jsonrpc-core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qkvgkr05sg0j25jqgw7zcw4r1agzg8gnfnrmw1rgyqz283p6x50"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-futures" ,rust-futures-0.1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/paritytech/jsonrpc")
+    (synopsis "Transport agnostic Rust implementation of JSON-RPC 2.0")
+    (description
+     "This package provides a transport agnostic Rust implementation of
+JSON-RPC 2.0 specification.")
+    (license license:expat)))
+
 (define-public rust-juliex-0.3
   (package
     (name "rust-juliex")
-- 
2.41.0

[bug#70606] [PATCH rust-team 062/101] gnu: Place rust-iri-string-0.7 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-iri-string-0.7, rust-is-ci-1,
rust-is-macro-0.1): Move variable.

Change-Id: I426dddaada28904344c9d413cf883718f6dc6dfa
---
 gnu/packages/crates-io.scm | 134 ++++++++++++++++++-------------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5626623902..7f648bf66f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34691,73 +34691,6 @@ (define-public rust-iovec-0.1
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-iri-string-0.7
-  (package
-    (name "rust-iri-string")
-    (version "0.7.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "iri-string" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1h07hkfkkjjvgzlaqpr5fia7hrgv7qxqdw4xrpdc3936gmk9p191"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2)
-                       ("rust-serde" ,rust-serde-1))
-       #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1))))
-    (home-page "https://github.com/lo48576/iri-string")
-    (synopsis "IRI as string types")
-    (description
-      "This package provides string types for @acronym{IRIs, Internationalized
-Resource Identifiers} and @acronym{URIs, Uniform Resource Identifiers}.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-is-ci-1
-  (package
-    (name "rust-is-ci")
-    (version "1.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "is_ci" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0ifwvxmrsj4r29agfzr71bjq6y1bihkx38fbzafq5vl0jn1wjmbn"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/zkat/is_ci")
-    (synopsis "Lightweight CI environment checker")
-    (description
-     "Super lightweight CI environment checker.  Just tells you if you're in CI
-or not without much fuss.")
-    (license license:isc)))
-
-(define-public rust-is-macro-0.1
-  (package
-    (name "rust-is-macro")
-    (version "0.1.9")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "is-macro" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0pq1x1r8pk6fv0qf9vpxw60jw2jg3961nm1gv71j5qv0v4bds8m3"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-inflector" ,rust-inflector-0.11)
-        ("rust-pmutil" ,rust-pmutil-0.5)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/kdy1/is-macro")
-    (synopsis "Create methods to use custom enum like Option/Result")
-    (description "This package lets you easily create methods to use a custom
-enum like Option/Result.")
-    (license license:expat)))
-
 (define-public rust-ipnet-2
   (package
     (name "rust-ipnet")
@@ -34872,6 +34805,48 @@ (define-public rust-iptables-0.5
     (description "Rust bindings for iptables.")
     (license license:expat)))
 
+(define-public rust-iri-string-0.7
+  (package
+    (name "rust-iri-string")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "iri-string" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1h07hkfkkjjvgzlaqpr5fia7hrgv7qxqdw4xrpdc3936gmk9p191"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://github.com/lo48576/iri-string")
+    (synopsis "IRI as string types")
+    (description
+      "This package provides string types for @acronym{IRIs, Internationalized
+Resource Identifiers} and @acronym{URIs, Uniform Resource Identifiers}.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-is-ci-1
+  (package
+    (name "rust-is-ci")
+    (version "1.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "is_ci" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ifwvxmrsj4r29agfzr71bjq6y1bihkx38fbzafq5vl0jn1wjmbn"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/zkat/is_ci")
+    (synopsis "Lightweight CI environment checker")
+    (description
+     "Super lightweight CI environment checker.  Just tells you if you're in CI
+or not without much fuss.")
+    (license license:isc)))
+
 (define-public rust-is-debug-1
   (package
     (name "rust-is-debug")
@@ -34934,6 +34909,31 @@ (define-public rust-is-executable-1
 whether or not a given path points to an executable file.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-is-macro-0.1
+  (package
+    (name "rust-is-macro")
+    (version "0.1.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "is-macro" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0pq1x1r8pk6fv0qf9vpxw60jw2jg3961nm1gv71j5qv0v4bds8m3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-inflector" ,rust-inflector-0.11)
+        ("rust-pmutil" ,rust-pmutil-0.5)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/kdy1/is-macro")
+    (synopsis "Create methods to use custom enum like Option/Result")
+    (description "This package lets you easily create methods to use a custom
+enum like Option/Result.")
+    (license license:expat)))
+
 (define-public rust-is-terminal-0.4
   (package
     (name "rust-is-terminal")
-- 
2.41.0

[bug#70606] [PATCH rust-team 063/101] gnu: Place rust-inout-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-inout-0.1): Move variable.

Change-Id: I87e7c4816a0aa055fd56aa859993f228dc0a5732
---
 gnu/packages/crates-io.scm | 42 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7f648bf66f..e06db034ed 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34086,6 +34086,27 @@ (define-public rust-inotify-sys-0.1
      "This package provides inotify bindings for the Rust programming language.")
     (license license:isc)))
 
+(define-public rust-inout-0.1
+  (package
+    (name "rust-inout")
+    (version "0.1.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "inout" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1xf9gf09nc7y1a261xlfqsf66yn6mb81ahlzzyyd1934sr9hbhd0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-block-padding" ,rust-block-padding-0.3)
+        ("rust-generic-array" ,rust-generic-array-0.14))))
+    (home-page "https://github.com/RustCrypto/utils")
+    (synopsis "Custom reference types for code")
+    (description "This package provides custom reference types for code generic
+over in-place and buffer-to-buffer modes of operation.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-input-buffer-0.5
   (package
     (name "rust-input-buffer")
@@ -34126,27 +34147,6 @@ (define-public rust-input-buffer-0.3
        #:cargo-inputs
        (("rust-bytes" ,rust-bytes-0.5))))))
 
-(define-public rust-inout-0.1
-  (package
-    (name "rust-inout")
-    (version "0.1.3")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "inout" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "1xf9gf09nc7y1a261xlfqsf66yn6mb81ahlzzyyd1934sr9hbhd0"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-block-padding" ,rust-block-padding-0.3)
-        ("rust-generic-array" ,rust-generic-array-0.14))))
-    (home-page "https://github.com/RustCrypto/utils")
-    (synopsis "Custom reference types for code")
-    (description "This package provides custom reference types for code generic
-over in-place and buffer-to-buffer modes of operation.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-insta-1
   (package
     (name "rust-insta")
-- 
2.41.0

[bug#70606] [PATCH rust-team 064/101] gnu: Place rust-iana-time-zone-haiku-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-iana-time-zone-haiku-0.1): Move
variable.

Change-Id: I59b59f893cbcaa09517350a2a1900725543b6e66
---
 gnu/packages/crates-io.scm | 40 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e06db034ed..839b9336d0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32626,26 +32626,6 @@ (define-public rust-iai-macro-0.1
     (description "Custom Test Framework macro for Iai.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-iana-time-zone-haiku-0.1
-  (package
-    (name "rust-iana-time-zone-haiku")
-    (version "0.1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "iana-time-zone-haiku" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "17r6jmj31chn7xs9698r122mapq85mfnv98bb4pg6spm0si2f67k"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cc" ,rust-cc-1))))
-    (home-page "https://github.com/strawlab/iana-time-zone")
-    (synopsis "IANA-time-zone support crate for Haiku OS")
-    (description
-     "This package provides iana-time-zone support crate for Haiku OS.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-iana-time-zone-0.1
   (package
     (name "rust-iana-time-zone")
@@ -32675,6 +32655,26 @@ (define-public rust-iana-time-zone-0.1
      "This package provides the IANA time zone for the current system.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-iana-time-zone-haiku-0.1
+  (package
+    (name "rust-iana-time-zone-haiku")
+    (version "0.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "iana-time-zone-haiku" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "17r6jmj31chn7xs9698r122mapq85mfnv98bb4pg6spm0si2f67k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cc" ,rust-cc-1))))
+    (home-page "https://github.com/strawlab/iana-time-zone")
+    (synopsis "IANA-time-zone support crate for Haiku OS")
+    (description
+     "This package provides iana-time-zone support crate for Haiku OS.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-idea-0.5
   (package
     (name "rust-idea")
-- 
2.41.0

[bug#70606] [PATCH rust-team 065/101] gnu: Place rust-hyphenation-commons-0.8 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-hyphenation-commons-0.8): Move
variable.

Change-Id: I67077e72e80d41a03bb98ab9848cbc3c4986cdc8
---
 gnu/packages/crates-io.scm | 46 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 839b9336d0..438d6b1df2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32462,29 +32462,6 @@ (define-public rust-humantime-1
         ("rust-rand" ,rust-rand-0.4)
         ("rust-time" ,rust-time-0.1))))))
 
-(define-public rust-hyphenation-commons-0.8
-  (package
-    (name "rust-hyphenation-commons")
-    (version "0.8.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "hyphenation_commons" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1gq59h9h8597k04yl53an0j56cvb0in98pxpp27dkiz5mnifgssz"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-fst" ,rust-fst-0.4)
-        ("rust-serde" ,rust-serde-1))))
-    (home-page "https://github.com/tapeinosyne/hyphenation")
-    (synopsis "Proemial code for the @code{hyphenation} library")
-    (description
-     "This package provides a proemial code for the @code{hyphenation} library.")
-    (license (list license:asl2.0 license:expat))))
-
 (define-public rust-hyphenation-0.8
   (package
     (name "rust-hyphenation")
@@ -32517,6 +32494,29 @@ (define-public rust-hyphenation-0.8
      "This package provides a Knuth-Liang hyphenation for a variety of languages.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-hyphenation-commons-0.8
+  (package
+    (name "rust-hyphenation-commons")
+    (version "0.8.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hyphenation_commons" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gq59h9h8597k04yl53an0j56cvb0in98pxpp27dkiz5mnifgssz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-fst" ,rust-fst-0.4)
+        ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/tapeinosyne/hyphenation")
+    (synopsis "Proemial code for the @code{hyphenation} library")
+    (description
+     "This package provides a proemial code for the @code{hyphenation} library.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-hyprland-0.3
   (package
     (name "rust-hyprland")
-- 
2.41.0

[bug#70606] [PATCH rust-team 066/101] gnu: Place rust-humantime-serde-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-humantime-serde-1): Move variable.

Change-Id: Ibd2ea2715415576a438e24065863dd1fd220ed74
---
 gnu/packages/crates-io.scm | 46 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 438d6b1df2..45fa63c8bc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32355,29 +32355,6 @@ (define-public rust-human-format-1
 machines are still at bay.")
     (license license:expat)))
 
-(define-public rust-humantime-serde-1
-  (package
-    (name "rust-humantime-serde")
-    (version "1.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "humantime-serde" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0n208zzy69f7pgwcm1d0id4nzhssxn3z3zy7ki3dpkaazmnaad5c"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-humantime" ,rust-humantime-2)
-        ("rust-serde" ,rust-serde-1))))
-    (home-page "https://github.com/jean-airoldie/humantime-serde")
-    (synopsis "Humantime serialization timestamp format")
-    (description
-     "This package provides a Humantime serialization timestamp format.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-humansize-2
   (package
     (name "rust-humansize")
@@ -32462,6 +32439,29 @@ (define-public rust-humantime-1
         ("rust-rand" ,rust-rand-0.4)
         ("rust-time" ,rust-time-0.1))))))
 
+(define-public rust-humantime-serde-1
+  (package
+    (name "rust-humantime-serde")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "humantime-serde" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0n208zzy69f7pgwcm1d0id4nzhssxn3z3zy7ki3dpkaazmnaad5c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-humantime" ,rust-humantime-2)
+        ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/jean-airoldie/humantime-serde")
+    (synopsis "Humantime serialization timestamp format")
+    (description
+     "This package provides a Humantime serialization timestamp format.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-hyphenation-0.8
   (package
     (name "rust-hyphenation")
-- 
2.41.0

[bug#70606] [PATCH rust-team 067/101] gnu: Place rust-kuchiki-0.8 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-kuchiki-0.8,
rust-konst-proc-macros-0.2, rust-konst-proc-macro-rules-0.2,
rust-konst-0.2, rust-koibumi-base32-0.0.2, rust-jwalk-0.8): Move
variables.

Change-Id: I6c8f82a37d13931d224b0807d1bded8054157349
---
 gnu/packages/crates-io.scm | 265 ++++++++++++++++++-------------------
 1 file changed, 131 insertions(+), 134 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 45fa63c8bc..21dc0a33bc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32175,140 +32175,6 @@ (define-public rust-hts-sys-2
     (description "This library provides Rust bindings to HTSlib.")
     (license license:expat)))
 
-(define-public rust-jwalk-0.8
-  (package
-    (name "rust-jwalk")
-    (version "0.8.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "jwalk" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0miw0074ch6p89dbvrlnz9wp13rh7542cf1ak8bx4v1mcrsq8d97"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-crossbeam" ,rust-crossbeam-0.8)
-        ("rust-rayon" ,rust-rayon-1))
-       #:cargo-development-inputs
-       (("rust-criterion" ,rust-criterion-0.4)
-        ("rust-fs-extra" ,rust-fs-extra-1)
-        ("rust-ignore" ,rust-ignore-0.4)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-walkdir" ,rust-walkdir-2))))
-    (home-page "https://github.com/byron/jwalk")
-    (synopsis
-     "Filesystem walk performed in parallel with streamed and sorted results")
-    (description
-     "Filesystem walk performed in parallel with streamed and sorted results.")
-    (license license:expat)))
-
-(define-public rust-koibumi-base32-0.0.2
-  (package
-    (name "rust-koibumi-base32")
-    (version "0.0.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "koibumi-base32" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1frb232m6rw50ly8ijhsbllcqfif5kcma1l6hrgm5g22c3c3il94"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-lazy-static" ,rust-lazy-static-1))))
-    (home-page "https://kashiko.gitlab.io/koibumi-rust/")
-    (synopsis "Base32 encoder/decoder library")
-    (description "This package provides a Base32 encoder/decoder library.")
-    (license license:gpl3+)))
-
-(define-public rust-konst-0.2
-  (package
-    (name "rust-konst")
-    (version "0.2.19")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "konst" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1x3lxxk9vjaiiaabngv7ki2bv9xi36gnqzjzi0s8qfs8wq9hw3rk"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-konst-macro-rules" ,rust-konst-macro-rules-0.2)
-                       ("rust-konst-proc-macros" ,rust-konst-proc-macros-0.2)
-                       ("rust-trybuild" ,rust-trybuild-1))
-       #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8))))
-    (home-page "https://github.com/rodrimati1992/konst/")
-    (synopsis
-     "Const equivalents of std functions, compile-time comparison, and parsing")
-    (description
-     "Const equivalents of std functions, compile-time comparison, and parsing.")
-    (license license:zlib)))
-
-(define-public rust-konst-macro-rules-0.2
-  (package
-    (name "rust-konst-macro-rules")
-    (version "0.2.19")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "konst_macro_rules" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0dswja0dqcww4x3fwjnirc0azv2n6cazn8yv0kddksd8awzkz4x4"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/rodrimati1992/konst/")
-    (synopsis "Implementation detail of the konst crate")
-    (description "Implementation detail of the konst crate.")
-    (license license:zlib)))
-
-(define-public rust-konst-proc-macros-0.2
-  (package
-    (name "rust-konst-proc-macros")
-    (version "0.2.11")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "konst_proc_macros" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0dxp8mdh3q9d044ql203way4fgbc50n3j3pi2j1x2snlcaa10klq"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/rodrimati1992/konst/")
-    (synopsis "Implementation detail of the @code{konst} crate")
-    (description "Implementation detail of the @code{konst} crate.")
-    (license license:zlib)))
-
-(define-public rust-kuchiki-0.8
-  (package
-    (name "rust-kuchiki")
-    (version "0.8.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "kuchiki" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "0n53hhscgf4az58nnbjfxlqz9k96h3f02c7fhbzpqdriw33fka0y"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-cssparser" ,rust-cssparser-0.27)
-         ("rust-html5ever" ,rust-html5ever-0.25)
-         ("rust-matches" ,rust-matches-0.1)
-         ("rust-selectors" ,rust-selectors-0.22))))
-    (home-page "https://github.com/SimonSapin/kuchiki")
-    (synopsis "HTML/XML tree manipulation library")
-    (description "A library for parsing and serializing HTML and XML documents
-and traversing, manipulating, and querying the document tree.")
-    (license license:expat)))
-
 (define-public rust-human-date-parser-0.1
   (package
     (name "rust-human-date-parser")
@@ -36205,6 +36071,35 @@ (define-public rust-juniper-codegen-0.14
 GraphQL.")
     (license license:bsd-2)))
 
+(define-public rust-jwalk-0.8
+  (package
+    (name "rust-jwalk")
+    (version "0.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "jwalk" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0miw0074ch6p89dbvrlnz9wp13rh7542cf1ak8bx4v1mcrsq8d97"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-crossbeam" ,rust-crossbeam-0.8)
+                       ("rust-rayon" ,rust-rayon-1))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4)
+                                   ("rust-fs-extra" ,rust-fs-extra-1)
+                                   ("rust-ignore" ,rust-ignore-0.4)
+                                   ("rust-lazy-static" ,rust-lazy-static-1)
+                                   ("rust-num-cpus" ,rust-num-cpus-1)
+                                   ("rust-tempfile" ,rust-tempfile-3)
+                                   ("rust-walkdir" ,rust-walkdir-2))))
+    (home-page "https://github.com/byron/jwalk")
+    (synopsis
+     "Filesystem walk performed in parallel with streamed and sorted results")
+    (description
+     "Filesystem walk performed in parallel with streamed and sorted results.")
+    (license license:expat)))
+
 (define-public rust-k9-0.12
   (package
     (name "rust-k9")
@@ -36341,6 +36236,83 @@ (define-public rust-khronos-api-3
      "The Khronos XML API Registry, exposed as byte string constants.")
     (license license:asl2.0)))
 
+(define-public rust-koibumi-base32-0.0.2
+  (package
+    (name "rust-koibumi-base32")
+    (version "0.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "koibumi-base32" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1frb232m6rw50ly8ijhsbllcqfif5kcma1l6hrgm5g22c3c3il94"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1))))
+    (home-page "https://kashiko.gitlab.io/koibumi-rust/")
+    (synopsis "Base32 encoder/decoder library")
+    (description "This package provides a Base32 encoder/decoder library.")
+    (license license:gpl3+)))
+
+(define-public rust-konst-0.2
+  (package
+    (name "rust-konst")
+    (version "0.2.19")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "konst" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1x3lxxk9vjaiiaabngv7ki2bv9xi36gnqzjzi0s8qfs8wq9hw3rk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-konst-macro-rules" ,rust-konst-macro-rules-0.2)
+                       ("rust-konst-proc-macros" ,rust-konst-proc-macros-0.2)
+                       ("rust-trybuild" ,rust-trybuild-1))
+       #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/rodrimati1992/konst/")
+    (synopsis
+     "Const equivalents of std functions, compile-time comparison, and parsing")
+    (description
+     "Const equivalents of std functions, compile-time comparison, and parsing.")
+    (license license:zlib)))
+
+(define-public rust-konst-macro-rules-0.2
+  (package
+    (name "rust-konst-macro-rules")
+    (version "0.2.19")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "konst_macro_rules" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dswja0dqcww4x3fwjnirc0azv2n6cazn8yv0kddksd8awzkz4x4"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/rodrimati1992/konst/")
+    (synopsis "Implementation detail of the konst crate")
+    (description "Implementation detail of the konst crate.")
+    (license license:zlib)))
+
+(define-public rust-konst-proc-macros-0.2
+  (package
+    (name "rust-konst-proc-macros")
+    (version "0.2.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "konst_proc_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dxp8mdh3q9d044ql203way4fgbc50n3j3pi2j1x2snlcaa10klq"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/rodrimati1992/konst/")
+    (synopsis "Implementation detail of the @code{konst} crate")
+    (description "Implementation detail of the @code{konst} crate.")
+    (license license:zlib)))
+
 (define-public rust-kqueue-1
   (package
     (name "rust-kqueue")
@@ -36412,6 +36384,31 @@ (define-public rust-kstring-2
     (description "Key String provides a Rust package optimized for map keys.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-kuchiki-0.8
+  (package
+    (name "rust-kuchiki")
+    (version "0.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "kuchiki" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0n53hhscgf4az58nnbjfxlqz9k96h3f02c7fhbzpqdriw33fka0y"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-cssparser" ,rust-cssparser-0.27)
+                       ("rust-html5ever" ,rust-html5ever-0.25)
+                       ("rust-matches" ,rust-matches-0.1)
+                       ("rust-selectors" ,rust-selectors-0.22))))
+    (home-page "https://github.com/SimonSapin/kuchiki")
+    (synopsis "HTML/XML tree manipulation library")
+    (description
+     "A library for parsing and serializing HTML and XML documents
+and traversing, manipulating, and querying the document tree.")
+    (license license:expat)))
+
 (define-public rust-kv-log-macro-1
   (package
     (name "rust-kv-log-macro")
-- 
2.41.0

[bug#70606] [PATCH rust-team 068/101] gnu: Place rust-html-escape-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-html-escape-0.2): Move variable.

Change-Id: Ic5c1e9a5a84c84ad2df910f9948a89612b57ea29
---
 gnu/packages/crates-io.scm | 48 +++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 21dc0a33bc..4576a80908 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31981,6 +31981,30 @@ (define-public rust-hound-3
     (description "This package provides a wav encoding and decoding library.")
     (license license:asl2.0)))
 
+(define-public rust-html-escape-0.2
+  (package
+    (name "rust-html-escape")
+    (version "0.2.13")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "html-escape" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0xml3hswv0205fbm5iq7dqiwjkr6d245xkfppwi7wqjdfr4x86kd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-utf8-width" ,rust-utf8-width-0.1))
+       #:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher-0.1))))
+    (home-page "https://magiclen.org/html-escape")
+    (synopsis "Library for encoding and escaping special characters in HTML")
+    (description
+     "This package provides a library for encoding and escaping special
+characters in HTML, decoding and unescaping HTML entities as well.")
+    (license license:expat)))
+
 (define-public rust-html5ever-0.26
   (package
     (name "rust-html5ever")
@@ -32107,30 +32131,6 @@ (define-public rust-htmlescape-0.3
      "This package provides a library for HTML entity encoding and decoding.")
     (license (list license:asl2.0 license:expat license:mpl2.0))))
 
-(define-public rust-html-escape-0.2
-  (package
-    (name "rust-html-escape")
-    (version "0.2.13")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "html-escape" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0xml3hswv0205fbm5iq7dqiwjkr6d245xkfppwi7wqjdfr4x86kd"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-utf8-width" ,rust-utf8-width-0.1))
-       #:cargo-development-inputs
-       (("rust-bencher" ,rust-bencher-0.1))))
-    (home-page "https://magiclen.org/html-escape")
-    (synopsis "Library for encoding and escaping special characters in HTML")
-    (description
-     "This package provides a library for encoding and escaping special
-characters in HTML, decoding and unescaping HTML entities as well.")
-    (license license:expat)))
-
 (define-public rust-hts-sys-2
   (package
     (name "rust-hts-sys")
-- 
2.41.0

[bug#70606] [PATCH rust-team 069/101] gnu: Place rust-home-0.5 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-home-0.5, rust-hamcrest2-0.3): Move
variables.

Change-Id: Ibd76f91b647a26926916123ba2eb556235698e62
---
 gnu/packages/crates-io.scm | 89 +++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4576a80908..a86097bce1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30860,6 +30860,29 @@ (define-public rust-halfbrown-0.2
 higher performance on different key space sizes.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-hamcrest2-0.3
+  (package
+    (name "rust-hamcrest2")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hamcrest2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0x8hx7jyzz2bl0wf6nir62imd26yhp6qcr7zf76cjpg05p33gy29"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-num" ,rust-num-0.2)
+        ("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/Valloric/hamcrest2-rust")
+    (synopsis "Rust port of the Hamcrest testing library")
+    (description
+     "This package provides a port of the Hamcrest testing library.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-handlebars-5
   (package
     (name "rust-handlebars")
@@ -30927,50 +30950,6 @@ (define-public rust-handlebars-4
                                    ("rust-tiny-http" ,rust-tiny-http-0.11))))
     (native-inputs (list protobuf))))
 
-(define-public rust-home-0.5
-  (package
-    (name "rust-home")
-    (version "0.5.9")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "home" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "19grxyg35rqfd802pcc9ys1q3lafzlcjcv2pl2s5q8xpyr5kblg3"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-windows-sys" ,rust-windows-sys-0.52))))
-    (home-page "https://github.com/rust-lang/cargo")
-    (synopsis "Shared definitions of home directories")
-    (description "This package provides the definition of @code{home_dir}
-used by @command{cargo} and @command{rustup}, as well as functions to find the
-correct value of @samp{CARGO_HOME} and @samp{RUSTUP_HOME}.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-hamcrest2-0.3
-  (package
-    (name "rust-hamcrest2")
-    (version "0.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "hamcrest2" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0x8hx7jyzz2bl0wf6nir62imd26yhp6qcr7zf76cjpg05p33gy29"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-num" ,rust-num-0.2)
-        ("rust-regex" ,rust-regex-1))))
-    (home-page "https://github.com/Valloric/hamcrest2-rust")
-    (synopsis "Rust port of the Hamcrest testing library")
-    (description
-     "This package provides a port of the Hamcrest testing library.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-hash-hasher-2
   (package
     (name "rust-hash-hasher")
@@ -31917,6 +31896,28 @@ (define-public rust-hexf-parse-0.1
        (sha256
         (base32 "1b2h0lvksn8748764x46729ygpz8grack24spin0k29ssmr6yabr"))))))
 
+(define-public rust-home-0.5
+  (package
+    (name "rust-home")
+    (version "0.5.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "home" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19grxyg35rqfd802pcc9ys1q3lafzlcjcv2pl2s5q8xpyr5kblg3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-windows-sys" ,rust-windows-sys-0.52))))
+    (home-page "https://github.com/rust-lang/cargo")
+    (synopsis "Shared definitions of home directories")
+    (description
+     "This package provides the definition of @code{home_dir}
+used by @command{cargo} and @command{rustup}, as well as functions to find the
+correct value of @samp{CARGO_HOME} and @samp{RUSTUP_HOME}.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-hostname-0.3
   (package
     (name "rust-hostname")
-- 
2.41.0

[bug#70606] [PATCH rust-team 070/101] gnu: Place rust-fsio-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-fsio-0.4): Move variable.

Change-Id: Iab9e16a8f389eed5ee8a4a2513473324c553484e
---
 gnu/packages/crates-io.scm | 60 ++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a86097bce1..b1f4e4104f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27737,37 +27737,6 @@ (define-public rust-fs-extra-1
 process and much more.")
     (license license:expat)))
 
-(define-public rust-fsio-0.4
-  (package
-    (name "rust-fsio")
-    (version "0.4.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "fsio" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1l1nkb06s8xx84yrba5nj86wm80knv40bmy54nrl3i0cpqqcxl6s"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-dunce" ,rust-dunce-1)
-        ("rust-rand" ,rust-rand-0.8))
-       #:cargo-development-inputs
-       (("rust-doc-comment" ,rust-doc-comment-0.3))))
-    (home-page "http://github.com/sagiegurari/fsio")
-    (synopsis "File System and Path utility functions in Rust")
-    (description
-     "This crate contains utility functions for path, file and directory handling.
-There are multiple main modules for fsio:
-
-@enumerate
-@item @code{fsio::path}: Holds path related functions and traits.
-@item @code{fsio::file}:  File utility functions such as read_file, write_file, etc.
-@item @code{fsio::directory}: Directory specific utility functions.
-@end enumerate")
-    (license license:asl2.0)))
-
 (define-public rust-fs-set-times-0.19
   (package
     (name "rust-fs-set-times")
@@ -27841,6 +27810,35 @@ (define-public rust-fs2-0.2
      "This package provides cross-platform file locks and file duplication.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-fsio-0.4
+  (package
+    (name "rust-fsio")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fsio" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1l1nkb06s8xx84yrba5nj86wm80knv40bmy54nrl3i0cpqqcxl6s"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-dunce" ,rust-dunce-1)
+                       ("rust-rand" ,rust-rand-0.8))
+       #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3))))
+    (home-page "http://github.com/sagiegurari/fsio")
+    (synopsis "File System and Path utility functions in Rust")
+    (description
+     "This crate contains utility functions for path, file and directory handling.
+There are multiple main modules for fsio:
+
+@enumerate
+@item @code{fsio::path}: Holds path related functions and traits.
+@item @code{fsio::file}:  File utility functions such as read_file, write_file, etc.
+@item @code{fsio::directory}: Directory specific utility functions.
+@end enumerate")
+    (license license:asl2.0)))
+
 (define-public rust-fslock-0.2
   (package
     (name "rust-fslock")
-- 
2.41.0

[bug#70606] [PATCH rust-team 071/101] gnu: Place rust-fs2-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-fs2-0.4): Move variable.

Change-Id: I9c54001e1fcb00888d1b80140998375431e032dc
---
 gnu/packages/crates-io.scm | 48 ++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b1f4e4104f..d53affe398 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27631,31 +27631,6 @@ (define-public rust-from-variants-impl-0.6
 from_variants crate.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-fs2-0.4
-  (package
-    (name "rust-fs2")
-    (version "0.4.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "fs2" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "04v2hwk7035c088f19mfl5b1lz84gnvv2hv6m935n0hmirszqr4m"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f ;; "#![feature] may not be used on stable release channel"
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-winapi" ,rust-winapi-0.3))
-       #:cargo-development-inputs
-       (("rust-tempdir" ,rust-tempdir-0.3))))
-    (home-page "https://github.com/danburkert/fs2-rs")
-    (synopsis "Cross-platform file locks and file duplication")
-    (description "This package provides cross-platform file locks and file
-duplication.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-fs-at-0.1
   (package
     (name "rust-fs-at")
@@ -27782,6 +27757,29 @@ (define-public rust-fs-utils-1
 with the filesystem.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-fs2-0.4
+  (package
+    (name "rust-fs2")
+    (version "0.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fs2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "04v2hwk7035c088f19mfl5b1lz84gnvv2hv6m935n0hmirszqr4m"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;; "#![feature] may not be used on stable release channel"
+       #:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs (("rust-tempdir" ,rust-tempdir-0.3))))
+    (home-page "https://github.com/danburkert/fs2-rs")
+    (synopsis "Cross-platform file locks and file duplication")
+    (description "This package provides cross-platform file locks and file
+duplication.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-fs2-0.2
   (package
     (name "rust-fs2")
-- 
2.41.0

[bug#70606] [PATCH rust-team 072/101] gnu: Place rust-field-offset-0.3 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-field-offset-0.3): Move variable.

Change-Id: I6bda89cfc5d09689438edfea2f8e5c1139ee2b76
---
 gnu/packages/crates-io.scm | 48 +++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d53affe398..fb1a0be53a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26219,6 +26219,30 @@ (define-public rust-ff-derive-0.12
                        ("rust-quote" ,rust-quote-1)
                        ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-field-offset-0.3
+  (package
+    (name "rust-field-offset")
+    (version "0.3.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "field-offset" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14pvxz7yr0r3mlhaf65zva3r9d0kqid01wdw7ngx7jsh2jam870y"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build?
+       #t
+       #:cargo-inputs
+       (("rust-memoffset" ,rust-memoffset-0.6)
+        ("rust-rustc-version" ,rust-rustc-version-0.3))))
+    (home-page "https://github.com/Diggsey/rust-field-offset")
+    (synopsis "Safe pointer-to-member implementation")
+    (description "This package provides safe pointer-to-member
+implementation.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-figment-0.10
   (package
     (name "rust-figment")
@@ -26415,30 +26439,6 @@ (define-public rust-filetreelist-0.5
 navigation events, folding, scrolling and more.")
     (license license:expat)))
 
-(define-public rust-field-offset-0.3
-  (package
-    (name "rust-field-offset")
-    (version "0.3.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "field-offset" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "14pvxz7yr0r3mlhaf65zva3r9d0kqid01wdw7ngx7jsh2jam870y"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build?
-       #t
-       #:cargo-inputs
-       (("rust-memoffset" ,rust-memoffset-0.6)
-        ("rust-rustc-version" ,rust-rustc-version-0.3))))
-    (home-page "https://github.com/Diggsey/rust-field-offset")
-    (synopsis "Safe pointer-to-member implementation")
-    (description "This package provides safe pointer-to-member
-implementation.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-find-crate-0.6
   (package
     (name "rust-find-crate")
-- 
2.41.0

[bug#70606] [PATCH rust-team 073/101] gnu: Place rust-fakeit-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-fake-simd-0.1, rust-fakeit-1,
rust-fallible-collections-0.4): Move variables.

Change-Id: Ieed66efa1c0d8c7bf1acfeb0dc7e86e802315380
---
 gnu/packages/crates-io.scm | 138 ++++++++++++++++++-------------------
 1 file changed, 67 insertions(+), 71 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fb1a0be53a..0142bf58bf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25269,77 +25269,6 @@ (define-public rust-faccess-0.2
     (description "Simple file accessibility checks in rust.")
     (license license:expat)))
 
-(define-public rust-fakeit-1
-  (package
-    (name "rust-fakeit")
-    (version "1.2.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "fakeit" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0zsz58zfawf3zk9ig3n7dbd382lgndjx0xxngwsymilcgipr0bfi"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-libmath" ,rust-libmath-0.2)
-                       ("rust-rand" ,rust-rand-0.6)
-                       ("rust-simplerand" ,rust-simplerand-1)
-                       ("rust-uuid" ,rust-uuid-0.8))))
-    (home-page "https://github.com/PumpkinSeed/fakeit")
-    (synopsis "Fake data generator")
-    (description "Fake data generator library with 130+ functions.")
-    (license license:expat)))
-
-(define-public rust-fake-simd-0.1
-  (package
-    (name "rust-fake-simd")
-    (version "0.1.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "fake-simd" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1vfylvk4va2ivqx85603lyqqp0zk52cgbs4n5nfbbbqx577qm2p8"))))
-    (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
-    (home-page "https://github.com/RustCrypto/utils")
-    (synopsis "Crate for mimicking simd crate on stable Rust")
-    (description
-     "Crate for mimicking simd crate on stable Rust.")
-    (license (list license:asl2.0 license:expat))))
-
-(define-public rust-fallible-collections-0.4
-  (package
-    (name "rust-fallible-collections")
-    (version "0.4.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "fallible_collections" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0ma7lga3zqbpzrhl76raljc6y69f38mb6j5yhkk6ldkh531wqmrz"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-hashbrown" ,rust-hashbrown-0.12))))
-    (home-page "https://github.com/vcombey/fallible_collections")
-    (synopsis "Fallible collections implementation in Rust")
-    (description "This library extends the Rust standard collections to return
-a result when an allocation error occurs, ala
-@url{https://github.com/rust-lang/rfcs/blob/master/text/2116-alloc-me-maybe.md,RFC
-2116}.  The API currently proposes a fallible interface for @code{Vec},
-@code{Box}, @code{Arc}, @code{Btree} and @code{Rc}, as well as a
-@code{TryClone} trait which is implemented for primitive Rust traits and a
-fallible format macro.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-failure-0.1
   (package
     (name "rust-failure")
@@ -25393,6 +25322,73 @@ (define-public rust-failure-derive-0.1
     (description "Derives for the failure crate.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-fake-simd-0.1
+  (package
+    (name "rust-fake-simd")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fake-simd" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1vfylvk4va2ivqx85603lyqqp0zk52cgbs4n5nfbbbqx577qm2p8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://github.com/RustCrypto/utils")
+    (synopsis "Crate for mimicking simd crate on stable Rust")
+    (description "Crate for mimicking simd crate on stable Rust.")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-fakeit-1
+  (package
+    (name "rust-fakeit")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fakeit" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0zsz58zfawf3zk9ig3n7dbd382lgndjx0xxngwsymilcgipr0bfi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-libmath" ,rust-libmath-0.2)
+                       ("rust-rand" ,rust-rand-0.6)
+                       ("rust-simplerand" ,rust-simplerand-1)
+                       ("rust-uuid" ,rust-uuid-0.8))))
+    (home-page "https://github.com/PumpkinSeed/fakeit")
+    (synopsis "Fake data generator")
+    (description "Fake data generator library with 130+ functions.")
+    (license license:expat)))
+
+(define-public rust-fallible-collections-0.4
+  (package
+    (name "rust-fallible-collections")
+    (version "0.4.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fallible_collections" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ma7lga3zqbpzrhl76raljc6y69f38mb6j5yhkk6ldkh531wqmrz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-hashbrown" ,rust-hashbrown-0.12))))
+    (home-page "https://github.com/vcombey/fallible_collections")
+    (synopsis "Fallible collections implementation in Rust")
+    (description
+     "This library extends the Rust standard collections to return
+a result when an allocation error occurs, ala
+@url{https://github.com/rust-lang/rfcs/blob/master/text/2116-alloc-me-maybe.md,RFC
+2116}.  The API currently proposes a fallible interface for @code{Vec},
+@code{Box}, @code{Arc}, @code{Btree} and @code{Rc}, as well as a
+@code{TryClone} trait which is implemented for primitive Rust traits and a
+fallible format macro.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-fallible-iterator-0.3
   (package
     (name "rust-fallible-iterator")
-- 
2.41.0

[bug#70606] [PATCH rust-team 074/101] gnu: Place rust-env-filter-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-env-filter-0.1): Move variable.

Change-Id: If3c9499e191ecefcaac50639c4cce8de845411f7
---
 gnu/packages/crates-io.scm | 40 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0142bf58bf..19bd888393 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23948,6 +23948,26 @@ (define-public rust-enumset-derive-0.5
 @code{rust-enumset}.  It is not public API.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-env-filter-0.1
+  (package
+    (name "rust-env-filter")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "env_filter" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1spp4jx0fissi0bg00d8nn4vnjwf6y3hr7d0vmcq65gb214al2d0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-log" ,rust-log-0.4)
+                       ("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/rust-cli/env_logger")
+    (synopsis "Filter log events using environment variables")
+    (description "Filter log events using environment variables.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-env-logger-0.11
   (package
     (name "rust-env-logger")
@@ -24140,26 +24160,6 @@ (define-public rust-env-logger-0.3
        (("rust-regex" ,rust-regex-0.1)
         ("rust-log" ,rust-log-0.3))))))
 
-(define-public rust-env-filter-0.1
-  (package
-    (name "rust-env-filter")
-    (version "0.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "env_filter" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1spp4jx0fissi0bg00d8nn4vnjwf6y3hr7d0vmcq65gb214al2d0"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-log" ,rust-log-0.4)
-                       ("rust-regex" ,rust-regex-1))))
-    (home-page "https://github.com/rust-cli/env_logger")
-    (synopsis "Filter log events using environment variables")
-    (description "Filter log events using environment variables.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-env-proxy-0.4
   (package
     (name "rust-env-proxy")
-- 
2.41.0

[bug#70606] [PATCH rust-team 075/101] gnu: Place rust-enum-map-derive-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-enum-map-derive-0.4): Move variable.

Change-Id: I651a88684ec9817d4b1c232eb0573ff7c15b933e
---
 gnu/packages/crates-io.scm | 47 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 19bd888393..b857cb93b0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23670,30 +23670,6 @@ (define-public rust-enum-iterator-derive-1
     (description "This package provides a procedural macro to derive Sequence.")
     (license license:bsd-0)))
 
-(define-public rust-enum-map-derive-0.4
-  (package
-    (name "rust-enum-map-derive")
-    (version "0.4.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "enum-map-derive" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0mg43p1x90cz604zddk9qzss077v2id04qmmbpa1i7jc637m1i75"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://gitlab.com/KonradBorowski/enum-map")
-    (synopsis "Macros 1.1 implementation of #[derive(Enum)]")
-    (description "This package provides a macros 1.1 implementation of
-@code{#[derive(Enum)]}.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-enum-map-0.6
   (package
     (name "rust-enum-map")
@@ -23722,6 +23698,29 @@ (define-public rust-enum-map-0.6
 as an array.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-enum-map-derive-0.4
+  (package
+    (name "rust-enum-map-derive")
+    (version "0.4.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "enum-map-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0mg43p1x90cz604zddk9qzss077v2id04qmmbpa1i7jc637m1i75"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://gitlab.com/KonradBorowski/enum-map")
+    (synopsis "Macros 1.1 implementation of #[derive(Enum)]")
+    (description "This package provides a macros 1.1 implementation of
+@code{#[derive(Enum)]}.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-enum-primitive-0.1
   (package
     (name "rust-enum-primitive")
-- 
2.41.0

[bug#70606] [PATCH rust-team 076/101] gnu: Place rust-dyn-clone-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-dyn-clone-1): Move variable.

Change-Id: I5072930b0f7a9d4e422bcff270ea157a2fdcef87
---
 gnu/packages/crates-io.scm | 40 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b857cb93b0..084defe5b8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22546,26 +22546,6 @@ (define-public rust-duct-0.13
      "A library for running child processes.")
     (license license:expat)))
 
-(define-public rust-dyn-clone-1
-  (package
-    (name "rust-dyn-clone")
-    (version "1.0.17")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "dyn-clone" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "09cig7dgg6jnqa10p4233nd8wllbjf4ffsw7wj0m4lwa5w3z0vhd"))))
-    (arguments
-     `(#:cargo-development-inputs (("rust-rustversion" ,rust-rustversion-1)
-                                   ("rust-trybuild" ,rust-trybuild-1))))
-    (build-system cargo-build-system)
-    (home-page "https://crates.io/crates/dyn-clone")
-    (synopsis "Clone trait that is object-safe")
-    (description "This package provides a clone trait that is object-safe.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-dwrote-0.11
   (package
     (name "rust-dwrote")
@@ -22593,6 +22573,26 @@ (define-public rust-dwrote-0.11
      "This package provides lightweight binding to DirectWrite.")
     (license license:mpl2.0)))
 
+(define-public rust-dyn-clone-1
+  (package
+    (name "rust-dyn-clone")
+    (version "1.0.17")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "dyn-clone" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09cig7dgg6jnqa10p4233nd8wllbjf4ffsw7wj0m4lwa5w3z0vhd"))))
+    (arguments
+     `(#:cargo-development-inputs (("rust-rustversion" ,rust-rustversion-1)
+                                   ("rust-trybuild" ,rust-trybuild-1))))
+    (build-system cargo-build-system)
+    (home-page "https://crates.io/crates/dyn-clone")
+    (synopsis "Clone trait that is object-safe")
+    (description "This package provides a clone trait that is object-safe.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-easy-cast-0.5
   (package
     (name "rust-easy-cast")
-- 
2.41.0

[bug#70606] [PATCH rust-team 077/101] gnu: Place rust-downcast-rs-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-downcast-rs-1, rust-downcast-0.11):
Move variables.

Change-Id: If21ed855105a966f0e64461ff04818a9fbc1335b
---
 gnu/packages/crates-io.scm | 80 +++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 41 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 084defe5b8..ea2f9f2e94 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22222,47 +22222,6 @@ (define-public rust-document-features-0.2
 @code{Cargo.toml}.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-downcast-0.11
-  (package
-    (name "rust-downcast")
-    (version "0.11.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "downcast" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1wa78ahlc57wmqyq2ncr80l7plrkgz57xsg7kfzgpcnqac8gld8l"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/fkoep/downcast-rs")
-    (synopsis
-     "Trait for downcasting trait objects back to their original types")
-    (description
-     "This package provides a trait, and utilities, for downcasting trait
-objects back to their original types.  The same as the rust-downcast-rs crate.")
-    (license license:expat)))
-
-(define-public rust-downcast-rs-1
-  (package
-    (name "rust-downcast-rs")
-    (version "1.2.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "downcast-rs" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0l36kgxqd5djhqwf5abxjmgasdw8n0qsjvw3jdvhi91nj393ba4y"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/marcianx/downcast-rs")
-    (synopsis "Trait object downcasting support using only safe Rust")
-    (description
-     "Trait object downcasting support using only safe Rust.  It supports type
-parameters, associated types, and type constraints.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-dogged-0.2
   (package
     (name "rust-dogged")
@@ -22403,6 +22362,45 @@ (define-public rust-dotenvy-0.15
     (description "This package provides a fork of the dotenv crate.")
     (license license:expat)))
 
+(define-public rust-downcast-0.11
+  (package
+    (name "rust-downcast")
+    (version "0.11.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "downcast" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1wa78ahlc57wmqyq2ncr80l7plrkgz57xsg7kfzgpcnqac8gld8l"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/fkoep/downcast-rs")
+    (synopsis
+     "Trait for downcasting trait objects back to their original types")
+    (description
+     "This package provides a trait, and utilities, for downcasting trait
+objects back to their original types.  The same as the rust-downcast-rs crate.")
+    (license license:expat)))
+
+(define-public rust-downcast-rs-1
+  (package
+    (name "rust-downcast-rs")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "downcast-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0l36kgxqd5djhqwf5abxjmgasdw8n0qsjvw3jdvhi91nj393ba4y"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/marcianx/downcast-rs")
+    (synopsis "Trait object downcasting support using only safe Rust")
+    (description
+     "Trait object downcasting support using only safe Rust.  It supports type
+parameters, associated types, and type constraints.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-draw-state-0.8
   (package
     (name "rust-draw-state")
-- 
2.41.0

[bug#70606] [PATCH rust-team 078/101] gnu: Place rust-dhcp4r-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-dhcp4r-0.2): Move variable.

Change-Id: I37956d6812ccc3c4733a9e26037e03d446542051
---
 gnu/packages/crates-io.scm | 54 +++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ea2f9f2e94..2296e446ad 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21060,6 +21060,33 @@ (define-public rust-devise-core-0.2
                     (lambda _
                       (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
+(define-public rust-dhcp4r-0.2
+  (package
+    (name "rust-dhcp4r")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "dhcp4r" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0paq13i9iz5545f5aw8ijxflw20fvb3k8s4m3inr5q19q5rirpbc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-enum-primitive-derive" ,rust-enum-primitive-derive-0.2)
+        ("rust-nom" ,rust-nom-6)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-time" ,rust-time-0.2))))
+    (home-page "https://github.com/krolaw/dhcp4r")
+    (synopsis "IPv4 DHCP library with working server example")
+    (description
+     "This package provides a library for IPv4 DHCP including a working server
+example.")
+    (license license:bsd-3)))
+
 (define-public rust-dhcproto-0.9
   (package
     (name "rust-dhcproto")
@@ -21109,33 +21136,6 @@ (define-public rust-dhcproto-macros-0.1
 dhcproto.")
     (license license:expat)))
 
-(define-public rust-dhcp4r-0.2
-  (package
-    (name "rust-dhcp4r")
-    (version "0.2.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "dhcp4r" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0paq13i9iz5545f5aw8ijxflw20fvb3k8s4m3inr5q19q5rirpbc"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-enum-primitive-derive" ,rust-enum-primitive-derive-0.2)
-        ("rust-nom" ,rust-nom-6)
-        ("rust-num-traits" ,rust-num-traits-0.2)
-        ("rust-time" ,rust-time-0.2))))
-    (home-page "https://github.com/krolaw/dhcp4r")
-    (synopsis "IPv4 DHCP library with working server example")
-    (description
-     "This package provides a library for IPv4 DHCP including a working server
-example.")
-    (license license:bsd-3)))
-
 (define-public rust-dialoguer-0.11
   (package
     (name "rust-dialoguer")
-- 
2.41.0

[bug#70606] [PATCH rust-team 079/101] gnu: Place rust-csv-index-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-csv-index-0.1, rust-csv-async-1,
rust-cstr-0.2, rust-cstr-core-0.2): Swap variables.

Change-Id: I35334529d071f1e29465657c5bd324ce36fa063e
---
 gnu/packages/crates-io.scm | 162 ++++++++++++++++++-------------------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2296e446ad..d78044c394 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18002,59 +18002,50 @@ (define-public rust-cssparser-macros-0.6
      "This package provides the procedural macros for rust-cssparser.")
     (license license:mpl2.0)))
 
-(define-public rust-csv-async-1
+(define-public rust-cstr-0.2
   (package
-    (name "rust-csv-async")
-    (version "1.3.0")
+    (name "rust-cstr")
+    (version "0.2.12")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "csv-async" version))
+       (uri (crate-uri "cstr" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1w60k4pqm1lnbv0mbz1d1ypmkx487r0q36hyrrh84jkzs2qfazyk"))))
+        (base32 "0dj6ll9ry27kn4k0vvhlvbhn9dyyr9haxnd06bxaqnmfr01kjlk8"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f      ; Errors in the test suite code.
-       #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
-                       ("rust-csv-core" ,rust-csv-core-0.1)
-                       ("rust-futures" ,rust-futures-0.3)
-                       ("rust-itoa" ,rust-itoa-1)
-                       ("rust-ryu" ,rust-ryu-1)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-tokio" ,rust-tokio-1)
-                       ("rust-tokio-stream" ,rust-tokio-stream-0.1))
-       #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1)
-                                   ("rust-bstr" ,rust-bstr-1)
-                                   ("rust-chrono" ,rust-chrono-0.4)
-                                   ("rust-indoc" ,rust-indoc-2)
-                                   ("rust-serde" ,rust-serde-1)
-                                   ("rust-tokio" ,rust-tokio-1))))
-    (home-page "https://github.com/gwierzchowski/csv-async")
-    (synopsis "CSV parsing for async")
-    (description "This package provides CSV parsing for async.")
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1))
+       #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://github.com/upsuper/cstr")
+    (synopsis "Macro for building static CStr reference")
+    (description
+     "This package provides the macro for building static CStr reference.")
     (license license:expat)))
 
-(define-public rust-csv-index-0.1
+(define-public rust-cstr-core-0.2
   (package
-    (name "rust-csv-index")
-    (version "0.1.6")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "csv-index" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "01048y84y0bakqm0x4y1svjv6lzc753b9q598xp7xgcqrdgi6x7j"))))
+    (name "rust-cstr-core")
+    (version "0.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cstr_core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1fymp34mv7bix8m35pw3qs30b7879wmaym03ihfbzdl84plwa1r8"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-byteorder" ,rust-byteorder-1)
-        ("rust-csv" ,rust-csv-1))))
-    (home-page "https://github.com/BurntSushi/rust-csv")
-    (synopsis "On disk CSV indexing data structures")
-    (description "On disk CSV indexing data structures.")
-    (license (list license:unlicense license:expat))))
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-cty" ,rust-cty-0.2)
+        ("rust-memchr" ,rust-memchr-2))))
+    (home-page "https://github.com/Amanieu/cstr_core")
+    (synopsis "Implementation of CStr and CString for no_std environments")
+    (description
+     "This crates implements CStr and CString for no_std environments.")
+    (license (list license:asl2.0 license:expat))))
 
 (define-public rust-csv-1
   (package
@@ -18101,6 +18092,39 @@ (define-public rust-csv-0.14
        #:cargo-development-inputs
        (("rust-regex" ,rust-regex-0.1))))))
 
+(define-public rust-csv-async-1
+  (package
+    (name "rust-csv-async")
+    (version "1.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "csv-async" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1w60k4pqm1lnbv0mbz1d1ypmkx487r0q36hyrrh84jkzs2qfazyk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Errors in the test suite code.
+       #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-csv-core" ,rust-csv-core-0.1)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-itoa" ,rust-itoa-1)
+                       ("rust-ryu" ,rust-ryu-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-stream" ,rust-tokio-stream-0.1))
+       #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1)
+                                   ("rust-bstr" ,rust-bstr-1)
+                                   ("rust-chrono" ,rust-chrono-0.4)
+                                   ("rust-indoc" ,rust-indoc-2)
+                                   ("rust-serde" ,rust-serde-1)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/gwierzchowski/csv-async")
+    (synopsis "CSV parsing for async")
+    (description "This package provides CSV parsing for async.")
+    (license license:expat)))
+
 (define-public rust-csv-core-0.1
   (package
     (name "rust-csv-core")
@@ -18121,50 +18145,26 @@ (define-public rust-csv-core-0.1
     (description "Bare bones CSV parsing with no_std support.")
     (license (list license:unlicense license:expat))))
 
-(define-public rust-cstr-0.2
-  (package
-    (name "rust-cstr")
-    (version "0.2.12")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cstr" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0dj6ll9ry27kn4k0vvhlvbhn9dyyr9haxnd06bxaqnmfr01kjlk8"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quote" ,rust-quote-1))
-       #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1))))
-    (home-page "https://github.com/upsuper/cstr")
-    (synopsis "Macro for building static CStr reference")
-    (description
-     "This package provides the macro for building static CStr reference.")
-    (license license:expat)))
-
-(define-public rust-cstr-core-0.2
+(define-public rust-csv-index-0.1
   (package
-    (name "rust-cstr-core")
-    (version "0.2.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cstr_core" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1fymp34mv7bix8m35pw3qs30b7879wmaym03ihfbzdl84plwa1r8"))))
+    (name "rust-csv-index")
+    (version "0.1.6")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "csv-index" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "01048y84y0bakqm0x4y1svjv6lzc753b9q598xp7xgcqrdgi6x7j"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-cty" ,rust-cty-0.2)
-        ("rust-memchr" ,rust-memchr-2))))
-    (home-page "https://github.com/Amanieu/cstr_core")
-    (synopsis "Implementation of CStr and CString for no_std environments")
-    (description
-     "This crates implements CStr and CString for no_std environments.")
-    (license (list license:asl2.0 license:expat))))
+     `(#:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-csv" ,rust-csv-1))))
+    (home-page "https://github.com/BurntSushi/rust-csv")
+    (synopsis "On disk CSV indexing data structures")
+    (description "On disk CSV indexing data structures.")
+    (license (list license:unlicense license:expat))))
 
 (define-public rust-ct-codecs-1
   (package
-- 
2.41.0

[bug#70606] [PATCH rust-team 080/101] gnu: Place rust-crc-catalog-2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-crc-catalog-2, rust-crc-catalog-1):
Move variables.

Change-Id: I5d7349a93f74d234d1aab5205db90748d336d63a
---
 gnu/packages/crates-io.scm | 62 +++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d78044c394..a99527cfb8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16705,6 +16705,37 @@ (define-public rust-crc-any-2
 final xor value.  It has many built-in CRC functions.")
     (license license:expat)))
 
+(define-public rust-crc-catalog-2
+  (package
+    (name "rust-crc-catalog")
+    (version "2.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "crc-catalog" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xg7sz82w3nxp1jfn425fvn1clvbzb3zgblmxsyqpys0dckp9lqr"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/akhilles/crc-catalog.git")
+    (synopsis "Catalog of CRC algorithms expressed as simple Rust structs")
+    (description
+     "This package contains a catalog of CRC algorithms (generated from
+http://reveng.sourceforge.net/crc-catalogue) expressed as simple Rust structs.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-crc-catalog-1
+  (package
+    (inherit rust-crc-catalog-2)
+    (name "rust-crc-catalog")
+    (version "1.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "crc-catalog" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "00qlxgzg15fnyx6nwviibz94rjw803l2avi2k3shjfx0dnsyvbnc"))))))
+
 (define-public rust-crc32fast-1
   (package
     (name "rust-crc32fast")
@@ -16758,37 +16789,6 @@ (define-public rust-crc64-1
        (sha256
         (base32 "0469vp0q9431pqx1236g60if5q3xyxpv4h14smkd45dfzsa6aqjm"))))))
 
-(define-public rust-crc-catalog-2
-  (package
-    (name "rust-crc-catalog")
-    (version "2.4.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "crc-catalog" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1xg7sz82w3nxp1jfn425fvn1clvbzb3zgblmxsyqpys0dckp9lqr"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/akhilles/crc-catalog.git")
-    (synopsis "Catalog of CRC algorithms expressed as simple Rust structs")
-    (description
-     "This package contains a catalog of CRC algorithms (generated from
-http://reveng.sourceforge.net/crc-catalogue) expressed as simple Rust structs.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-crc-catalog-1
-  (package
-    (inherit rust-crc-catalog-2)
-    (name "rust-crc-catalog")
-    (version "1.1.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "crc-catalog" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "00qlxgzg15fnyx6nwviibz94rjw803l2avi2k3shjfx0dnsyvbnc"))))))
-
 (define-public rust-criterion-0.5
   (package
     (name "rust-criterion")
-- 
2.41.0

[bug#70606] [PATCH rust-team 081/101] gnu: Place rust-cov-mark-2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-cov-mark-2): Move variable.

Change-Id: Ie593b52e3136a43a1e0ee5d2584a55624973c297
---
 gnu/packages/crates-io.scm | 39 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a99527cfb8..329b6474f0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16205,26 +16205,6 @@ (define-public rust-core-arch-0.1
 intrinsics.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-cov-mark-2
-  (package
-    (name "rust-cov-mark")
-    (version "2.0.0-pre.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cov-mark" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0jj4yz70k31ax1n3s7iyjv1k5yzrm4hkibrazqciycyrdgvxhj0d"))))
-    (arguments `(#:skip-build? #t))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/matklad/cov-mark")
-    (synopsis "Manual coverage marks")
-    (description "This package provides a Manual coverage marks.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-count-instructions-0.1
   (package
     (name "rust-count-instructions")
@@ -16272,6 +16252,25 @@ (define-public rust-countme-3
      "This package provides a counts the number of live instances of types.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-cov-mark-2
+  (package
+    (name "rust-cov-mark")
+    (version "2.0.0-pre.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cov-mark" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jj4yz70k31ax1n3s7iyjv1k5yzrm4hkibrazqciycyrdgvxhj0d"))))
+    (arguments
+     `(#:skip-build? #t))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/matklad/cov-mark")
+    (synopsis "Manual coverage marks")
+    (description "This package provides a Manual coverage marks.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-cpal-0.13
   (package
     (name "rust-cpal")
-- 
2.41.0

[bug#70606] [PATCH rust-team 082/101] gnu: Place rust-core-arch-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-core-arch-0.1,
rust-core-affinity-0.5, rust-core-affinity-0.8, rust-cookie-store-0.12,
rust-cookie-store-0.15, rust-cookie-store-0.16, rust-cookie-store-0.19,
rust-cookie-store-0.20): Move variables.

Change-Id: I86a856b3950f2302c6ebee947b51d41e2228cc33
---
 gnu/packages/crates-io.scm | 394 ++++++++++++++++++-------------------
 1 file changed, 197 insertions(+), 197 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 329b6474f0..7004478cde 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -15757,6 +15757,137 @@ (define-public rust-cookie-factory-0.3
 similar to the nom parser combinators library.")
     (license license:expat)))
 
+(define-public rust-cookie-store-0.20
+  (package
+    (name "rust-cookie-store")
+    (version "0.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cookie_store" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xkc7fl1jik9ki13j9pjgyw51d0qd613srz1lv1qb0blpjmn2x1q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cookie" ,rust-cookie-0.17)
+                       ("rust-idna" ,rust-idna-0.3)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-publicsuffix" ,rust-publicsuffix-2)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-derive" ,rust-serde-derive-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-url" ,rust-url-2))))
+    (home-page "https://github.com/pfernie/cookie_store")
+    (synopsis "Cookie storage and retrieval")
+    (description "This package implements cookie storage and retrieval.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-cookie-store-0.19
+  (package
+    (inherit rust-cookie-store-0.20)
+    (name "rust-cookie-store")
+    (version "0.19.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cookie_store" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "19vy19rvp3a68sgxkrv6bxxlrr2ggqp0176yqb3zhmi0g4sqz8fm"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cookie" ,rust-cookie-0.16)
+        ("rust-idna" ,rust-idna-0.3)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-publicsuffix" ,rust-publicsuffix-2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-url" ,rust-url-2))))))
+
+(define-public rust-cookie-store-0.16
+  (package
+    (inherit rust-cookie-store-0.19)
+    (name "rust-cookie-store")
+    (version "0.16.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cookie_store" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kfrmxx9mi55dgbj8qgd8qbahvi1yjqwk05v0jm5y7zld6inljrf"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cookie" ,rust-cookie-0.16)
+        ("rust-idna" ,rust-idna-0.2)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-publicsuffix" ,rust-publicsuffix-2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-url" ,rust-url-2))))))
+
+(define-public rust-cookie-store-0.15
+  (package
+    (inherit rust-cookie-store-0.16)
+    (name "rust-cookie-store")
+    (version "0.15.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cookie_store" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0z0navy9k0ivrdvz492q8c4nhd3iv5l77hwfppskdp1j15607xxk"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cookie" ,rust-cookie-0.15)
+        ("rust-idna" ,rust-idna-0.2)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-publicsuffix" ,rust-publicsuffix-2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-time" ,rust-time-0.2)
+        ("rust-url" ,rust-url-2))))))
+
+(define-public rust-cookie-store-0.12
+  (package
+    (inherit rust-cookie-store-0.15)
+    (name "rust-cookie-store")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cookie_store" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1lqhmdwgnyvi1mjmw4rbgd02fwav4aabpg4vcld23d8c9g5dy61q"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cookie" ,rust-cookie-0.14)
+        ("rust-idna" ,rust-idna-0.2)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-publicsuffix" ,rust-publicsuffix-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-time" ,rust-time-0.2)
+        ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.7)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-0.6))))))
+
 (define-public rust-coolor-0.8
   (package
     (name "rust-coolor")
@@ -15882,6 +16013,72 @@ (define-public rust-cordic-0.1
 numbers using the CORDIC method.")
     (license license:bsd-3)))
 
+(define-public rust-core-affinity-0.8
+  (package
+    (name "rust-core-affinity")
+    (version "0.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "core_affinity" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0113rfzyvjpl1camxnrf92pn9vakhn9zqvgir0wgrqawcgsr4a32"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-num-cpus" ,rust-num-cpus-1)
+                       ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/Elzair/core_affinity_rs")
+    (synopsis "Manage CPU affinities")
+    (description "This package manages CPU affinities.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-core-affinity-0.5
+  (package
+    (inherit rust-core-affinity-0.8)
+    (name "rust-core-affinity")
+    (version "0.5.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "core_affinity" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07qpwyxps4gp3gci2p6c5h4cmcql7551bp91qgbv0ky3bh8h72kz"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-num-cpus" ,rust-num-cpus-1)
+        ("rust-winapi" ,rust-winapi-0.2))))))
+
+(define-public rust-core-arch-0.1
+  (package
+    (name "rust-core-arch")
+    (version "0.1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "core_arch" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "04vdvr9vj0f1cv2p54nsszmrrk9w1js4c0z4i0bdlajl1lydslim"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-development-inputs
+       (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2))))
+    (home-page "https://github.com/rust-lang/stdarch")
+    (synopsis
+     "Rust's core library architecture-specific intrinsics")
+    (description
+     "@code{core::arch} - Rust's core library architecture-specific
+intrinsics.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-core-error-0.0.0
   (package
     (name "rust-core-error")
@@ -16008,203 +16205,6 @@ (define-public rust-core2-0.3
          (base32 "1wzzy5iazdk5caadxvjfwrd312rbg7a55a1zpmsdrhk3kfpa77r3"))))
     (arguments `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2))))))
 
-(define-public rust-cookie-store-0.20
-  (package
-    (name "rust-cookie-store")
-    (version "0.20.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cookie_store" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1xkc7fl1jik9ki13j9pjgyw51d0qd613srz1lv1qb0blpjmn2x1q"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-cookie" ,rust-cookie-0.17)
-                       ("rust-idna" ,rust-idna-0.3)
-                       ("rust-indexmap" ,rust-indexmap-1)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-publicsuffix" ,rust-publicsuffix-2)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-serde-derive" ,rust-serde-derive-1)
-                       ("rust-serde-json" ,rust-serde-json-1)
-                       ("rust-time" ,rust-time-0.3)
-                       ("rust-url" ,rust-url-2))))
-    (home-page "https://github.com/pfernie/cookie_store")
-    (synopsis "Cookie storage and retrieval")
-    (description "This package implements cookie storage and retrieval.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-cookie-store-0.19
-  (package
-    (inherit rust-cookie-store-0.20)
-    (name "rust-cookie-store")
-    (version "0.19.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "cookie_store" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "19vy19rvp3a68sgxkrv6bxxlrr2ggqp0176yqb3zhmi0g4sqz8fm"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cookie" ,rust-cookie-0.16)
-        ("rust-idna" ,rust-idna-0.3)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-publicsuffix" ,rust-publicsuffix-2)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-time" ,rust-time-0.3)
-        ("rust-url" ,rust-url-2))))))
-
-(define-public rust-cookie-store-0.16
-  (package
-    (inherit rust-cookie-store-0.19)
-    (name "rust-cookie-store")
-    (version "0.16.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cookie_store" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1kfrmxx9mi55dgbj8qgd8qbahvi1yjqwk05v0jm5y7zld6inljrf"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cookie" ,rust-cookie-0.16)
-        ("rust-idna" ,rust-idna-0.2)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-publicsuffix" ,rust-publicsuffix-2)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-time" ,rust-time-0.3)
-        ("rust-url" ,rust-url-2))))))
-
-(define-public rust-cookie-store-0.15
-  (package
-    (inherit rust-cookie-store-0.16)
-    (name "rust-cookie-store")
-    (version "0.15.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cookie_store" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0z0navy9k0ivrdvz492q8c4nhd3iv5l77hwfppskdp1j15607xxk"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cookie" ,rust-cookie-0.15)
-        ("rust-idna" ,rust-idna-0.2)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-publicsuffix" ,rust-publicsuffix-2)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-time" ,rust-time-0.2)
-        ("rust-url" ,rust-url-2))))))
-
-(define-public rust-cookie-store-0.12
-  (package
-    (inherit rust-cookie-store-0.15)
-    (name "rust-cookie-store")
-    (version "0.12.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cookie_store" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1lqhmdwgnyvi1mjmw4rbgd02fwav4aabpg4vcld23d8c9g5dy61q"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cookie" ,rust-cookie-0.14)
-        ("rust-idna" ,rust-idna-0.2)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-publicsuffix" ,rust-publicsuffix-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-time" ,rust-time-0.2)
-        ("rust-url" ,rust-url-2))
-       #:cargo-development-inputs
-       (("rust-env-logger" ,rust-env-logger-0.7)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-0.6))))))
-
-(define-public rust-core-affinity-0.8
-  (package
-    (name "rust-core-affinity")
-    (version "0.8.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "core_affinity" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0113rfzyvjpl1camxnrf92pn9vakhn9zqvgir0wgrqawcgsr4a32"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
-                       ("rust-num-cpus" ,rust-num-cpus-1)
-                       ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/Elzair/core_affinity_rs")
-    (synopsis "Manage CPU affinities")
-    (description "This package manages CPU affinities.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-core-affinity-0.5
-  (package
-    (inherit rust-core-affinity-0.8)
-    (name "rust-core-affinity")
-    (version "0.5.10")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "core_affinity" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "07qpwyxps4gp3gci2p6c5h4cmcql7551bp91qgbv0ky3bh8h72kz"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-winapi" ,rust-winapi-0.2))))))
-
-(define-public rust-core-arch-0.1
-  (package
-    (name "rust-core-arch")
-    (version "0.1.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "core_arch" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "04vdvr9vj0f1cv2p54nsszmrrk9w1js4c0z4i0bdlajl1lydslim"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-development-inputs
-       (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2))))
-    (home-page "https://github.com/rust-lang/stdarch")
-    (synopsis
-     "Rust's core library architecture-specific intrinsics")
-    (description
-     "@code{core::arch} - Rust's core library architecture-specific
-intrinsics.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-count-instructions-0.1
   (package
     (name "rust-count-instructions")
-- 
2.41.0

[bug#70606] [PATCH rust-team 083/101] gnu: Place rust-const-panic-proc-macros-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-const-panic-proc-macros-0.2,
rust-const-panic-0.2, rust-const-format-proc-macros-0.2,
rust-const-format-0.2, rust-const-fn-assert-0.1, rust-const-cstr-0.3,
rust-condtype-1, rust-compound-duration-1): Move variables.

Change-Id: I2bde6b9c631acd58ac33d90d951909b4cd71c51a
---
 gnu/packages/crates-io.scm | 335 ++++++++++++++++++-------------------
 1 file changed, 166 insertions(+), 169 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7004478cde..0e908ca219 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14209,175 +14209,6 @@ (define-public rust-compact-str-0.7
 stores strings on the stack, when possible.")
     (license license:expat)))
 
-(define-public rust-compound-duration-1
-  (package
-    (name "rust-compound-duration")
-    (version "1.2.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "compound_duration" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0rb5kasd7044xxb73wz2qqxv6iwawp9gipvqhya8yybafh7a679r"))))
-    (build-system cargo-build-system)
-    (home-page "https://docs.rs/compound_duration/latest/compound_duration/")
-    (synopsis "Convert seconds to compound duration")
-    (description
-     "Convert seconds to compound duration, such as: week, days, hours,
-minutes, seconds.")
-    (license license:bsd-3)))
-
-(define-public rust-condtype-1
-  (package
-    (name "rust-condtype")
-    (version "1.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "condtype" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1by78npyhkc30jccc7kirvwip1fj0jhi2bwfmcw44dqz81xa1w5s"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-1)
-                                   ("rust-libc" ,rust-libc-0.2))))
-    (home-page "https://github.com/nvzqz/condtype")
-    (synopsis "Choose types at compile-time via boolean constants")
-    (description "Choose types at compile-time via boolean constants.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-const-cstr-0.3
-  (package
-    (name "rust-const-cstr")
-    (version "0.3.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "const-cstr" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "19ij6m8s16d0i7vma535l7w4x8bcanjcxs7c6n7sci86ydghnggd"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/cybergeek94/const-cstr")
-    (synopsis "Create static C-compatible strings from Rust string literals")
-    (description
-     "This crate lets you create static C-compatible strings from Rust string
-literals.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-const-fn-assert-0.1
-  (package
-    (name "rust-const-fn-assert")
-    (version "0.1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "const_fn_assert" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "1451yxndri5zj95lyjzckj7m3qlpyj8ibp3pb8bbbxrl7zr19mi7"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/powlpy/const_fn_assert")
-    (synopsis "Assertions for const functions")
-    (description "Assertions for const functions.")
-    (license license:expat)))
-
-(define-public rust-const-format-0.2
-  (package
-    (name "rust-const-format")
-    (version "0.2.32")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "const_format" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0wvns8mzqwkyciwr00p2g5g4ak7zz8m473di85srj11xmz3i98p3"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-test-flags
-       '("--release" "--features=__test")
-       #:cargo-inputs
-       (("rust-const-format-proc-macros" ,rust-const-format-proc-macros-0.2)
-        ("rust-konst" ,rust-konst-0.2))
-       #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.5)
-                                   ("rust-fastrand" ,rust-fastrand-1))))
-    (home-page "https://github.com/rodrimati1992/const_format_crates/")
-    (synopsis "Compile-time string formatting")
-    (description "This package provides compile-time string formatting.")
-    (license license:zlib)))
-
-(define-public rust-const-format-proc-macros-0.2
-  (package
-    (name "rust-const-format-proc-macros")
-    (version "0.2.32")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "const_format_proc_macros" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0015dzbjbd773nn6096dwqv11fm8m3gy4a4a56cz5x10zl4gzxn7"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quote" ,rust-quote-1)
-                       ("rust-syn" ,rust-syn-1)
-                       ("rust-unicode-xid" ,rust-unicode-xid-0.2))
-       #:cargo-development-inputs (("rust-fastrand" ,rust-fastrand-1))))
-    (home-page "https://github.com/rodrimati1992/const_format_crates/")
-    (synopsis "Implementation detail of the @code{const_format} crate")
-    (description "Implementation detail of the @code{const_format} crate.")
-    (license license:zlib)))
-
-(define-public rust-const-panic-0.2
-  (package
-    (name "rust-const-panic")
-    (version "0.2.8")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "const_panic" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "16w72mnzjqgwfhlq8cqm6xhd2n6lc1wan08987izv1pcxhwz4lb0"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-test-flags
-       '("--release" "--features=test")
-       #:cargo-inputs
-       (("rust-const-panic-proc-macros" ,rust-const-panic-proc-macros-0.2)
-        ("rust-typewit" ,rust-typewit-1))
-       #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.7)
-                                   ("rust-rand" ,rust-rand-0.8))))
-    (home-page "https://github.com/rodrimati1992/const_panic/")
-    (synopsis "Const panic with formatting")
-    (description "This package provides const panic with formatting.")
-    (license license:zlib)))
-
-(define-public rust-const-panic-proc-macros-0.2
-  (package
-    (name "rust-const-panic-proc-macros")
-    (version "0.2.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "const_panic_proc_macros" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1addx3a8vi02cdak3ygrqivv02jj73251h85x49aic78yznrhlrr"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quote" ,rust-quote-1)
-                       ("rust-syn" ,rust-syn-1)
-                       ("rust-unicode-xid" ,rust-unicode-xid-0.2))))
-    (home-page "https://github.com/rodrimati1992/const_panic/")
-    (synopsis "Implementation detail of the `const_panic` crate")
-    (description "Implementation detail of the `const_panic` crate.")
-    (license license:zlib)))
-
 ;; This package requires features which are unavailable
 ;; on the stable releases of Rust.
 (define-public rust-compiler-builtins-0.1
@@ -14569,6 +14400,25 @@ (define-public rust-completest-pty-0.5
      "This package provides running completions for your program.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-compound-duration-1
+  (package
+    (name "rust-compound-duration")
+    (version "1.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "compound_duration" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0rb5kasd7044xxb73wz2qqxv6iwawp9gipvqhya8yybafh7a679r"))))
+    (build-system cargo-build-system)
+    (home-page "https://docs.rs/compound_duration/latest/compound_duration/")
+    (synopsis "Convert seconds to compound duration")
+    (description
+     "Convert seconds to compound duration, such as: week, days, hours,
+minutes, seconds.")
+    (license license:bsd-3)))
+
 (define-public rust-comrak-0.18
   (package
     (name "rust-comrak")
@@ -14852,6 +14702,26 @@ (define-public rust-concurrent-queue-1
        (("rust-easy-parallel" ,rust-easy-parallel-3)
         ("rust-fastrand" ,rust-fastrand-1))))))
 
+(define-public rust-condtype-1
+  (package
+    (name "rust-condtype")
+    (version "1.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "condtype" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1by78npyhkc30jccc7kirvwip1fj0jhi2bwfmcw44dqz81xa1w5s"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                                   ("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://github.com/nvzqz/condtype")
+    (synopsis "Choose types at compile-time via boolean constants")
+    (description "Choose types at compile-time via boolean constants.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-config-0.13
   (package
     (name "rust-config")
@@ -15262,6 +15132,25 @@ (define-public rust-console-log-0.1
 the browser's console.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-const-cstr-0.3
+  (package
+    (name "rust-const-cstr")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "const-cstr" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19ij6m8s16d0i7vma535l7w4x8bcanjcxs7c6n7sci86ydghnggd"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/cybergeek94/const-cstr")
+    (synopsis "Create static C-compatible strings from Rust string literals")
+    (description
+     "This crate lets you create static C-compatible strings from Rust string
+literals.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-const-fn-0.4
   (package
     (name "rust-const-fn")
@@ -15281,6 +15170,69 @@ (define-public rust-const-fn-0.4
 const functions with conditional compilations.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-const-fn-assert-0.1
+  (package
+    (name "rust-const-fn-assert")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "const_fn_assert" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1451yxndri5zj95lyjzckj7m3qlpyj8ibp3pb8bbbxrl7zr19mi7"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/powlpy/const_fn_assert")
+    (synopsis "Assertions for const functions")
+    (description "Assertions for const functions.")
+    (license license:expat)))
+
+(define-public rust-const-format-0.2
+  (package
+    (name "rust-const-format")
+    (version "0.2.32")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "const_format" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0wvns8mzqwkyciwr00p2g5g4ak7zz8m473di85srj11xmz3i98p3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--release" "--features=__test")
+       #:cargo-inputs (("rust-const-format-proc-macros" ,rust-const-format-proc-macros-0.2)
+                       ("rust-konst" ,rust-konst-0.2))
+       #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.5)
+                                   ("rust-fastrand" ,rust-fastrand-1))))
+    (home-page "https://github.com/rodrimati1992/const_format_crates/")
+    (synopsis "Compile-time string formatting")
+    (description "This package provides compile-time string formatting.")
+    (license license:zlib)))
+
+(define-public rust-const-format-proc-macros-0.2
+  (package
+    (name "rust-const-format-proc-macros")
+    (version "0.2.32")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "const_format_proc_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0015dzbjbd773nn6096dwqv11fm8m3gy4a4a56cz5x10zl4gzxn7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1)
+                       ("rust-unicode-xid" ,rust-unicode-xid-0.2))
+       #:cargo-development-inputs (("rust-fastrand" ,rust-fastrand-1))))
+    (home-page "https://github.com/rodrimati1992/const_format_crates/")
+    (synopsis "Implementation detail of the @code{const_format} crate")
+    (description "Implementation detail of the @code{const_format} crate.")
+    (license license:zlib)))
+
 (define-public rust-const-oid-0.9
   (package
     (name "rust-const-oid")
@@ -15334,6 +15286,51 @@ (define-public rust-const-oid-0.6
         (base32 "12vv7csqqjj0x1l5mf51lgqiw76k5c3mb1yzfhfcqysks2j2lvwx"))))
     (arguments `(#:skip-build? #t))))
 
+(define-public rust-const-panic-0.2
+  (package
+    (name "rust-const-panic")
+    (version "0.2.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "const_panic" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16w72mnzjqgwfhlq8cqm6xhd2n6lc1wan08987izv1pcxhwz4lb0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--release" "--features=test")
+       #:cargo-inputs (("rust-const-panic-proc-macros" ,rust-const-panic-proc-macros-0.2)
+                       ("rust-typewit" ,rust-typewit-1))
+       #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.7)
+                                   ("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/rodrimati1992/const_panic/")
+    (synopsis "Const panic with formatting")
+    (description "This package provides const panic with formatting.")
+    (license license:zlib)))
+
+(define-public rust-const-panic-proc-macros-0.2
+  (package
+    (name "rust-const-panic-proc-macros")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "const_panic_proc_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1addx3a8vi02cdak3ygrqivv02jj73251h85x49aic78yznrhlrr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1)
+                       ("rust-unicode-xid" ,rust-unicode-xid-0.2))))
+    (home-page "https://github.com/rodrimati1992/const_panic/")
+    (synopsis "Implementation detail of the `const_panic` crate")
+    (description "Implementation detail of the `const_panic` crate.")
+    (license license:zlib)))
+
 (define-public rust-const-random-0.1
   (package
     (name "rust-const-random")
-- 
2.41.0

[bug#70606] [PATCH rust-team 084/101] gnu: Place rust-claxon-0.4 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-claxon-0.4): Move variable.

Change-Id: I44046a2cf507299cab5b145f0bd8835d23f1e6b3
---
 gnu/packages/crates-io.scm | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0e908ca219..84fd202da6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12518,25 +12518,6 @@ (define-public rust-clang-sys-1
     (description "This package provides Rust bindings for libclang.")
     (license license:asl2.0)))
 
-(define-public rust-claxon-0.4
-  (package
-    (name "rust-claxon")
-    (version "0.4.3")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "claxon" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1206mxvw833ysg10029apcsjjwly8zmsvksgza5cm7ma4ikzbysb"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:skip-build? #t)) ; Cut the dependency graph.
-    (home-page "https://github.com/ruuda/claxon#readme")
-    (synopsis "FLAC decoding library")
-    (description "This package provides a FLAC decoding library.")
-    (license license:asl2.0)))
-
 (define-public rust-clang-sys-0.29
   (package
     (inherit rust-clang-sys-1)
@@ -13153,6 +13134,25 @@ (define-public rust-clap-verbosity-flag-2
 Clap.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-claxon-0.4
+  (package
+    (name "rust-claxon")
+    (version "0.4.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "claxon" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1206mxvw833ysg10029apcsjjwly8zmsvksgza5cm7ma4ikzbysb"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list #:skip-build? #t)) ; Cut the dependency graph.
+    (home-page "https://github.com/ruuda/claxon#readme")
+    (synopsis "FLAC decoding library")
+    (description "This package provides a FLAC decoding library.")
+    (license license:asl2.0)))
+
 (define-public rust-clearscreen-2
   (package
     (name "rust-clearscreen")
-- 
2.41.0

[bug#70606] [PATCH rust-team 085/101] gnu: Place rust-clap-cargo-0.12 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-clap-cargo-0.12,
rust-clap-complete-command-0.5, rust-clap-complete-nushell-0.1,
rust-clap-conf-0.1, rust-clap-derive-4, rust-clap-derive-3): Move
variable.

Change-Id: Ic52a885092ec026316179106049f70fd534bcb13
---
 gnu/packages/crates-io.scm | 346 ++++++++++++++++++-------------------
 1 file changed, 169 insertions(+), 177 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 84fd202da6..c6d88b49e6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12552,183 +12552,6 @@ (define-public rust-clang-sys-0.28
          (base32
           "0ls8zcqi5bmmrvrk3b6r1ym4wlivinbv590d2dvg2xn9f44mbpl1"))))))
 
-(define-public rust-clap-cargo-0.12
-  (package
-    (name "rust-clap-cargo")
-    (version "0.12.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "clap-cargo" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1r2f4ad1vpaljrfbyfsv986qiwmll0iask4sdvwllka658s22grq"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-anstyle" ,rust-anstyle-1)
-                       ("rust-cargo-metadata" ,rust-cargo-metadata-0.17)
-                       ("rust-clap" ,rust-clap-4))))
-    (home-page "https://github.com/crate-ci/clap-cargo")
-    (synopsis "Re-usable CLI flags for `cargo` plugins")
-    (description "This package provides re-usable CLI flags for `cargo` plugins.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-clap-complete-command-0.5
-  (package
-    (name "rust-clap-complete-command")
-    (version "0.5.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "clap_complete_command" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0gcsj6ls8y0jpjp5172gdqwx5zj6gm4wdgrqysglr3d73qvrad0q"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-carapace-spec-clap" ,rust-carapace-spec-clap-0.1)
-        ("rust-clap" ,rust-clap-4)
-        ("rust-clap-complete" ,rust-clap-complete-4)
-        ("rust-clap-complete-fig" ,rust-clap-complete-fig-4)
-        ("rust-clap-complete-nushell" ,rust-clap-complete-nushell-0.1))
-       #:cargo-development-inputs (("rust-clap" ,rust-clap-4))))
-    (home-page "https://github.com/nihaals/clap-complete-command")
-    (synopsis
-     "Reduces boilerplate for adding a shell completion command to Clap")
-    (description "This package reduces boilerplate for adding a shell completion
-command to Clap.")
-    (license license:expat)))
-
-(define-public rust-clap-complete-fig-4
-  (package
-    (name "rust-clap-complete-fig")
-    (version "4.3.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "clap_complete_fig" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "17yfrdxy555fv56y0n69r4kgd2iwpq4mgz6k5rn5lc2i1b9y3zlr"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-clap" ,rust-clap-4)
-        ("rust-clap-complete" ,rust-clap-complete-4))
-       #:cargo-development-inputs
-       (("rust-clap" ,rust-clap-4)
-        ("rust-snapbox" ,rust-snapbox-0.4))))
-    (home-page "https://github.com/clap-rs/clap/tree/master/clap_complete_fig")
-    (synopsis "Generator library used with clap for Fig completion scripts")
-    (description
-     "This package provides a generator library used with clap for Fig
-completion scripts.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-clap-complete-nushell-0.1
-  (package
-    (name "rust-clap-complete-nushell")
-    (version "0.1.10")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "clap_complete_nushell" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0b15s7d9xpqjr1fpj8lmcv6nhgbhxvm0rzbh3cavv0xawvsl3yn7"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-clap" ,rust-clap-4)
-        ("rust-clap-complete" ,rust-clap-complete-4))
-       #:cargo-development-inputs (("rust-snapbox" ,rust-snapbox-0.4))))
-    (home-page
-     "https://github.com/clap-rs/clap/tree/master/clap_complete_nushell")
-    (synopsis
-     "Generator library used with clap for Nushell completion scripts")
-    (description
-     "This package provides a generator library used with clap for Nushell
-completion scripts.")
-    (license license:expat)))
-
-(define-public rust-clap-conf-0.1
-  (package
-    (name "rust-clap-conf")
-    (version "0.1.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "clap_conf" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1n29wr6ns660hi63mc30zvs7dhidaycw35am9spzknsal3nrs0sn"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-test-flags
-       (list "--release" "--"
-             "--skip=tests::try_holder")
-       #:cargo-inputs
-       (("rust-anyhow" ,rust-anyhow-1)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-thiserror" ,rust-thiserror-1)
-        ("rust-toml" ,rust-toml-0.5))))
-    (home-page "https://github.com/storyfeet/clap_conf")
-    (synopsis
-     "Library to unify commandline arguments, config files and environment variables")
-    (description
-     "This package provides a library to unify commandline arguments with config
-files and environment variables.  And make it easier for users to tell your program
-how to behave across the three main input sources")
-    (license license:expat)))
-
-(define-public rust-clap-derive-4
-  (package
-    (name "rust-clap-derive")
-    (version "4.5.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "clap_derive" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0r2gs2p10pb435w52xzsgz2mmx5qd3qfkmk29y4mbz9ph11k30aj"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:cargo-inputs
-           `(("rust-heck" ,rust-heck-0.5)
-             ("rust-proc-macro2" ,rust-proc-macro2-1)
-             ("rust-quote" ,rust-quote-1)
-             ("rust-syn" ,rust-syn-2))))
-    (home-page "https://clap.rs/")
-    (synopsis "Procedural macro crate for Clap")
-    (description
-     "This package provides the procedural macro crate for Clap.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-clap-derive-3
-  (package
-    (inherit rust-clap-derive-4)
-    (name "rust-clap-derive")
-    (version "3.2.25")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "clap_derive" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "025hh66cyjk5xhhq8s1qw5wkxvrm8hnv5xwwksax7dy8pnw72qxf"))))
-    (arguments
-     (list #:cargo-inputs
-           `(("rust-heck" ,rust-heck-0.4)
-             ("rust-proc-macro-error" ,rust-proc-macro-error-1)
-             ("rust-proc-macro2" ,rust-proc-macro2-1)
-             ("rust-quote" ,rust-quote-1)
-             ("rust-syn" ,rust-syn-1))))))
-
 (define-public rust-clap-4
   (package
     (name "rust-clap")
@@ -12873,6 +12696,28 @@ (define-public rust-clap-builder-4
 Command Line Argument Parser.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-clap-cargo-0.12
+  (package
+    (name "rust-clap-cargo")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "clap-cargo" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1r2f4ad1vpaljrfbyfsv986qiwmll0iask4sdvwllka658s22grq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anstyle" ,rust-anstyle-1)
+                       ("rust-cargo-metadata" ,rust-cargo-metadata-0.17)
+                       ("rust-clap" ,rust-clap-4))))
+    (home-page "https://github.com/crate-ci/clap-cargo")
+    (synopsis "Re-usable CLI flags for `cargo` plugins")
+    (description
+     "This package provides re-usable CLI flags for `cargo` plugins.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-clap-complete-4
   (package
     (name "rust-clap-complete")
@@ -12937,6 +12782,33 @@ (define-public rust-clap-complete-3
 for programs written with Clap.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-clap-complete-command-0.5
+  (package
+    (name "rust-clap-complete-command")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "clap_complete_command" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gcsj6ls8y0jpjp5172gdqwx5zj6gm4wdgrqysglr3d73qvrad0q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-carapace-spec-clap" ,rust-carapace-spec-clap-0.1)
+                       ("rust-clap" ,rust-clap-4)
+                       ("rust-clap-complete" ,rust-clap-complete-4)
+                       ("rust-clap-complete-fig" ,rust-clap-complete-fig-4)
+                       ("rust-clap-complete-nushell" ,rust-clap-complete-nushell-0.1))
+       #:cargo-development-inputs (("rust-clap" ,rust-clap-4))))
+    (home-page "https://github.com/nihaals/clap-complete-command")
+    (synopsis
+     "Reduces boilerplate for adding a shell completion command to Clap")
+    (description
+     "This package reduces boilerplate for adding a shell completion
+command to Clap.")
+    (license license:expat)))
+
 (define-public rust-clap-complete-fig-3
   (package
     (name "rust-clap-complete-fig")
@@ -12962,6 +12834,126 @@ (define-public rust-clap-complete-fig-3
 with Clap to generate Fig completion scripts.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-clap-complete-fig-4
+  (package
+    (name "rust-clap-complete-fig")
+    (version "4.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "clap_complete_fig" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17yfrdxy555fv56y0n69r4kgd2iwpq4mgz6k5rn5lc2i1b9y3zlr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-clap" ,rust-clap-4)
+                       ("rust-clap-complete" ,rust-clap-complete-4))
+       #:cargo-development-inputs (("rust-clap" ,rust-clap-4)
+                                   ("rust-snapbox" ,rust-snapbox-0.4))))
+    (home-page "https://github.com/clap-rs/clap/tree/master/clap_complete_fig")
+    (synopsis "Generator library used with clap for Fig completion scripts")
+    (description
+     "This package provides a generator library used with clap for Fig
+completion scripts.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-clap-complete-nushell-0.1
+  (package
+    (name "rust-clap-complete-nushell")
+    (version "0.1.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "clap_complete_nushell" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0b15s7d9xpqjr1fpj8lmcv6nhgbhxvm0rzbh3cavv0xawvsl3yn7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-clap" ,rust-clap-4)
+                       ("rust-clap-complete" ,rust-clap-complete-4))
+       #:cargo-development-inputs (("rust-snapbox" ,rust-snapbox-0.4))))
+    (home-page
+     "https://github.com/clap-rs/clap/tree/master/clap_complete_nushell")
+    (synopsis
+     "Generator library used with clap for Nushell completion scripts")
+    (description
+     "This package provides a generator library used with clap for Nushell
+completion scripts.")
+    (license license:expat)))
+
+(define-public rust-clap-conf-0.1
+  (package
+    (name "rust-clap-conf")
+    (version "0.1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "clap_conf" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1n29wr6ns660hi63mc30zvs7dhidaycw35am9spzknsal3nrs0sn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags (list "--release" "--" "--skip=tests::try_holder")
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-clap" ,rust-clap-2)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-toml" ,rust-toml-0.5))))
+    (home-page "https://github.com/storyfeet/clap_conf")
+    (synopsis
+     "Library to unify commandline arguments, config files and environment variables")
+    (description
+     "This package provides a library to unify commandline arguments with config
+files and environment variables.  And make it easier for users to tell your program
+how to behave across the three main input sources")
+    (license license:expat)))
+
+(define-public rust-clap-derive-4
+  (package
+    (name "rust-clap-derive")
+    (version "4.5.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "clap_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0r2gs2p10pb435w52xzsgz2mmx5qd3qfkmk29y4mbz9ph11k30aj"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:cargo-inputs `(("rust-heck" ,rust-heck-0.5)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://clap.rs/")
+    (synopsis "Procedural macro crate for Clap")
+    (description "This package provides the procedural macro crate for Clap.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-clap-derive-3
+  (package
+    (inherit rust-clap-derive-4)
+    (name "rust-clap-derive")
+    (version "3.2.25")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "clap_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "025hh66cyjk5xhhq8s1qw5wkxvrm8hnv5xwwksax7dy8pnw72qxf"))))
+    (arguments
+     (list
+      #:cargo-inputs `(("rust-heck" ,rust-heck-0.4)
+                       ("rust-proc-macro-error" ,rust-proc-macro-error-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-clap-lex-0.7
   (package
     (name "rust-clap-lex")
-- 
2.41.0

[bug#70606] [PATCH rust-team 086/101] gnu: Place rust-ci-info-0.3 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ci-info-0.3): Move variable.

Change-Id: I396a9264ed54af9da2149df1c248d414aa0cfa5e
---
 gnu/packages/crates-io.scm | 60 +++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c6d88b49e6..73190c3e3d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12300,6 +12300,36 @@ (define-public rust-chumsky-0.9
 recovery.")
     (license license:expat)))
 
+(define-public rust-ci-info-0.3
+  (package
+    (name "rust-ci-info")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ci_info" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "00pr17g6q6i752acrkycg0hkq3lm0p634anm41g3m6lqg8q83s75"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=ci::ci_test::get_bamboo"
+         "--skip=ci::ci_test::get_taskcluster_runid"
+         "--skip=ci::ci_test::get_buildkite"
+         "--skip=ci::ci_test::get_tfs")
+       #:cargo-inputs
+       (("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1))))
+    (home-page "https://github.com/sagiegurari/ci_info")
+    (synopsis "Provides current CI environment information")
+    (description
+     "This package provides current CI environment information.")
+    (license license:asl2.0)))
+
 (define-public rust-ciborium-0.2
   (package
     (name "rust-ciborium")
@@ -12413,36 +12443,6 @@ (define-public rust-circular-0.3
      "This package provides a stream abstraction designed for use with nom.")
     (license license:expat)))
 
-(define-public rust-ci-info-0.3
-  (package
-    (name "rust-ci-info")
-    (version "0.3.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "ci_info" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "00pr17g6q6i752acrkycg0hkq3lm0p634anm41g3m6lqg8q83s75"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-test-flags
-       '("--release" "--"
-         "--skip=ci::ci_test::get_bamboo"
-         "--skip=ci::ci_test::get_taskcluster_runid"
-         "--skip=ci::ci_test::get_buildkite"
-         "--skip=ci::ci_test::get_tfs")
-       #:cargo-inputs
-       (("rust-serde" ,rust-serde-1)
-        ("rust-serde-derive" ,rust-serde-derive-1))))
-    (home-page "https://github.com/sagiegurari/ci_info")
-    (synopsis "Provides current CI environment information")
-    (description
-     "This package provides current CI environment information.")
-    (license license:asl2.0)))
-
 (define-public rust-clang-ast-0.1
   (package
     (name "rust-clang-ast")
-- 
2.41.0

[bug#70606] [PATCH rust-team 087/101] gnu: Place rust-chan-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-chan-0.1): Move variable.

Change-Id: If489b86476c2c95ee01f8d0df82166df438a9c2c
---
 gnu/packages/crates-io.scm | 40 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 73190c3e3d..74a790e66b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11930,26 +11930,6 @@ (define-public rust-cfg-vis-0.3
      "This package provides a macro to support `#[cfg()]` on visibility.")
     (license license:expat)))
 
-(define-public rust-chan-0.1
-  (package
-    (name "rust-chan")
-    (version "0.1.23")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "chan" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1n0y992mqfk5zpxzvrv14g9qivacmd4fiv4j1nmgyrg0vaimcjfi"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-rand" ,rust-rand-0.3))))
-    (home-page "https://github.com/BurntSushi/chan")
-    (synopsis "DEPRECATED. Use crossbeam-channel instead")
-    (description "DEPRECATED. Use crossbeam-channel instead.")
-    (license (list license:unlicense license:expat))))
-
 (define-public rust-chalk-derive-0.75
   (package
     (name "rust-chalk-derive")
@@ -12070,6 +12050,26 @@ (define-public rust-chalk-solve-0.75
      "This package provides a combines the chalk-engine with chalk-ir.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-chan-0.1
+  (package
+    (name "rust-chan")
+    (version "0.1.23")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "chan" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1n0y992mqfk5zpxzvrv14g9qivacmd4fiv4j1nmgyrg0vaimcjfi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-rand" ,rust-rand-0.3))))
+    (home-page "https://github.com/BurntSushi/chan")
+    (synopsis "DEPRECATED. Use crossbeam-channel instead")
+    (description "DEPRECATED. Use crossbeam-channel instead.")
+    (license (list license:unlicense license:expat))))
+
 (define-public rust-charset-0.1
   (package
     (name "rust-charset")
-- 
2.41.0

[bug#70606] [PATCH rust-team 088/101] gnu: Place rust-cargo-lock-7 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-cargo-lock-9, rust-cargo-lock-8,
rust-cargo-lock-7): Move variable.

Change-Id: I6b967ef4651e338396088e2264df086ce65b4e20
---
 gnu/packages/crates-io.scm | 136 ++++++++++++++++++-------------------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 74a790e66b..60fd9b330d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11119,6 +11119,74 @@ (define-public rust-cargo-husky-1
 automatically on cargo test.")
     (license license:expat)))
 
+(define-public rust-cargo-lock-9
+  (package
+    (name "rust-cargo-lock")
+    (version "9.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cargo-lock" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0wmczs13psr8p9mc51w4r4pm900dbpbpipp87knlkd7gg19nf771"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gumdrop" ,rust-gumdrop-0.8)
+                       ("rust-petgraph" ,rust-petgraph-0.6)
+                       ("rust-semver" ,rust-semver-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-toml" ,rust-toml-0.7)
+                       ("rust-url" ,rust-url-2))))
+    (home-page "https://rustsec.org")
+    (synopsis "@file{Cargo.lock} parser with optional dependency graph analysis")
+    (description
+     "This package provides self-contained @file{Cargo.lock} parser with
+optional dependency graph analysis.")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-cargo-lock-8
+  (package
+    (inherit rust-cargo-lock-9)
+    (name "rust-cargo-lock")
+    (version "8.0.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cargo-lock" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "15nrkr11dnadmwvzjwn6yv8m20g3xw6yj2cayzgab2ppp3fih5q3"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-gumdrop" ,rust-gumdrop-0.8)
+        ("rust-petgraph" ,rust-petgraph-0.6)
+        ("rust-semver" ,rust-semver-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-toml" ,rust-toml-0.5)
+        ("rust-url" ,rust-url-2))))))
+
+(define-public rust-cargo-lock-7
+  (package
+    (inherit rust-cargo-lock-8)
+    (name "rust-cargo-lock")
+    (version "7.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cargo-lock" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "122wirj0d44xi2i7sc6anjimqfvgw5p5ry840zikc82vpn44pc3z"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-gumdrop" ,rust-gumdrop-0.8)
+        ("rust-petgraph" ,rust-petgraph-0.6)
+        ("rust-semver" ,rust-semver-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-toml" ,rust-toml-0.5)
+        ("rust-url" ,rust-url-2))))))
+
 (define-public rust-cargo-manifest-0.13
   (package
     (name "rust-cargo-manifest")
@@ -11285,74 +11353,6 @@ (define-public rust-cargo-metadata-0.13
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1))))))
 
-(define-public rust-cargo-lock-9
-  (package
-    (name "rust-cargo-lock")
-    (version "9.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cargo-lock" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0wmczs13psr8p9mc51w4r4pm900dbpbpipp87knlkd7gg19nf771"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-gumdrop" ,rust-gumdrop-0.8)
-                       ("rust-petgraph" ,rust-petgraph-0.6)
-                       ("rust-semver" ,rust-semver-1)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-toml" ,rust-toml-0.7)
-                       ("rust-url" ,rust-url-2))))
-    (home-page "https://rustsec.org")
-    (synopsis "@file{Cargo.lock} parser with optional dependency graph analysis")
-    (description
-     "This package provides self-contained @file{Cargo.lock} parser with
-optional dependency graph analysis.")
-    (license (list license:asl2.0 license:expat))))
-
-(define-public rust-cargo-lock-8
-  (package
-    (inherit rust-cargo-lock-9)
-    (name "rust-cargo-lock")
-    (version "8.0.3")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "cargo-lock" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "15nrkr11dnadmwvzjwn6yv8m20g3xw6yj2cayzgab2ppp3fih5q3"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-gumdrop" ,rust-gumdrop-0.8)
-        ("rust-petgraph" ,rust-petgraph-0.6)
-        ("rust-semver" ,rust-semver-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-toml" ,rust-toml-0.5)
-        ("rust-url" ,rust-url-2))))))
-
-(define-public rust-cargo-lock-7
-  (package
-    (inherit rust-cargo-lock-8)
-    (name "rust-cargo-lock")
-    (version "7.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "cargo-lock" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "122wirj0d44xi2i7sc6anjimqfvgw5p5ry840zikc82vpn44pc3z"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-gumdrop" ,rust-gumdrop-0.8)
-        ("rust-petgraph" ,rust-petgraph-0.6)
-        ("rust-semver" ,rust-semver-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-toml" ,rust-toml-0.5)
-        ("rust-url" ,rust-url-2))))))
-
 (define-public rust-cargo-options-0.7
   (package
     (name "rust-cargo-options")
-- 
2.41.0

[bug#70606] [PATCH rust-team 089/101] gnu: Place rust-bytesize-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-bytesize-1): Move variable.

Change-Id: I235de65a90b3efae85095eba12e333a7381d21be
---
 gnu/packages/crates-io.scm | 50 +++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 60fd9b330d..52b138502e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10116,6 +10116,31 @@ (define-public rust-bytes-0.3
        #:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.3))))))
 
+(define-public rust-bytesize-1
+  (package
+    (name "rust-bytesize")
+    (version "1.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bytesize" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1k3aak70iwz4s2gsjbxf0ws4xnixqbdz6p2ha96s06748fpniqx3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-toml" ,rust-toml-0.7))))
+    (home-page "https://github.com/hyunsik/bytesize/")
+    (synopsis "Human-readable byte count representation library for Rust")
+    (description "ByteSize is an utility for human-readable byte count
+representation, with support for both SI and binary units.")
+    (license license:asl2.0)))
+
 (define-public rust-bytestring-1
   (package
     (name "rust-bytestring")
@@ -10207,31 +10232,6 @@ (define-public rust-bzip2-0.4
 exposed as Reader/Writer streams.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-bytesize-1
-  (package
-    (name "rust-bytesize")
-    (version "1.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "bytesize" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1k3aak70iwz4s2gsjbxf0ws4xnixqbdz6p2ha96s06748fpniqx3"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-serde" ,rust-serde-1))
-       #:cargo-development-inputs
-       (("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-toml" ,rust-toml-0.7))))
-    (home-page "https://github.com/hyunsik/bytesize/")
-    (synopsis "Human-readable byte count representation library for Rust")
-    (description "ByteSize is an utility for human-readable byte count
-representation, with support for both SI and binary units.")
-    (license license:asl2.0)))
-
 (define-public rust-bzip2-0.3
   (package
     (inherit rust-bzip2-0.4)
-- 
2.41.0

[bug#70606] [PATCH rust-team 090/101] gnu: Place rust-buffer-redux-1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-buffer-redux-1): Move variable.

Change-Id: Ia8ecc9c1257081202aadd07555ca24c5a8040381
---
 gnu/packages/crates-io.scm | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 52b138502e..753c3edba1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9280,6 +9280,28 @@ (define-public rust-buf-redux-0.8
 @code{std::io}, with extra features.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-buffer-redux-1
+  (package
+    (name "rust-buffer-redux")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "buffer-redux" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1j90lnf4iz50px57xpxc6bx8hnmb6fyjm50nq6m8qn892nh6x26j"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2)
+                       ("rust-safemem" ,rust-safemem-0.3)
+                       ("rust-slice-deque" ,rust-slice-deque-0.3))))
+    (home-page "https://github.com/dignifiedquire/buffer-redux")
+    (synopsis "Replacements for buffered I/O in `std::io` with extra features")
+    (description "This crate provides a drop-in replacements for buffered I/O in
+@code{std::io} with extra features.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-buffered-reader-1
   (package
     (name "rust-buffered-reader")
@@ -9326,28 +9348,6 @@ (define-public rust-buffered-reader-0.9
         ("rust-flate2" ,rust-flate2-1)
         ("rust-libc" ,rust-libc-0.2))))))
 
-(define-public rust-buffer-redux-1
-  (package
-    (name "rust-buffer-redux")
-    (version "1.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "buffer-redux" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1j90lnf4iz50px57xpxc6bx8hnmb6fyjm50nq6m8qn892nh6x26j"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2)
-                       ("rust-safemem" ,rust-safemem-0.3)
-                       ("rust-slice-deque" ,rust-slice-deque-0.3))))
-    (home-page "https://github.com/dignifiedquire/buffer-redux")
-    (synopsis "Replacements for buffered I/O in `std::io` with extra features")
-    (description "This crate provides a drop-in replacements for buffered I/O in
-@code{std::io} with extra features.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-buffering-0.4
   (package
     (name "rust-buffering")
-- 
2.41.0

[bug#70606] [PATCH rust-team 091/101] gnu: Place rust-bio-types-0.12 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-bio-types-1, rust-bio-types-0.12):
Move variable.

Change-Id: Ida8a6dde82cb9dbbf4eafa9a9222083543461b39
---
 gnu/packages/crates-io.scm | 99 +++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 50 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 753c3edba1..cce5da656b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7507,56 +7507,6 @@ (define-public rust-bindgen-0.53
         ("rust-diff" ,rust-diff-0.1)
         ("rust-shlex" ,rust-shlex-0.1))))))
 
-(define-public rust-bio-types-1
-  (package
-    (name "rust-bio-types")
-    (version "1.0.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "bio-types" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0jmad6knx576mmz9djnqz4kldzql9mqvzs95202hh67jhydp8icx"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-clap" ,rust-clap-4)
-                       ("rust-derive-new" ,rust-derive-new-0.5)
-                       ("rust-lazy-static" ,rust-lazy-static-1)
-                       ("rust-petgraph" ,rust-petgraph-0.6)
-                       ("rust-regex" ,rust-regex-1)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-strum-macros" ,rust-strum-macros-0.24)
-                       ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://rust-bio.github.io")
-    (synopsis "Common biomedical types for use in rust-bio and rust-htslib")
-    (description
-     "This package provides a collection of common biomedical types for use in
-rust-bio and rust-htslib.")
-    (license license:expat)))
-
-(define-public rust-bio-types-0.12
-  (package
-    (inherit rust-bio-types-1)
-    (name "rust-bio-types")
-    (version "0.12.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "bio-types" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1dmcjwky9fszmwwg7ywv52xhz93zibsgl7nj9x7gadvz8yb45g0k"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-derive-new" ,rust-derive-new-0.5)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-petgraph" ,rust-petgraph-0.6)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-strum-macros" ,rust-strum-macros-0.21)
-        ("rust-thiserror" ,rust-thiserror-1))))))
-
 (define-public rust-bio-1
   (package
     (name "rust-bio")
@@ -7767,6 +7717,55 @@ (define-public rust-bio-0.41
         ("rust-rand" ,rust-rand-0.8)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-bio-types-1
+  (package
+    (name "rust-bio-types")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bio-types" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jmad6knx576mmz9djnqz4kldzql9mqvzs95202hh67jhydp8icx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-clap" ,rust-clap-4)
+                       ("rust-derive-new" ,rust-derive-new-0.5)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-petgraph" ,rust-petgraph-0.6)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-strum-macros" ,rust-strum-macros-0.24)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://rust-bio.github.io")
+    (synopsis "Common biomedical types for use in rust-bio and rust-htslib")
+    (description
+     "This package provides a collection of common biomedical types for use in
+rust-bio and rust-htslib.")
+    (license license:expat)))
+
+(define-public rust-bio-types-0.12
+  (package
+    (inherit rust-bio-types-1)
+    (name "rust-bio-types")
+    (version "0.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bio-types" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1dmcjwky9fszmwwg7ywv52xhz93zibsgl7nj9x7gadvz8yb45g0k"))))
+    (arguments
+     `(#:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-petgraph" ,rust-petgraph-0.6)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-strum-macros" ,rust-strum-macros-0.21)
+                       ("rust-thiserror" ,rust-thiserror-1))))))
+
 (define-public rust-bit-field-0.10
   (package
     (name "rust-bit-field")
-- 
2.41.0

[bug#70606] [PATCH rust-team 092/101] gnu: Place rust-base-x-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-base-x-0.2): Move variable.

Change-Id: I65813157bb86297a37a3849a300b96235fdb5a46
---
 gnu/packages/crates-io.scm | 46 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cce5da656b..c3ad2fcc61 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6585,6 +6585,29 @@ (define-public rust-barrel-0.6
 API for Rust.")
     (license (list license:expat license:x11 license:asl2.0))))
 
+(define-public rust-base-x-0.2
+  (package
+    (name "rust-base-x")
+    (version "0.2.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "base-x" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0w02sdqvg7zwm91agb2phikw4ri8jmncw32paxsv8ra1jv8ckfsc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher-0.1)
+        ("rust-json" ,rust-json-0.12)
+        ("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/OrKoN/base-x-rs")
+    (synopsis "Encode/decode any base")
+    (description "This library provides for encoding and decoding any base.")
+    (license license:expat)))
+
 (define-public rust-base32-0.4
   (package
     (name "rust-base32")
@@ -6776,29 +6799,6 @@ (define-public rust-base64-0.9
        #:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.4))))))
 
-(define-public rust-base-x-0.2
-  (package
-    (name "rust-base-x")
-    (version "0.2.11")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "base-x" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0w02sdqvg7zwm91agb2phikw4ri8jmncw32paxsv8ra1jv8ckfsc"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-development-inputs
-       (("rust-bencher" ,rust-bencher-0.1)
-        ("rust-json" ,rust-json-0.12)
-        ("rust-rand" ,rust-rand-0.8))))
-    (home-page "https://github.com/OrKoN/base-x-rs")
-    (synopsis "Encode/decode any base")
-    (description "This library provides for encoding and decoding any base.")
-    (license license:expat)))
-
 (define-public rust-basic-toml-0.1
   (package
     (name "rust-basic-toml")
-- 
2.41.0

[bug#70606] [PATCH rust-team 093/101] gnu: Place rust-av-metrics-0.9 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-av-metrics-0.9, rust-av1-grain-0.2):
Move variables.

Change-Id: I5e431546e8dec715f29f9b4662f0b622db32b2ea
---
 gnu/packages/crates-io.scm | 122 ++++++++++++++++++-------------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c3ad2fcc61..dddc9a20d6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6180,6 +6180,67 @@ (define-public rust-automod-1
     (description "Pull in every source file in a directory as a module.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-av-metrics-0.9
+  (package
+    (name "rust-av-metrics")
+    (version "0.9.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "av-metrics" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0c1m5rrrx88y1hm4i17qh0fd2rqd3jwck86lj5dkw85hpmdyjv4r"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-crossbeam" ,rust-crossbeam-0.8)
+        ("rust-itertools" ,rust-itertools-0.10)
+        ("rust-lab" ,rust-lab-0.11)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-v-frame" ,rust-v-frame-0.3))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-y4m" ,rust-y4m-0.8))))
+    (home-page "https://github.com/rust-av/av-metrics")
+    (synopsis "Collection of algorithms for measuring audio/video metrics")
+    (description
+     "This package provides a collection of algorithms for measuring
+audio/video metrics.")
+    (license license:expat)))
+
+(define-public rust-av1-grain-0.2
+  (package
+    (name "rust-av1-grain")
+    (version "0.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "av1-grain" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1gvqdh21bm1cfqiwyiinbqi0mg7x2lg2fwgmphma8ijxijfr0y36"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-arrayvec" ,rust-arrayvec-0.7)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-nom" ,rust-nom-7)
+        ("rust-num-rational" ,rust-num-rational-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-v-frame" ,rust-v-frame-0.3))
+       #:cargo-development-inputs
+       (("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-quickcheck-macros" ,rust-quickcheck-macros-1))))
+    (home-page "https://github.com/rust-av/av1-grain")
+    (synopsis "Helpers for generating and parsing AV1 film grain data")
+    (description "This package procides helpers for generating and parsing AV1
+film grain data.")
+    (license license:bsd-2)))
+
 (define-public rust-average-0.13
   (package
     (name "rust-average")
@@ -6262,67 +6323,6 @@ (define-public rust-average-0.10
 in Rust.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-av-metrics-0.9
-  (package
-    (name "rust-av-metrics")
-    (version "0.9.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "av-metrics" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0c1m5rrrx88y1hm4i17qh0fd2rqd3jwck86lj5dkw85hpmdyjv4r"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-crossbeam" ,rust-crossbeam-0.8)
-        ("rust-itertools" ,rust-itertools-0.10)
-        ("rust-lab" ,rust-lab-0.11)
-        ("rust-num-traits" ,rust-num-traits-0.2)
-        ("rust-rayon" ,rust-rayon-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-thiserror" ,rust-thiserror-1)
-        ("rust-v-frame" ,rust-v-frame-0.3))
-       #:cargo-development-inputs
-       (("rust-criterion" ,rust-criterion-0.4)
-        ("rust-y4m" ,rust-y4m-0.8))))
-    (home-page "https://github.com/rust-av/av-metrics")
-    (synopsis "Collection of algorithms for measuring audio/video metrics")
-    (description
-     "This package provides a collection of algorithms for measuring
-audio/video metrics.")
-    (license license:expat)))
-
-(define-public rust-av1-grain-0.2
-  (package
-    (name "rust-av1-grain")
-    (version "0.2.3")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "av1-grain" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "1gvqdh21bm1cfqiwyiinbqi0mg7x2lg2fwgmphma8ijxijfr0y36"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-anyhow" ,rust-anyhow-1)
-        ("rust-arrayvec" ,rust-arrayvec-0.7)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-nom" ,rust-nom-7)
-        ("rust-num-rational" ,rust-num-rational-0.4)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-v-frame" ,rust-v-frame-0.3))
-       #:cargo-development-inputs
-       (("rust-quickcheck" ,rust-quickcheck-1)
-        ("rust-quickcheck-macros" ,rust-quickcheck-macros-1))))
-    (home-page "https://github.com/rust-av/av1-grain")
-    (synopsis "Helpers for generating and parsing AV1 film grain data")
-    (description "This package procides helpers for generating and parsing AV1
-film grain data.")
-    (license license:bsd-2)))
-
 (define-public rust-average-0.9
   (package
     (inherit rust-average-0.10)
-- 
2.41.0

[bug#70606] [PATCH rust-team 094/101] gnu: Place rust-autocompress-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-autocompress-0.2): Move variable.

Change-Id: I1d71bf0ee8dfbecafefd8a220d37ef2adeed9035
---
 gnu/packages/crates-io.scm | 78 +++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dddc9a20d6..91abab858f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6083,46 +6083,6 @@ (define-public rust-auto-impl-0.4
        (("rust-rustversion" ,rust-rustversion-1)
         ("rust-trybuild" ,rust-trybuild-1))))))
 
-(define-public rust-autocompress-0.2
-  (package
-    (name "rust-autocompress")
-    (version "0.2.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "autocompress" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "16pjdfr5b2ixs2xk3h6mvxprxr84rpaips624d6vbap5vsdkvzx4"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list
-      #:tests? #false ;The crate does not include test files
-      #:skip-build? #t  ; could not find `block` in `zstd`
-      #:cargo-inputs
-      `(("rust-brotli" ,rust-brotli-3)
-        ("rust-bzip2" ,rust-bzip2-0.4)
-        ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
-        ("rust-flate2" ,rust-flate2-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-lz4" ,rust-lz4-1)
-        ("rust-snap" ,rust-snap-1)
-        ("rust-xz2" ,rust-xz2-0.1)
-        ("rust-zstd" ,rust-zstd-0.9))
-      #:cargo-development-inputs
-      `(("rust-clap" ,rust-clap-2)
-        ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)
-        ("rust-rand" ,rust-rand-0.8)
-        ("rust-temp-testdir" ,rust-temp-testdir-0.2))))
-    (inputs (list xz))
-    (native-inputs (list pkg-config))
-    (home-page "https://github.com/informationsea/autocompress-rs")
-    (synopsis "Select decoder from magic bytes or encoder from file extension")
-    (description
-     "This crate lets you automatically select a suitable decoder from magic
-bytes or encoder from file extension.")
-    (license license:asl2.0)))
-
 (define-public rust-autocfg-1
   (package
     (name "rust-autocfg")
@@ -6156,6 +6116,44 @@ (define-public rust-autocfg-0.1
           "1chwgimpx5z7xbag7krr9d8asxfqbh683qhgl9kn3hxk2l0djj8x"))))
     (arguments '(#:skip-build? #t))))
 
+(define-public rust-autocompress-0.2
+  (package
+    (name "rust-autocompress")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "autocompress" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16pjdfr5b2ixs2xk3h6mvxprxr84rpaips624d6vbap5vsdkvzx4"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:tests? #f
+      #:skip-build? #t
+      #:cargo-inputs `(("rust-brotli" ,rust-brotli-3)
+                       ("rust-bzip2" ,rust-bzip2-0.4)
+                       ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
+                       ("rust-flate2" ,rust-flate2-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-lz4" ,rust-lz4-1)
+                       ("rust-snap" ,rust-snap-1)
+                       ("rust-xz2" ,rust-xz2-0.1)
+                       ("rust-zstd" ,rust-zstd-0.9))
+      #:cargo-development-inputs `(("rust-clap" ,rust-clap-2)
+                                   ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)
+                                   ("rust-rand" ,rust-rand-0.8)
+                                   ("rust-temp-testdir" ,rust-temp-testdir-0.2))))
+    (inputs (list xz))
+    (native-inputs (list pkg-config))
+    (home-page "https://github.com/informationsea/autocompress-rs")
+    (synopsis "Select decoder from magic bytes or encoder from file extension")
+    (description
+     "This crate lets you automatically select a suitable decoder from magic
+bytes or encoder from file extension.")
+    (license license:asl2.0)))
+
 (define-public rust-automod-1
   (package
     (name "rust-automod")
-- 
2.41.0

[bug#70606] [PATCH rust-team 095/101] gnu: Place rust-atomic-write-file-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-atomic-write-file-0.1): Move
variable.

Change-Id: If09bbbb68a033b25faed71b70892260117dd4ebe
---
 gnu/packages/crates-io.scm | 40 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 91abab858f..f30858efcb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5959,26 +5959,6 @@ (define-public rust-atomic-take-1
     (description "Atomically take a value out of a container once.")
     (license license:expat)))
 
-(define-public rust-atomic-write-file-0.1
-  (package
-    (name "rust-atomic-write-file")
-    (version "0.1.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "atomic-write-file" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0dl4x0srdwjxm3zz3fj1c7m44i3b7mjiad550fqklj1n4bfbxkgd"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-nix" ,rust-nix-0.27)
-                       ("rust-rand" ,rust-rand-0.8))))
-    (home-page "https://github.com/andreacorbellini/rust-atomic-write-file")
-    (synopsis "Write files atomically to a file system")
-    (description "Write files atomically to a file system.")
-    (license license:bsd-3)))
-
 (define-public rust-atomic-waker-1
   (package
     (name "rust-atomic-waker")
@@ -6004,6 +5984,26 @@ (define-public rust-atomic-waker-1
      "This package provides a synchronization primitive for task wakeup.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-atomic-write-file-0.1
+  (package
+    (name "rust-atomic-write-file")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "atomic-write-file" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dl4x0srdwjxm3zz3fj1c7m44i3b7mjiad550fqklj1n4bfbxkgd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-nix" ,rust-nix-0.27)
+                       ("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/andreacorbellini/rust-atomic-write-file")
+    (synopsis "Write files atomically to a file system")
+    (description "Write files atomically to a file system.")
+    (license license:bsd-3)))
+
 (define-public rust-atty-0.2
   (package
     (name "rust-atty")
-- 
2.41.0

[bug#70606] [PATCH rust-team 096/101] gnu: Place rust-ascii-utils-0.9 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ascii-utils-0.9, rust-ascii-0.8,
rust-ascii-0.9, rust-ascii-1, rust-as-slice-0.1, rust-as-slice-0.2,
rust-as-raw-xcb-connection-1): Move variables.

Change-Id: I7ad46b237f4fa65fe18926381a738fd8eb9a9e02
---
 gnu/packages/crates-io.scm | 288 ++++++++++++++++++-------------------
 1 file changed, 144 insertions(+), 144 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f30858efcb..a44221572f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3919,6 +3919,64 @@ (define-public rust-as-derive-utils-0.8
         ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-as-raw-xcb-connection-1
+  (package
+    (name "rust-as-raw-xcb-connection")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "as-raw-xcb-connection" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1am99fbsp5f5vnbvr0qnjma36q49c9zvdbn0czwwvian18mk2prd"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/psychon/as-raw-xcb-connection")
+    (synopsis "Trait to facilitate interoperatibility with libxcb C API")
+    (description "This package provides trait to facilitate interoperatibility
+with @code{libxcb} C API.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-as-slice-0.2
+  (package
+    (name "rust-as-slice")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "as-slice" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "05j52y1ws8kir5zjxnl48ann0if79sb56p9nm76hvma01r7nnssi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))
+    (home-page "https://github.com/japaric/as-slice")
+    (synopsis "AsSlice and AsMutSlice traits")
+    (description "This package provides @code{AsSlice} and @code{AsMutSlice}
+traits.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-as-slice-0.1
+  (package
+    (inherit rust-as-slice-0.2)
+    (name "rust-as-slice")
+    (version "0.1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "as-slice" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1q3a9494ikaq38zjg5px5gwwrbdgnyj23b505224njlmwd4knh25"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-generic-array-0.14" ,rust-generic-array-0.14)
+        ("rust-generic-array-0.13" ,rust-generic-array-0.13)
+        ("rust-generic-array-0.12" ,rust-generic-array-0.12)
+        ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))))
+
 (define-public rust-as-variant-1
   (package
     (name "rust-as-variant")
@@ -3938,6 +3996,92 @@ (define-public rust-as-variant-1
 variants to `Option`s.")
     (license license:mpl2.0)))
 
+(define-public rust-ascii-1
+  (package
+    (name "rust-ascii")
+    (version "1.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "ascii" version))
+        (file-name
+         (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32 "05nyyp39x4wzc1959kv7ckwqpkdzjd9dw4slzyjh73qbhjcfqayr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-serde" ,rust-serde-1)
+        ("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://github.com/tomprogrammer/rust-ascii")
+    (synopsis "ASCII-only equivalents to `char`, `str` and `String`")
+    (description
+     "A rust library that provides ASCII-only string and character types,
+equivalent to the @code{char}, @code{str} and @code{String} types in the
+standard library.")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-ascii-0.9
+  (package
+    (inherit rust-ascii-1)
+    (name "rust-ascii")
+    (version "0.9.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ascii" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0km3zzkhrr22drf9p1zcblqirlxkdc7zra25acpi0h8qax5c1cga"))))
+    (arguments
+     `(#:tests? #f      ; Not all tests build.
+       #:cargo-inputs
+       (("rust-quickcheck" ,rust-quickcheck-0.6)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-test" ,rust-serde-test-1))))))
+
+(define-public rust-ascii-0.8
+  (package
+    (inherit rust-ascii-1)
+    (name "rust-ascii")
+    (version "0.8.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ascii" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "051gh2bgjq90s0f0i0hd9p4z4fpg5k82b570d1223jj7rhd8kglp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=src/ascii_char.rs - ascii_char::AsciiChar::from (line 296)"
+         "--skip=src/ascii_string.rs - ascii_string::AsciiString::pop (line 259)")
+       #:cargo-inputs
+       (("rust-quickcheck" ,rust-quickcheck-0.4))))))
+
+(define-public rust-ascii-utils-0.9
+  (package
+    (name "rust-ascii-utils")
+    (version "0.9.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ascii_utils" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jpp550pwi38msflpy7lnqm2r153kn9k19bss6k9ak9yacq8z4vi"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/tredoe/ascii_utils")
+    (synopsis "Utilities to handle ASCII characters")
+    (description
+     "This library provides utilities to handle ASCII characters.")
+    (license license:mpl2.0)))
+
 (define-public rust-asio-sys-0.2
   (package
     (name "rust-asio-sys")
@@ -4134,150 +4278,6 @@ (define-public rust-askama-0.11
              ("rust-askama-escape" ,rust-askama-escape-0.10)
              ("rust-askama-shared" ,rust-askama-shared-0.12))))))
 
-(define-public rust-as-raw-xcb-connection-1
-  (package
-    (name "rust-as-raw-xcb-connection")
-    (version "1.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "as-raw-xcb-connection" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1am99fbsp5f5vnbvr0qnjma36q49c9zvdbn0czwwvian18mk2prd"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/psychon/as-raw-xcb-connection")
-    (synopsis "Trait to facilitate interoperatibility with libxcb C API")
-    (description "This package provides trait to facilitate interoperatibility
-with @code{libxcb} C API.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-as-slice-0.2
-  (package
-    (name "rust-as-slice")
-    (version "0.2.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "as-slice" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "05j52y1ws8kir5zjxnl48ann0if79sb56p9nm76hvma01r7nnssi"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))
-    (home-page "https://github.com/japaric/as-slice")
-    (synopsis "AsSlice and AsMutSlice traits")
-    (description "This package provides @code{AsSlice} and @code{AsMutSlice}
-traits.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-as-slice-0.1
-  (package
-    (inherit rust-as-slice-0.2)
-    (name "rust-as-slice")
-    (version "0.1.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "as-slice" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1q3a9494ikaq38zjg5px5gwwrbdgnyj23b505224njlmwd4knh25"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-generic-array-0.14" ,rust-generic-array-0.14)
-        ("rust-generic-array-0.13" ,rust-generic-array-0.13)
-        ("rust-generic-array-0.12" ,rust-generic-array-0.12)
-        ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))))
-
-(define-public rust-ascii-1
-  (package
-    (name "rust-ascii")
-    (version "1.1.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "ascii" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32 "05nyyp39x4wzc1959kv7ckwqpkdzjd9dw4slzyjh73qbhjcfqayr"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-serde" ,rust-serde-1)
-        ("rust-serde-test" ,rust-serde-test-1))))
-    (home-page "https://github.com/tomprogrammer/rust-ascii")
-    (synopsis "ASCII-only equivalents to `char`, `str` and `String`")
-    (description
-     "A rust library that provides ASCII-only string and character types,
-equivalent to the @code{char}, @code{str} and @code{String} types in the
-standard library.")
-    (license (list license:asl2.0 license:expat))))
-
-(define-public rust-ascii-0.9
-  (package
-    (inherit rust-ascii-1)
-    (name "rust-ascii")
-    (version "0.9.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "ascii" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0km3zzkhrr22drf9p1zcblqirlxkdc7zra25acpi0h8qax5c1cga"))))
-    (arguments
-     `(#:tests? #f      ; Not all tests build.
-       #:cargo-inputs
-       (("rust-quickcheck" ,rust-quickcheck-0.6)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-test" ,rust-serde-test-1))))))
-
-(define-public rust-ascii-0.8
-  (package
-    (inherit rust-ascii-1)
-    (name "rust-ascii")
-    (version "0.8.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "ascii" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "051gh2bgjq90s0f0i0hd9p4z4fpg5k82b570d1223jj7rhd8kglp"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-test-flags
-       '("--release" "--"
-         "--skip=src/ascii_char.rs - ascii_char::AsciiChar::from (line 296)"
-         "--skip=src/ascii_string.rs - ascii_string::AsciiString::pop (line 259)")
-       #:cargo-inputs
-       (("rust-quickcheck" ,rust-quickcheck-0.4))))))
-
-(define-public rust-ascii-utils-0.9
-  (package
-    (name "rust-ascii-utils")
-    (version "0.9.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "ascii_utils" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0jpp550pwi38msflpy7lnqm2r153kn9k19bss6k9ak9yacq8z4vi"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/tredoe/ascii_utils")
-    (synopsis "Utilities to handle ASCII characters")
-    (description
-     "This library provides utilities to handle ASCII characters.")
-    (license license:mpl2.0)))
-
 (define-public rust-assert-0.7
   (package
     (name "rust-assert")
-- 
2.41.0

[bug#70606] [PATCH rust-team 097/101] gnu: Place rust-askama-0.11 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-askama-0.12, rust-askama-0.11,
rust-askama-shared-0.12, rust-askama-escape-0.10): Swap variables.

Change-Id: Ia6d51c8fe62d7f719cf9937a536d4b5ea86d1a66
---
 gnu/packages/crates-io.scm | 146 ++++++++++++++++++-------------------
 1 file changed, 73 insertions(+), 73 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a44221572f..f3259d2b32 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4109,61 +4109,53 @@ (define-public rust-asio-sys-0.2
      "Low-level interface and binding generation for the Steinberg ASIO SDK.")
     (license license:asl2.0)))
 
-(define-public rust-askama-escape-0.10
+(define-public rust-askama-0.12
   (package
-    (name "rust-askama-escape")
-    (version "0.10.3")
+    (name "rust-askama")
+    (version "0.12.1")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "askama_escape" version))
+       (uri (crate-uri "askama" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0hg3rz0cma5f6385z7qmqw3jbir76jndwd5s7dqfk92v9gil75v1"))))
+        (base32 "0a1cmp0f1b01zzbzzp81ppa6r754zpax5372aykswz5933gr345p"))))
     (build-system cargo-build-system)
-    (arguments (list #:skip-build? #t))
+    (arguments
+     `(#:cargo-inputs (("rust-askama-derive" ,rust-askama-derive-0.12)
+                       ("rust-askama-escape" ,rust-askama-escape-0.10)
+                       ("rust-comrak" ,rust-comrak-0.18)
+                       ("rust-humansize" ,rust-humansize-2)
+                       ("rust-num-traits" ,rust-num-traits-0.2)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-serde-yaml" ,rust-serde-yaml-0.9))))
     (home-page "https://github.com/djc/askama")
-    (synopsis "HTML escaping extracted from Askama")
+    (synopsis "Type-safe, compiled Jinja-like templates for Rust")
     (description
-     "This package provides an optimized HTML escaping library,
-extracted from Askama.")
+     "This package provides a type-safe, compiled Jinja-like template
+library for Rust.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-askama-shared-0.12
+(define-public rust-askama-0.11
   (package
-    (name "rust-askama-shared")
-    (version "0.12.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "askama_shared" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1l4fycmw65zyvfabf672sj2pc0ilfcj0y6a0csygq1wa26a2nwmz"))))
-    (build-system cargo-build-system)
+    (inherit rust-askama-0.12)
+    (name "rust-askama")
+    (version "0.11.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "askama" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0f81mzccdadryzaf2dbad1araq4nadp9mssyvdvv31hj6w7z367v"))))
     (arguments
      (list #:skip-build? #t
            #:cargo-inputs
-           `(("rust-askama-escape" ,rust-askama-escape-0.10)
-             ("rust-comrak" ,rust-comrak-0.12)
-             ("rust-humansize" ,rust-humansize-1)
-             ("rust-mime" ,rust-mime-0.3)
-             ("rust-mime-guess" ,rust-mime-guess-2)
-             ("rust-nom" ,rust-nom-7)
-             ("rust-num-traits" ,rust-num-traits-0.2)
-             ("rust-percent-encoding"
-              ,rust-percent-encoding-2)
-             ("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-serde-yaml" ,rust-serde-yaml-0.8)
-             ("rust-syn" ,rust-syn-1)
-             ("rust-toml" ,rust-toml-0.5))))
-    (home-page "https://github.com/djc/askama")
-    (synopsis "Shared code for Askama")
-    (description "This package provides shared code for Askama.")
-    (license (list license:expat license:asl2.0))))
+           `(("rust-askama-derive" ,rust-askama-derive-0.11)
+             ("rust-askama-escape" ,rust-askama-escape-0.10)
+             ("rust-askama-shared" ,rust-askama-shared-0.12))))))
 
 (define-public rust-askama-derive-0.12
   (package
@@ -4211,6 +4203,27 @@ (define-public rust-askama-derive-0.11
              ("rust-proc-macro2" ,rust-proc-macro2-1)
              ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-askama-escape-0.10
+  (package
+    (name "rust-askama-escape")
+    (version "0.10.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "askama_escape" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hg3rz0cma5f6385z7qmqw3jbir76jndwd5s7dqfk92v9gil75v1"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:skip-build? #t))
+    (home-page "https://github.com/djc/askama")
+    (synopsis "HTML escaping extracted from Askama")
+    (description "This package provides an optimized HTML escaping library,
+extracted from Askama.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-askama-parser-0.2
   (package
     (name "rust-askama-parser")
@@ -4230,54 +4243,41 @@ (define-public rust-askama-parser-0.2
     (description "Parser for Askama templates.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-askama-0.12
+(define-public rust-askama-shared-0.12
   (package
-    (name "rust-askama")
-    (version "0.12.1")
+    (name "rust-askama-shared")
+    (version "0.12.2")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "askama" version))
+       (uri (crate-uri "askama_shared" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0a1cmp0f1b01zzbzzp81ppa6r754zpax5372aykswz5933gr345p"))))
+        (base32 "1l4fycmw65zyvfabf672sj2pc0ilfcj0y6a0csygq1wa26a2nwmz"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-askama-derive" ,rust-askama-derive-0.12)
-                       ("rust-askama-escape" ,rust-askama-escape-0.10)
-                       ("rust-comrak" ,rust-comrak-0.18)
-                       ("rust-humansize" ,rust-humansize-2)
+     (list
+      #:skip-build? #t
+      #:cargo-inputs `(("rust-askama-escape" ,rust-askama-escape-0.10)
+                       ("rust-comrak" ,rust-comrak-0.12)
+                       ("rust-humansize" ,rust-humansize-1)
+                       ("rust-mime" ,rust-mime-0.3)
+                       ("rust-mime-guess" ,rust-mime-guess-2)
+                       ("rust-nom" ,rust-nom-7)
                        ("rust-num-traits" ,rust-num-traits-0.2)
                        ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("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-serde-yaml" ,rust-serde-yaml-0.9))))
+                       ("rust-serde-yaml" ,rust-serde-yaml-0.8)
+                       ("rust-syn" ,rust-syn-1)
+                       ("rust-toml" ,rust-toml-0.5))))
     (home-page "https://github.com/djc/askama")
-    (synopsis "Type-safe, compiled Jinja-like templates for Rust")
-    (description
-     "This package provides a type-safe, compiled Jinja-like template
-library for Rust.")
+    (synopsis "Shared code for Askama")
+    (description "This package provides shared code for Askama.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-askama-0.11
-  (package
-    (inherit rust-askama-0.12)
-    (name "rust-askama")
-    (version "0.11.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "askama" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0f81mzccdadryzaf2dbad1araq4nadp9mssyvdvv31hj6w7z367v"))))
-    (arguments
-     (list #:skip-build? #t
-           #:cargo-inputs
-           `(("rust-askama-derive" ,rust-askama-derive-0.11)
-             ("rust-askama-escape" ,rust-askama-escape-0.10)
-             ("rust-askama-shared" ,rust-askama-shared-0.12))))))
-
 (define-public rust-assert-0.7
   (package
     (name "rust-assert")
-- 
2.41.0

[bug#70606] [PATCH rust-team 098/101] gnu: Place rust-arr-macro-impl-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-arr-macro-impl-0.1): Move variable.

Change-Id: I975651a7ed5cf9a399f93eca0f0f2a3f4fc0a32c
---
 gnu/packages/crates-io.scm | 45 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f3259d2b32..d490bc34ad 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2764,29 +2764,6 @@ (define-public rust-ariadne-0.1
     (description "This package provides a fancy diagnostics & reporting crate.")
     (license license:expat)))
 
-(define-public rust-arr-macro-impl-0.1
-  (package
-    (name "rust-arr-macro-impl")
-    (version "0.1.3")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "arr_macro_impl" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1lbjilz3pvwav72dfkcbz99rsq7m04xbdpqh8g3yvx3jsn5wf286"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/JoshMcguigan/arr_macro")
-    (synopsis "Private impl crate for arr_macro")
-    (description "This package provides a private @code{impl} crate for
-@code{arr_macro}.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-arr-macro-0.1
   (package
     (name "rust-arr-macro")
@@ -2810,6 +2787,28 @@ (define-public rust-arr-macro-0.1
 do not implement the copy or default traits.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-arr-macro-impl-0.1
+  (package
+    (name "rust-arr-macro-impl")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "arr_macro_impl" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1lbjilz3pvwav72dfkcbz99rsq7m04xbdpqh8g3yvx3jsn5wf286"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/JoshMcguigan/arr_macro")
+    (synopsis "Private impl crate for arr_macro")
+    (description "This package provides a private @code{impl} crate for
+@code{arr_macro}.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-array-init-2
   (package
     (name "rust-array-init")
-- 
2.41.0

[bug#70606] [PATCH rust-team 099/101] gnu: Place rust-argh-shared-0.1 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-argh-shared-0.1, rust-argh-0.1): Swap
variables.

Change-Id: Iefe88d2d405dd0fb8df4dc7d731ec90f263a06a0
---
 gnu/packages/crates-io.scm | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d490bc34ad..833e27ca95 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2621,23 +2621,26 @@ (define-public rust-argfile-0.1
 @code{rust-wild}.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-argh-shared-0.1
+(define-public rust-argh-0.1
   (package
-    (name "rust-argh-shared")
+    (name "rust-argh")
     (version "0.1.12")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "argh_shared" version))
+       (uri (crate-uri "argh" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0cbmf3n5fd7ha014m303f4bmsmj0v84an4a1rh77d9dx868z74sn"))))
+        (base32 "06fjmac07knqw7vahra9rkbfrrsv31yrqhf7wi623xvzjq3bmxbs"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))))
+     `(#:cargo-inputs (("rust-argh-derive" ,rust-argh-derive-0.1)
+                       ("rust-argh-shared" ,rust-argh-shared-0.1))
+       #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1)
+                                   ("rust-trybuild" ,rust-trybuild-1))))
     (home-page "https://github.com/google/argh")
-    (synopsis "Derive-based argument parsing optimized for code size")
-    (description "Derive-based argument parsing optimized for code size.")
+    (synopsis "Derive-based argument parser optimized for code size")
+    (description "Derive-based argument parser optimized for code size.")
     (license license:bsd-3)))
 
 (define-public rust-argh-derive-0.1
@@ -2662,26 +2665,23 @@ (define-public rust-argh-derive-0.1
     (description "Derive-based argument parsing optimized for code size.")
     (license license:bsd-3)))
 
-(define-public rust-argh-0.1
+(define-public rust-argh-shared-0.1
   (package
-    (name "rust-argh")
+    (name "rust-argh-shared")
     (version "0.1.12")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "argh" version))
+       (uri (crate-uri "argh_shared" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "06fjmac07knqw7vahra9rkbfrrsv31yrqhf7wi623xvzjq3bmxbs"))))
+        (base32 "0cbmf3n5fd7ha014m303f4bmsmj0v84an4a1rh77d9dx868z74sn"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-argh-derive" ,rust-argh-derive-0.1)
-                       ("rust-argh-shared" ,rust-argh-shared-0.1))
-       #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1)
-                                   ("rust-trybuild" ,rust-trybuild-1))))
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))))
     (home-page "https://github.com/google/argh")
-    (synopsis "Derive-based argument parser optimized for code size")
-    (description "Derive-based argument parser optimized for code size.")
+    (synopsis "Derive-based argument parsing optimized for code size")
+    (description "Derive-based argument parsing optimized for code size.")
     (license license:bsd-3)))
 
 (define-public rust-argmax-0.3
-- 
2.41.0

[bug#70606] [PATCH rust-team 100/101] gnu: Place rust-aliasable-deref-trait-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-aliasable-deref-trait-0.2): Move
variable.

Change-Id: I1e1b427ee70e864094d4b0efbdf3b0439dddbe7f
---
 gnu/packages/crates-io.scm | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 833e27ca95..412f7dbceb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1109,25 +1109,6 @@ (define-public rust-alga-derive-0.9
 @code{alga} crate.")
     (license license:asl2.0)))
 
-(define-public rust-aliasable-deref-trait-0.2
-  (package
-    (name "rust-aliasable-deref-trait")
-    (version "0.2.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "aliasable_deref_trait" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0abzqsxd09jxl01brzjnwk8zg7k8zma76gzq87385q8fqm710jxb"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/avitex/rust-aliasable-deref-trait")
-    (synopsis "Marker trait for aliasable pointers")
-    (description
-     "This package provides a marker trait for types that deref to an
-address that is aliasable when coerced to a raw pointer")
-    (license license:expat)))
-
 (define-public rust-aliasable-0.1
   (package
     (name "rust-aliasable")
@@ -1151,6 +1132,25 @@ (define-public rust-aliasable-0.1
 types.")
     (license license:expat)))
 
+(define-public rust-aliasable-deref-trait-0.2
+  (package
+    (name "rust-aliasable-deref-trait")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "aliasable_deref_trait" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0abzqsxd09jxl01brzjnwk8zg7k8zma76gzq87385q8fqm710jxb"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/avitex/rust-aliasable-deref-trait")
+    (synopsis "Marker trait for aliasable pointers")
+    (description
+     "This package provides a marker trait for types that deref to an
+address that is aliasable when coerced to a raw pointer")
+    (license license:expat)))
+
 (define-public rust-aligned-0.4
   (package
     (name "rust-aligned")
-- 
2.41.0

[bug#70606] [PATCH rust-team 101/101] gnu: Place rust-addchain-0.2 in alphabetical order.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-addchain-0.2, rust-addr-0.14): Move
variables.

Change-Id: Id3812bc3d9a0f140f6ff0d9c9a89ca49d06b34ff
---
 gnu/packages/crates-io.scm | 96 +++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 412f7dbceb..7ea09ffcb7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -532,6 +532,54 @@ (define-public rust-adblock-0.5
         ("rust-sha2" ,rust-sha2-0.9)
         ("rust-tokio" ,rust-tokio-1))))))
 
+(define-public rust-addchain-0.2
+  (package
+    (name "rust-addchain")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "addchain" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0w45hpybsx9gzhlxf6x9451kycg8xwj3x8qzjnk8wqm55926jbiv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-num-bigint" ,rust-num-bigint-0.3)
+        ("rust-num-integer" ,rust-num-integer-0.1)
+        ("rust-num-traits" ,rust-num-traits-0.2))))
+    (home-page "https://github.com/str4d/addchain")
+    (synopsis "Generate addition chains")
+    (description "Generate addition chains")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-addr-0.14
+  (package
+    (name "rust-addr")
+    (version "0.14.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "addr" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0w6v0wwv203v0lyvwsq27rwfhvmw7dsmrqc9r3gszbx2974wlk65"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-no-std-net" ,rust-no-std-net-0.5)
+         ("rust-psl" ,rust-psl-2)
+         ("rust-psl-types" ,rust-psl-types-2)
+         ("rust-publicsuffix" ,rust-publicsuffix-2)
+         ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/addr-rs/addr")
+    (synopsis "Parsing domain names")
+    (description "This package provides a library for parsing domain names.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-addr2line-0.21
   (package
     (name "rust-addr2line")
@@ -601,54 +649,6 @@ (define-public rust-addr2line-0.19
         ("rust-rustc-test" ,rust-rustc-test-0.3)
         ("rust-typed-arena" ,rust-typed-arena-2))))))
 
-(define-public rust-addchain-0.2
-  (package
-    (name "rust-addchain")
-    (version "0.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "addchain" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0w45hpybsx9gzhlxf6x9451kycg8xwj3x8qzjnk8wqm55926jbiv"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-num-bigint" ,rust-num-bigint-0.3)
-        ("rust-num-integer" ,rust-num-integer-0.1)
-        ("rust-num-traits" ,rust-num-traits-0.2))))
-    (home-page "https://github.com/str4d/addchain")
-    (synopsis "Generate addition chains")
-    (description "Generate addition chains")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-addr-0.14
-  (package
-    (name "rust-addr")
-    (version "0.14.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "addr" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0w6v0wwv203v0lyvwsq27rwfhvmw7dsmrqc9r3gszbx2974wlk65"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-no-std-net" ,rust-no-std-net-0.5)
-         ("rust-psl" ,rust-psl-2)
-         ("rust-psl-types" ,rust-psl-types-2)
-         ("rust-publicsuffix" ,rust-publicsuffix-2)
-         ("rust-serde" ,rust-serde-1))))
-    (home-page "https://github.com/addr-rs/addr")
-    (synopsis "Parsing domain names")
-    (description "This package provides a library for parsing domain names.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-adler-1
   (package
     (name "rust-adler")
-- 
2.41.0