[bug#67919] [PATCH 00/55 rust-team] gnu: eza: Update to 0.17.0.

[bug#67919] [PATCH 00/55 rust-team] gnu: eza: Update to 0.17.0.

[Jaeme Sifat via Guix-patches via]

This patchset updates eza to 0.17.0 and also includes removing exa as
it is deprecated and not recommended for use anymore.

Jaeme Sifat (55):
  gnu: Add rust-windows-x86-64-msvc-0.52.
  gnu: Add rust-windows-x86-64-gnullvm-0.52.
  gnu: Add rust-windows-x86-64-gnu-0.52.
  gnu: Add rust-windows-i686-msvc-0.52.
  gnu: Add rust-windows-i686-gnu-0.52.
  gnu: Add rust-windows-aarch64-msvc-0.52.
  gnu: Add rust-windows-aarch64-gnullvm-0.52.
  gnu: Add rust-windows-targets-0.52.
  gnu: Add rust-windows-sys-0.52.
  gnu: rust-uniquote-3: Update to 0.1.11.
  gnu: Add rust-toml-edit-0.1.
  gnu: Add rust-rstest-test-0.2.
  gnu: Add rust-rstest-reuse-0.1.
  gnu: Add rust-rstest-0.7.
  gnu: Add rust-rstest-0.8.
  gnu: Add rust-rstest-0.9.
  gnu: rust-rstest-0.6: Downgrade to 0.6.4.
  gnu: Add rust-rstest-test-0.9.
  gnu: Add rust-rstest-macros-0.16.
  gnu: Add rust-rstest-0.16.
  gnu: Add rust-rstest-test-0.11.
  gnu: Add rust-rstest-macros-0.18.
  gnu: Add rust-rstest-0.18.
  gnu: rust-time-core-0.1: Update to 0.1.2.
  gnu: rust-time-macros-0.2: Update to 0.2.15.
  gnu: rust-time-0.3: Update to 0.3.30.
  gnu: Add rust-quick-xml-0.31.
  gnu: Add rust-elain-0.3.
  gnu: Add rust-zerocopy-derive-0.7.
  gnu: rust-zerocopy-derive-0.3: Add build step.
  gnu: rust-zerocopy-derive-0.2: Downgrade to 0.2.0.
  gnu: Add rust-zerocopy-0.7.
  gnu: rust-ahash-0.8: Update to 0.8.6.
  gnu: rust-hashbrown-0.14: Update to 0.14.3.
  gnu: rust-indexmap-2: Update to 2.1.0.
  gnu: rust-plist-1: Update to 1.6.0.
  gnu: rust-percent-encoding-2: Update to 2.3.1.
  gnu: Add rust-generic-array-0.11.
  gnu: Add rust-alga-derive-0.7.
  gnu: Add rust-alga-0.7.
  gnu: Add rust-abomonation-0.5.
  gnu: Add rust-nalgebra-0.16.
  gnu: Add rust-scad-1.
  gnu: Add rust-rand-mt-4.
  gnu: Add rust-topology-traits-0.1.
  gnu: Add rust-assert-float-eq-1.
  gnu: Add rust-enterpolation-0.2.
  gnu: Add rust-find-crate-0.6.
  gnu: Add rust-palette-derive-0.7.
  gnu: Add rust-fast-srgb8-1.
  gnu: Add rust-palette-0.7.
  gnu: rust-once-cell-1: Update to 1.19.0.
  gnu: eza: Update to 0.17.0.
  gnu: Remove exa.
  gnu: eza: Refactor package definition.

 gnu/packages/crates-graphics.scm |  149 ++++
 gnu/packages/crates-io.scm       | 1088 +++++++++++++++++++++++++-----
 gnu/packages/rust-apps.scm       |  178 ++---
 3 files changed, 1103 insertions(+), 312 deletions(-)


base-commit: 6454788a5cf79a217bda86d49a6e403cc803747f
--
2.41.0

[bug#67919] [PATCH 01/55] gnu: Add rust-windows-x86-64-msvc-0.52.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-windows-x86-64-msvc-0.52): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ddafebd1d6..d90cf94c54 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -89410,8 +89410,30 @@ (define-public rust-windows-x86-64-gnullvm-0.42
                '(delete-file "lib/libwindows.a"))))
     (arguments (list #:skip-build? #t))))
 
+(define-public rust-windows-x86-64-msvc-0.52
+  (package
+    (name "rust-windows-x86-64-msvc")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_x86_64_msvc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "012wfq37f18c09ij5m6rniw7xxn5fcvrxbqd0wd8vgnl3hfn9yfz"))
+       (snippet
+        #~(delete-file "lib/windows.0.52.0.lib"))))
+    (build-system cargo-build-system)
+    (arguments (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-x86-64-msvc-0.48
   (package
+    (inherit rust-windows-x86-64-msvc-0.52)
     (name "rust-windows-x86-64-msvc")
     (version "0.48.0")
     (source (origin
@@ -89422,14 +89444,7 @@ (define-public rust-windows-x86-64-msvc-0.48
                (base32
                 "12ipr1knzj2rwjygyllfi5mkd0ihnbi3r61gag5n2jgyk5bmyl8s"))
               (snippet
-               '(delete-file "lib/windows.0.48.0.lib"))))
-    (build-system cargo-build-system)
-    (arguments (list #:skip-build? #t))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Code gen support for the windows crate")
-    (description
-     "This package provides code gen support for the windows crate.")
-    (license (list license:expat license:asl2.0))))
+               '(delete-file "lib/windows.0.48.0.lib"))))))
 
 (define-public rust-windows-x86-64-msvc-0.42
   (package
-- 
2.41.0

[bug#67919] [PATCH 02/55] gnu: Add rust-windows-x86-64-gnullvm-0.52.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-windows-x86-64-gnullvm-0.52): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d90cf94c54..d634db8316 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -89373,8 +89373,30 @@ (define-public rust-windows-x86-64-gnu-0.28
                (base32
                 "0m79bhdr54g4h4wh2q8wkjlkypb5wvl7xzhc2csiaqb5yl4z8cdw"))))))
 
+(define-public rust-windows-x86-64-gnullvm-0.52
+  (package
+    (name "rust-windows-x86-64-gnullvm")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_x86_64_gnullvm" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17lllq4l2k1lqgcnw1cccphxp9vs7inq99kjlm2lfl9zklg7wr8s"))
+       (snippet
+        #~(delete-file "lib/libwindows.0.52.0.a"))))
+    (build-system cargo-build-system)
+    (arguments (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-x86-64-gnullvm-0.48
   (package
+    (inherit rust-windows-x86-64-gnullvm-0.52)
     (name "rust-windows-x86-64-gnullvm")
     (version "0.48.0")
     (source (origin
@@ -89385,14 +89407,7 @@ (define-public rust-windows-x86-64-gnullvm-0.48
                (base32
                 "0lxryz3ysx0145bf3i38jkr7f9nxiym8p3syklp8f20yyk0xp5kq"))
               (snippet
-               '(delete-file "lib/libwindows.0.48.0.a"))))
-    (build-system cargo-build-system)
-    (arguments (list #:skip-build? #t))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Code gen support for the windows crate")
-    (description
-     "This package provides code gen support for the windows crate.")
-    (license (list license:expat license:asl2.0))))
+               '(delete-file "lib/libwindows.0.48.0.a"))))))
 
 (define-public rust-windows-x86-64-gnullvm-0.42
   (package
@@ -89407,8 +89422,7 @@ (define-public rust-windows-x86-64-gnullvm-0.42
                (base32
                 "18wl9r8qbsl475j39zvawlidp1bsbinliwfymr43fibdld31pm16"))
               (snippet
-               '(delete-file "lib/libwindows.a"))))
-    (arguments (list #:skip-build? #t))))
+               '(delete-file "lib/libwindows.a"))))))
 
 (define-public rust-windows-x86-64-msvc-0.52
   (package
-- 
2.41.0

[bug#67919] [PATCH 03/55] gnu: Add rust-windows-x86-64-gnu-0.52.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-windows-x86-64-gnu-0.52): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d634db8316..2b93182000 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -89292,8 +89292,31 @@ (define-public rust-windows-tokens-0.32
 windows crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-x86-64-gnu-0.52
+  (package
+    (name "rust-windows-x86-64-gnu")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_x86_64_gnu" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zdy4qn178sil5sdm63lm7f0kkcjg6gvdwmcprd2yjmwn8ns6vrx"))
+       (snippet
+        #~(delete-file "lib/libwindows.0.52.0.a"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-x86-64-gnu-0.48
   (package
+    (inherit rust-windows-x86-64-gnu-0.52)
     (name "rust-windows-x86-64-gnu")
     (version "0.48.0")
     (source (origin
@@ -89304,15 +89327,7 @@ (define-public rust-windows-x86-64-gnu-0.48
                (base32
                 "1cblz5m6a8q6ha09bz4lz233dnq5sw2hpra06k9cna3n3xk8laya"))
               (snippet
-               '(delete-file "lib/libwindows.0.48.0.a"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:skip-build? #t))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Code gen support for the windows crate")
-    (description
-     "This package provides code gen support for the windows crate.")
-    (license (list license:expat license:asl2.0))))
+               '(delete-file "lib/libwindows.0.48.0.a"))))))
 
 (define-public rust-windows-x86-64-gnu-0.42
   (package
@@ -89327,9 +89342,7 @@ (define-public rust-windows-x86-64-gnu-0.42
                (base32
                 "0dnbf2xnp3xrvy8v9mgs3var4zq9v9yh9kv79035rdgyp2w15scd"))
               (snippet
-               '(delete-file "lib/libwindows.a"))))
-    (arguments
-     (list #:skip-build? #t))))
+               '(delete-file "lib/libwindows.a"))))))
 
 (define-public rust-windows-x86-64-gnu-0.36
   (package
-- 
2.41.0

[bug#67919] [PATCH 04/55] gnu: Add rust-windows-i686-msvc-0.52.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-windows-i686-msvc-0.52): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2b93182000..d02b2bf685 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -88839,8 +88839,31 @@ (define-public rust-windows-i686-gnu-0.28
                (base32
                 "12hx7qpsjg9p7jggfcplqa3mf1mzr7k7s5ybzqwg1zmg4fn2aizm"))))))
 
+(define-public rust-windows-i686-msvc-0.52
+  (package
+    (name "rust-windows-i686-msvc")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_i686_msvc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16kvmbvx0vr0zbgnaz6nsks9ycvfh5xp05bjrhq65kj623iyirgz"))
+       (snippet
+        #~(delete-file "lib/windows.0.52.0.lib"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-i686-msvc-0.48
   (package
+    (inherit rust-windows-i686-msvc-0.52)
     (name "rust-windows-i686-msvc")
     (version "0.48.0")
     (source (origin
@@ -88851,15 +88874,7 @@ (define-public rust-windows-i686-msvc-0.48
                (base32
                 "004fkyqv3if178xx9ksqc4qqv8sz8n72mpczsr2vy8ffckiwchj5"))
               (snippet
-               '(delete-file "lib/windows.0.48.0.lib"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:skip-build? #t))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Code gen support for the windows crate")
-    (description
-     "This package provides code gen support for the windows crate.")
-    (license (list license:expat license:asl2.0))))
+               '(delete-file "lib/windows.0.48.0.lib"))))))
 
 (define-public rust-windows-i686-msvc-0.42
   (package
@@ -88874,9 +88889,7 @@ (define-public rust-windows-i686-msvc-0.42
                (base32
                 "0q0h9m2aq1pygc199pa5jgc952qhcnf0zn688454i7v4xjv41n24"))
               (snippet
-               '(delete-file "lib/windows.lib"))))
-    (arguments
-     (list #:skip-build? #t))))
+               '(delete-file "lib/windows.lib"))))))
 
 (define-public rust-windows-i686-msvc-0.36
   (package
-- 
2.41.0

[bug#67919] [PATCH 05/55] gnu: Add rust-windows-i686-gnu-0.52.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-windows-i686-gnu-0.52): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d02b2bf685..255d9ec986 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -88758,8 +88758,31 @@ (define-public rust-windows-bindgen-0.51
     (description "Windows metadata compiler.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-i686-gnu-0.52
+  (package
+    (name "rust-windows-i686-gnu")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_i686_gnu" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "04zkglz4p3pjsns5gbz85v4s5aw102raz4spj4b0lmm33z5kg1m2"))
+       (snippet
+        #~(delete-file "lib/libwindows.0.52.0.a"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-i686-gnu-0.48
   (package
+    (inherit rust-windows-i686-gnu-0.52)
     (name "rust-windows-i686-gnu")
     (version "0.48.0")
     (source (origin
@@ -88770,15 +88793,7 @@ (define-public rust-windows-i686-gnu-0.48
                (base32
                 "0hd2v9kp8fss0rzl83wzhw0s5z8q1b4875m6s1phv0yvlxi1jak2"))
               (snippet
-               '(delete-file "lib/libwindows.0.48.0.a"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:skip-build? #t))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Code gen support for the windows crate")
-    (description
-     "This package provides code gen support for the windows crate.")
-    (license (list license:expat license:asl2.0))))
+               '(delete-file "lib/libwindows.0.48.0.a"))))))
 
 (define-public rust-windows-i686-gnu-0.42
   (package
@@ -88793,9 +88808,7 @@ (define-public rust-windows-i686-gnu-0.42
                (base32
                 "0kx866dfrby88lqs9v1vgmrkk1z6af9lhaghh5maj7d4imyr47f6"))
               (snippet
-               '(delete-file "lib/libwindows.a"))))
-    (arguments
-     (list #:skip-build? #t))))
+               '(delete-file "lib/libwindows.a"))))))
 
 (define-public rust-windows-i686-gnu-0.36
   (package
-- 
2.41.0

[bug#67919] [PATCH 06/55] gnu: Add rust-windows-aarch64-msvc-0.52.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-windows-aarch64-msvc-0.52): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 255d9ec986..91f1f631c4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -88655,8 +88655,31 @@ (define-public rust-windows-aarch64-gnullvm-0.42
     (arguments
      (list #:skip-build? #t))))
 
+(define-public rust-windows-aarch64-msvc-0.52
+  (package
+    (name "rust-windows-aarch64-msvc")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_aarch64_msvc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1vvmy1ypvzdvxn9yf0b8ygfl85gl2gpcyvsvqppsmlpisil07amv"))
+       (snippet
+        #~(delete-file "lib/windows.0.52.0.lib"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description "This package provides code gen support for the windows
+crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-aarch64-msvc-0.48
   (package
+    (inherit rust-windows-aarch64-msvc-0.52)
     (name "rust-windows-aarch64-msvc")
     (version "0.48.0")
     (source (origin
@@ -88667,15 +88690,7 @@ (define-public rust-windows-aarch64-msvc-0.48
                (base32
                 "1wvwipchhywcjaw73h998vzachf668fpqccbhrxzrz5xszh2gvxj"))
               (snippet
-               '(delete-file "lib/windows.0.48.0.lib"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:skip-build? #t))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Code gen support for the windows crate")
-    (description "This package provides code gen support for the windows
-crate.")
-    (license (list license:expat license:asl2.0))))
+               '(delete-file "lib/windows.0.48.0.lib"))))))
 
 (define-public rust-windows-aarch64-msvc-0.42
   (package
@@ -88690,9 +88705,7 @@ (define-public rust-windows-aarch64-msvc-0.42
                (base32
                 "0hsdikjl5sa1fva5qskpwlxzpc5q9l909fpl1w6yy1hglrj8i3p0"))
               (snippet
-               '(delete-file "lib/windows.lib"))))
-    (arguments
-     (list #:skip-build? #t))))
+               '(delete-file "lib/windows.lib"))))))
 
 (define-public rust-windows-aarch64-msvc-0.36
   (package
-- 
2.41.0

[bug#67919] [PATCH 07/55] gnu: Add rust-windows-aarch64-gnullvm-0.52.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-windows-aarch64-gnullvm-0.52): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 91f1f631c4..5b7b67d366 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -88616,8 +88616,31 @@ (define-public rust-windows-0.9
         ("rust-windows-gen" ,rust-windows-gen-0.9)
         ("rust-windows-macros" ,rust-windows-macros-0.9))))))
 
+(define-public rust-windows-aarch64-gnullvm-0.52
+  (package
+    (name "rust-windows-aarch64-gnullvm")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_aarch64_gnullvm" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1shmn1kbdc0bpphcxz0vlph96bxz0h1jlmh93s9agf2dbpin8xyb"))
+       (snippet
+        #~(delete-file "lib/libwindows.0.52.0.a"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-aarch64-gnullvm-0.48
   (package
+    (inherit rust-windows-aarch64-gnullvm-0.52)
     (name "rust-windows-aarch64-gnullvm")
     (version "0.48.0")
     (source (origin
@@ -88628,15 +88651,7 @@ (define-public rust-windows-aarch64-gnullvm-0.48
                (base32
                 "1g71yxi61c410pwzq05ld7si4p9hyx6lf5fkw21sinvr3cp5gbli"))
               (snippet
-               '(delete-file "lib/libwindows.0.48.0.a"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:skip-build? #t))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Code gen support for the windows crate")
-    (description
-     "This package provides code gen support for the windows crate.")
-    (license (list license:expat license:asl2.0))))
+               '(delete-file "lib/libwindows.0.48.0.a"))))))
 
 (define-public rust-windows-aarch64-gnullvm-0.42
   (package
@@ -88651,9 +88666,7 @@ (define-public rust-windows-aarch64-gnullvm-0.42
                (base32
                 "1y4q0qmvl0lvp7syxvfykafvmwal5hrjb4fmv04bqs0bawc52yjr"))
               (snippet
-               '(delete-file "lib/libwindows.a"))))
-    (arguments
-     (list #:skip-build? #t))))
+               '(delete-file "lib/libwindows.a"))))))
 
 (define-public rust-windows-aarch64-msvc-0.52
   (package
-- 
2.41.0

[bug#67919] [PATCH 08/55] gnu: Add rust-windows-targets-0.52.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-windows-targets-0.52): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5b7b67d366..115fa0183a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -89275,8 +89275,36 @@ (define-public rust-windows-macros-0.9
     (description "Macros for the windows crate")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-targets-0.52
+  (package
+    (name "rust-windows-targets")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-targets" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kg7a27ynzw8zz3krdgy6w5gbqcji27j1sz4p7xk2j5j8082064a"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-windows-aarch64-gnullvm" ,rust-windows-aarch64-gnullvm-0.52)
+        ("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.52)
+        ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.52)
+        ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.52)
+        ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.52)
+        ("rust-windows-x86-64-gnullvm" ,rust-windows-x86-64-gnullvm-0.52)
+        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.52))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-targets-0.48
   (package
+    (inherit rust-windows-targets-0.52)
     (name "rust-windows-targets")
     (version "0.48.0")
     (source (origin
@@ -89286,7 +89314,6 @@ (define-public rust-windows-targets-0.48
               (sha256
                (base32
                 "1mfzg94w0c8h4ya9sva7rra77f3iy1712af9b6bwg03wrpqbc7kv"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-windows-aarch64-gnullvm" ,rust-windows-aarch64-gnullvm-0.48)
@@ -89295,12 +89322,7 @@ (define-public rust-windows-targets-0.48
         ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.48)
         ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.48)
         ("rust-windows-x86-64-gnullvm" ,rust-windows-x86-64-gnullvm-0.48)
-        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.48))))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Code gen support for the windows crate")
-    (description
-     "This package provides code gen support for the windows crate.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.48))))))
 
 (define-public rust-windows-targets-0.42
   (package
-- 
2.41.0

[bug#67919] [PATCH 09/55] gnu: Add rust-windows-sys-0.52.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-windows-sys-0.52): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 115fa0183a..1e885cc213 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -89132,8 +89132,33 @@ (define-public rust-windows-metadata-0.51
     (description "Windows metadata reader.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-sys-0.52
+  (package
+    (name "rust-windows-sys")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gd3v4ji88490zgb6b5mq5zgbvwv7zx1ibn8v3x83rwcdbryaar8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-windows-targets" ,rust-windows-targets-0.52))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Rust for Windows")
+    (description "The windows crate lets you call any Windows API past,
+present, and future using code generated on the fly directly from the metadata
+describing the API and right into your Rust package where you can call them as
+if they were just another Rust module.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-sys-0.48
   (package
+    (inherit rust-windows-sys-0.52)
     (name "rust-windows-sys")
     (version "0.48.0")
     (source (origin
@@ -89143,17 +89168,10 @@ (define-public rust-windows-sys-0.48
               (sha256
                (base32
                 "1aan23v5gs7gya1lc46hqn9mdh8yph3fhxmhxlw36pn6pqc28zb7"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-       #:cargo-inputs (("rust-windows-targets" ,rust-windows-targets-0.48))))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Rust for Windows")
-    (description "The windows crate lets you call any Windows API past,
-present, and future using code generated on the fly directly from the metadata
-describing the API and right into your Rust package where you can call them as
-if they were just another Rust module.")
-    (license (list license:expat license:asl2.0))))
+       #:cargo-inputs
+       (("rust-windows-targets" ,rust-windows-targets-0.48))))))
 
 (define-public rust-windows-sys-0.45
   (package
-- 
2.41.0

[bug#67919] [PATCH 10/55] gnu: rust-uniquote-3: Update to 0.1.11.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-uniquote-3): Update to 0.1.11.

Change-Id: I9475004800a6f8fd772d5e4079d90829b4da8f30
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1e885cc213..8eae86791e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -85225,14 +85225,14 @@ (define-public rust-unindent-0.1
   (package
     (inherit rust-unindent-0.2)
     (name "rust-unindent")
-    (version "0.1.7")
+    (version "0.1.11")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "unindent" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "1is1gmx1l89z426rn3xsi0mii4vhy2imhqmhx8x2pd8mji6y0kpi"))))))
+         (base32 "171may3v15wzc10z64i8sahdz49d031v7424mjsifa205ml6sxp1"))))))
 
 (define-public rust-uniquote-3
   (package
-- 
2.41.0

[bug#67919] [PATCH 11/55] gnu: Add rust-toml-edit-0.1.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-toml-edit-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8eae86791e..111d5fca37 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -81870,6 +81870,27 @@ (define-public rust-toml-edit-0.14
          ("rust-pretty-assertions" ,rust-pretty-assertions-1)
          ("rust-snapbox" ,rust-snapbox-0.2))))))
 
+(define-public rust-toml-edit-0.1
+  (package
+    (inherit rust-toml-edit-0.19)
+    (name "rust-toml-edit")
+    (version "0.1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "toml_edit" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1r4ap69vn0lldfrhz62v9lik6nhz1sn8r8wqfkhy4pvxr8d3pxc7"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-combine" ,rust-combine-3)
+        ("rust-linked-hash-map" ,rust-linked-hash-map-0.5))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)
+        ("rust-serde-json" ,rust-serde-json-1))))))
+
 (define-public rust-toml-test-1
   (package
     (name "rust-toml-test")
-- 
2.41.0

[bug#67919] [PATCH 12/55] gnu: Add rust-rstest-test-0.2.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rstest-test-0.2): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 111d5fca37..84537bfcf2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63926,6 +63926,32 @@ (define-public rust-rstest-reuse-0.3
              ("rust-rustc-version" ,rust-rustc-version-0.4)
              ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-rstest-test-0.2
+  (package
+    (name "rust-rstest-test")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest_test" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0bv429k1n9wspnds5w0bl6d49dfj1cx08gncjqjnp084v8q73d73"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--release" "--" "--skip=add_local_dependency"
+                            "--skip=more_tests" "--skip=one_fail"
+                            "--skip=one_success")
+       #:cargo-inputs (("rust-toml-edit" ,rust-toml-edit-0.1))
+       #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1)
+                                   ("rust-temp-testdir" ,rust-temp-testdir-0.2))))
+    (home-page "https://github.com/la10736/rstest")
+    (synopsis "Provides some utilities used to write rstest crate's tests")
+    (description
+     "This package provides some utilities used to write the rstest crate's
+tests.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rug-1
   (package
     (name "rust-rug")
-- 
2.41.0

[bug#67919] [PATCH 13/55] gnu: Add rust-rstest-reuse-0.1.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rstest-reuse-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 84537bfcf2..dca50dbd22 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63926,6 +63926,25 @@ (define-public rust-rstest-reuse-0.3
              ("rust-rustc-version" ,rust-rustc-version-0.4)
              ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-rstest-reuse-0.1
+  (package
+    (inherit rust-rstest-reuse-0.4)
+    (name "rust-rstest-reuse")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest_reuse" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06aja9id491a60xxm9z9d0vrzam0h0msf8qp4ql8f14cwnmcziij"))))
+    (arguments
+     `(;; development-inputs have circular dependency on rstest-0.9
+       #:skip-build? #t
+       #:cargo-inputs (("rust-quote" ,rust-quote-1)
+                       ("rust-rustc-version" ,rust-rustc-version-0.3)
+                       ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-rstest-test-0.2
   (package
     (name "rust-rstest-test")
-- 
2.41.0

[bug#67919] [PATCH 14/55] gnu: Add rust-rstest-0.7.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rstest-0.7): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dca50dbd22..7d61c2cd9a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63821,6 +63821,37 @@ (define-public rust-rstest-0.10
              ("rust-rustc-version" ,rust-rustc-version-0.3)
              ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-rstest-0.7
+  (package
+    (inherit rust-rstest-0.15)
+    (name "rust-rstest")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1iiw4gv79ghfv8znh3d5r2px1cbl4x8zjbi9x1q8ahzxghgbqmjh"))))
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-rustc-version" ,rust-rustc-version-0.3)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-actix-rt" ,rust-actix-rt-2)
+        ("rust-async-std" ,rust-async-std-1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-0.7)
+        ("rust-rstest" ,rust-rstest-0.6)
+        ("rust-rstest-reuse" ,rust-rstest-reuse-0.1)
+        ("rust-rstest-test" ,rust-rstest-test-0.2)
+        ("rust-temp-testdir" ,rust-temp-testdir-0.2)
+        ("rust-unindent" ,rust-unindent-0.1))))))
+
 (define-public rust-rstest-0.6
   (package
     (inherit rust-rstest-0.10)
-- 
2.41.0

[bug#67919] [PATCH 15/55] gnu: Add rust-rstest-0.8.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rstest-0.8): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7d61c2cd9a..206929a010 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63821,6 +63821,37 @@ (define-public rust-rstest-0.10
              ("rust-rustc-version" ,rust-rustc-version-0.3)
              ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-rstest-0.8
+  (package
+    (inherit rust-rstest-0.15)
+    (name "rust-rstest")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0zqb6ab637w04vblv9ys6nw9j54zhz5b74gfh0wfjcjndhrwlqdr"))))
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-rustc-version" ,rust-rustc-version-0.3)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-actix-rt" ,rust-actix-rt-2)
+        ("rust-async-std" ,rust-async-std-1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-0.7)
+        ("rust-rstest" ,rust-rstest-0.7)
+        ("rust-rstest-reuse" ,rust-rstest-reuse-0.1)
+        ("rust-rstest-test" ,rust-rstest-test-0.2)
+        ("rust-temp-testdir" ,rust-temp-testdir-0.2)
+        ("rust-unindent" ,rust-unindent-0.1))))))
+
 (define-public rust-rstest-0.7
   (package
     (inherit rust-rstest-0.15)
-- 
2.41.0

[bug#67919] [PATCH 16/55] gnu: Add rust-rstest-0.9.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rstest-0.9): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 206929a010..9789c746db 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63821,6 +63821,37 @@ (define-public rust-rstest-0.10
              ("rust-rustc-version" ,rust-rustc-version-0.3)
              ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-rstest-0.9
+  (package
+    (inherit rust-rstest-0.15)
+    (name "rust-rstest")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07b4j1wkrv7l5c4wyqylr7f1wsif5qwmixg5nbycyq648njqcz67"))))
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-rustc-version" ,rust-rustc-version-0.3)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-actix-rt" ,rust-actix-rt-2)
+        ("rust-async-std" ,rust-async-std-1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-0.7)
+        ("rust-rstest" ,rust-rstest-0.8)
+        ("rust-rstest-reuse" ,rust-rstest-reuse-0.1)
+        ("rust-rstest-test" ,rust-rstest-test-0.2)
+        ("rust-temp-testdir" ,rust-temp-testdir-0.2)
+        ("rust-unindent" ,rust-unindent-0.1))))))
+
 (define-public rust-rstest-0.8
   (package
     (inherit rust-rstest-0.15)
-- 
2.41.0

[bug#67919] [PATCH 17/55] gnu: rust-rstest-0.6: Downgrade to 0.6.4.

[Jaeme Sifat via Guix-patches via]

Version 0.6.5 of rstest has been yanked in crates.io.

* gnu/packages/crates-io.scm (rust-rstest-0.6): Downgrade to 0.6.4.

Change-Id: I4afb534d895aff27d1fd43111e76ebde7dc92883
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9789c746db..2b15ce87d2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63918,14 +63918,14 @@ (define-public rust-rstest-0.6
   (package
     (inherit rust-rstest-0.10)
     (name "rust-rstest")
-    (version "0.6.5")
+    (version "0.6.4")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "rstest" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1wdd0ci0bn6fd5v5c19lhlqrpadk18fl4jzvh75b26616anlxdil"))))))
+                "0f3wdwfhf4dh7yf49cmi0r40qnwi4gwrqdki1bffyxvr2ny4ii6y"))))))
 
 (define-public rust-rstest-macros-0.14
   (package
-- 
2.41.0

[bug#67919] [PATCH 18/55] gnu: Add rust-rstest-test-0.9.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rstest-test-0.9): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2b15ce87d2..7178d48054 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64038,24 +64038,24 @@ (define-public rust-rstest-reuse-0.1
                        ("rust-rustc-version" ,rust-rustc-version-0.3)
                        ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-rstest-test-0.2
+(define-public rust-rstest-test-0.9
   (package
     (name "rust-rstest-test")
-    (version "0.2.0")
+    (version "0.9.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rstest_test" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0bv429k1n9wspnds5w0bl6d49dfj1cx08gncjqjnp084v8q73d73"))))
+        (base32 "0bdy2pni88vh6m2w2mk0wj5hsgka4yslwv472wyfk6794ilgl203"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-test-flags '("--release" "--" "--skip=add_local_dependency"
-                            "--skip=more_tests" "--skip=one_fail"
-                            "--skip=one_success")
-       #:cargo-inputs (("rust-toml-edit" ,rust-toml-edit-0.1))
+     `(#:tests? #f
+       #:cargo-inputs (("rust-regex" ,rust-regex-1)
+                       ("rust-toml-edit" ,rust-toml-edit-0.15))
        #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1)
+                                   ("rust-rstest" ,rust-rstest-0.15)
                                    ("rust-temp-testdir" ,rust-temp-testdir-0.2))))
     (home-page "https://github.com/la10736/rstest")
     (synopsis "Provides some utilities used to write rstest crate's tests")
@@ -64064,6 +64064,26 @@ (define-public rust-rstest-test-0.2
 tests.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rstest-test-0.2
+  (package
+    (inherit rust-rstest-test-0.9)
+    (name "rust-rstest-test")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest_test" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0bv429k1n9wspnds5w0bl6d49dfj1cx08gncjqjnp084v8q73d73"))))
+    (arguments
+     `(#:cargo-test-flags '("--release" "--" "--skip=add_local_dependency"
+                            "--skip=more_tests" "--skip=one_fail"
+                            "--skip=one_success")
+       #:cargo-inputs (("rust-toml-edit" ,rust-toml-edit-0.1))
+       #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1)
+                                   ("rust-temp-testdir" ,rust-temp-testdir-0.2))))))
+
 (define-public rust-rug-1
   (package
     (name "rust-rug")
-- 
2.41.0

[bug#67919] [PATCH 19/55] gnu: Add rust-rstest-macros-0.16.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rstest-macros-0.16): New variable.

Change-Id: I8ab04144f3c53b40b968a0a48bdbc70deccfcaca
---
 gnu/packages/crates-io.scm | 47 +++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7178d48054..2a6581ad8a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63927,8 +63927,46 @@ (define-public rust-rstest-0.6
                (base32
                 "0f3wdwfhf4dh7yf49cmi0r40qnwi4gwrqdki1bffyxvr2ny4ii6y"))))))
 
+(define-public rust-rstest-macros-0.16
+  (package
+    (name "rust-rstest-macros")
+    (version "0.16.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xzrgwjih87myghqzm9ncqm0449y2sf4migz6x7yc1h7mq2vaabj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--release" "--"
+                            "--skip=rstest (line 740)"
+                            "--skip=rstest (line 764)")
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-rustc-version" ,rust-rustc-version-0.4)
+        ("rust-syn" ,rust-syn-1)
+        ("rust-unicode-ident" ,rust-unicode-ident-1))
+       #:cargo-development-inputs
+       (("rust-actix-rt" ,rust-actix-rt-2)
+        ("rust-async-std" ,rust-async-std-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-rstest" ,rust-rstest-0.15)
+        ("rust-rstest-reuse" ,rust-rstest-reuse-0.4)
+        ("rust-rstest-test" ,rust-rstest-test-0.9))))
+    (home-page "https://github.com/la10736/rstest")
+    (synopsis "Procedural macros for @code{rstest}.")
+    (description
+     "This package provides the procedural macro crate for
+@code{rstest}.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rstest-macros-0.14
   (package
+    (inherit rust-rstest-macros-0.16)
     (name "rust-rstest-macros")
     (version "0.14.0")
     (source (origin
@@ -63938,7 +63976,6 @@ (define-public rust-rstest-macros-0.14
               (sha256
                (base32
                 "0rlwp3r1dg3fl4f100wjd3ya7dhs23vpyqgf7vg5mac50s5fc5ah"))))
-    (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t
            #:cargo-inputs
@@ -63946,13 +63983,7 @@ (define-public rust-rstest-macros-0.14
              ("rust-proc-macro2" ,rust-proc-macro2-1)
              ("rust-quote" ,rust-quote-1)
              ("rust-rustc-version" ,rust-rustc-version-0.4)
-             ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/la10736/rstest")
-    (synopsis "Procedural macros for @code{rstest}.")
-    (description
-     "This package provides the procedural macro crate for
-@code{rstest}.")
-    (license (list license:expat license:asl2.0))))
+             ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-rstest-macros-0.13
   (package
-- 
2.41.0

[bug#67919] [PATCH 20/55] gnu: Add rust-rstest-0.16.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rstest-0.16): New variable.

Change-Id: I6f0da3237c357184b51bf0fdde37b221eab7383a
---
 gnu/packages/crates-io.scm | 47 +++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2a6581ad8a..31c6f8b27e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63712,8 +63712,46 @@ (define-public rust-rstar-0.8
                                    ("rust-rand-hc" ,rust-rand-hc-0.2)
                                    ("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-rstest-0.16
+  (package
+    (name "rust-rstest")
+    (version "0.16.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1pqfpj727hkn4rr7nspnaab0h74gl9yxqlb53vn9h8a7dhbjszxh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-futures" ,rust-futures-0.3)
+        ("rust-futures-timer" ,rust-futures-timer-3)
+        ("rust-rstest-macros" ,rust-rstest-macros-0.16)
+        ("rust-rustc-version" ,rust-rustc-version-0.4))
+       #:cargo-development-inputs
+       (("rust-actix-rt" ,rust-actix-rt-2)
+        ("rust-async-std" ,rust-async-std-1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-rstest" ,rust-rstest-0.13)
+        ("rust-rstest-reuse" ,rust-rstest-reuse-0.4)
+        ("rust-rstest-test" ,rust-rstest-test-0.9)
+        ("rust-temp-testdir" ,rust-temp-testdir-0.2)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-unindent" ,rust-unindent-0.1))))
+    (home-page "https://github.com/la10736/rstest")
+    (synopsis "Rust fixture based test framework")
+    (description
+     "@code{rstest} uses procedural macros to help you write fixtures
+and table-based tests.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rstest-0.15
   (package
+    (inherit rust-rstest-0.16)
     (name "rust-rstest")
     (version "0.15.0")
     (source
@@ -63723,20 +63761,13 @@ (define-public rust-rstest-0.15
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32 "0c5r8wimr2fv3x25dbb99rk165lzcsz6jlpv7xk2ny99rikdrjg9"))))
-    (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t
            #:cargo-inputs
            `(("rust-futures" ,rust-futures-0.3)
              ("rust-futures-timer" ,rust-futures-timer-3)
              ("rust-rstest-macros" ,rust-rstest-macros-0.14)
-             ("rust-rustc-version" ,rust-rustc-version-0.3))))
-    (home-page "https://github.com/la10736/rstest")
-    (synopsis "Rust fixture based test framework")
-    (description
-     "@code{rstest} uses procedural macros to help you write fixtures
-and table-based tests.")
-    (license (list license:expat license:asl2.0))))
+             ("rust-rustc-version" ,rust-rustc-version-0.3))))))
 
 (define-public rust-rstest-0.13
   (package
-- 
2.41.0

[bug#67919] [PATCH 21/55] gnu: Add rust-rstest-test-0.11.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rstest-test-0.11): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 31c6f8b27e..888fd80bd6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -64100,25 +64100,27 @@ (define-public rust-rstest-reuse-0.1
                        ("rust-rustc-version" ,rust-rustc-version-0.3)
                        ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-rstest-test-0.9
+(define-public rust-rstest-test-0.11
   (package
     (name "rust-rstest-test")
-    (version "0.9.0")
+    (version "0.11.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rstest_test" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0bdy2pni88vh6m2w2mk0wj5hsgka4yslwv472wyfk6794ilgl203"))))
+        (base32 "16z1525ww9n1x94mvvgd6zcpxc2pzlf1r031kryk383lgd3wgi9p"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f
-       #:cargo-inputs (("rust-regex" ,rust-regex-1)
-                       ("rust-toml-edit" ,rust-toml-edit-0.15))
-       #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1)
-                                   ("rust-rstest" ,rust-rstest-0.15)
-                                   ("rust-temp-testdir" ,rust-temp-testdir-0.2))))
+       #:cargo-inputs
+       (("rust-regex" ,rust-regex-1)
+        ("rust-toml-edit" ,rust-toml-edit-0.19))
+       #:cargo-development-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-rstest" ,rust-rstest-0.16)
+        ("rust-temp-testdir" ,rust-temp-testdir-0.2))))
     (home-page "https://github.com/la10736/rstest")
     (synopsis "Provides some utilities used to write rstest crate's tests")
     (description
@@ -64126,6 +64128,28 @@ (define-public rust-rstest-test-0.9
 tests.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rstest-test-0.9
+  (package
+    (inherit rust-rstest-test-0.11)
+    (name "rust-rstest-test")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest_test" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0bdy2pni88vh6m2w2mk0wj5hsgka4yslwv472wyfk6794ilgl203"))))
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-regex" ,rust-regex-1)
+        ("rust-toml-edit" ,rust-toml-edit-0.15))
+       #:cargo-development-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-rstest" ,rust-rstest-0.15)
+        ("rust-temp-testdir" ,rust-temp-testdir-0.2))))))
+
 (define-public rust-rstest-test-0.2
   (package
     (inherit rust-rstest-test-0.9)
-- 
2.41.0

[bug#67919] [PATCH 22/55] gnu: Add rust-rstest-macros-0.18.

[Jaeme Sifat via Guix-patches via]

The dependency graph for rstest is not required.

* gnu/packages/crates-io.scm (rust-rstest-macros-0.18): New variable.
* gnu/packages/crates-io.scm (rust-rstest-macros-0.16): Remove build step.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 888fd80bd6..4c2cde2b02 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63958,8 +63958,39 @@ (define-public rust-rstest-0.6
                (base32
                 "0f3wdwfhf4dh7yf49cmi0r40qnwi4gwrqdki1bffyxvr2ny4ii6y"))))))
 
+(define-public rust-rstest-macros-0.18
+  (package
+    (name "rust-rstest-macros")
+    (version "0.18.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01g6rg60snmscipc9xiili7nsn0v25sv64713gp99y2jg0jgha6l"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-glob" ,rust-glob-0.3)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-relative-path" ,rust-relative-path-1)
+                       ("rust-rustc-version" ,rust-rustc-version-0.4)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-unicode-ident" ,rust-unicode-ident-1))))
+    (home-page "https://github.com/la10736/rstest")
+    (synopsis "Procedural macros for @code{rstest}.")
+    (description
+     "This package provides the procedural macro crate for
+@code{rstest}.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rstest-macros-0.16
   (package
+    (inherit rust-rstest-macros-0.18)
     (name "rust-rstest-macros")
     (version "0.16.0")
     (source
@@ -63969,31 +64000,15 @@ (define-public rust-rstest-macros-0.16
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1xzrgwjih87myghqzm9ncqm0449y2sf4migz6x7yc1h7mq2vaabj"))))
-    (build-system cargo-build-system)
     (arguments
-     `(#:cargo-test-flags '("--release" "--"
-                            "--skip=rstest (line 740)"
-                            "--skip=rstest (line 764)")
+     `(#:skip-build? #t
        #:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-rustc-version" ,rust-rustc-version-0.4)
         ("rust-syn" ,rust-syn-1)
-        ("rust-unicode-ident" ,rust-unicode-ident-1))
-       #:cargo-development-inputs
-       (("rust-actix-rt" ,rust-actix-rt-2)
-        ("rust-async-std" ,rust-async-std-1)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
-        ("rust-rstest" ,rust-rstest-0.15)
-        ("rust-rstest-reuse" ,rust-rstest-reuse-0.4)
-        ("rust-rstest-test" ,rust-rstest-test-0.9))))
-    (home-page "https://github.com/la10736/rstest")
-    (synopsis "Procedural macros for @code{rstest}.")
-    (description
-     "This package provides the procedural macro crate for
-@code{rstest}.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-unicode-ident" ,rust-unicode-ident-1))))))
 
 (define-public rust-rstest-macros-0.14
   (package
@@ -64037,8 +64052,36 @@ (define-public rust-rstest-macros-0.13
         ("rust-rustc-version" ,rust-rustc-version-0.4)
         ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-rstest-reuse-0.6
+  (package
+    (name "rust-rstest-reuse")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest_reuse" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "191l5gfwx9rmkqd48s85fkh21b73f38838fc896r4rxy39l0nlw8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-quote" ,rust-quote-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rustc-version" ,rust-rustc-version-0.4)
+        ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/la10736/rstest")
+    (synopsis "Reuse rstest attributes")
+    (description
+     "This package provides a Rust library for reusing rstest
+attributes by creating a set of tests and applying it to every
+scenario you want to test.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rstest-reuse-0.4
   (package
+    (inherit rust-rstest-reuse-0.6)
     (name "rust-rstest-reuse")
     (version "0.4.0")
     (source (origin
@@ -64048,20 +64091,12 @@ (define-public rust-rstest-reuse-0.4
               (sha256
                (base32
                 "05zcs22fbvv7q50p2xs6w13lqbcklddnj2dm1mz1wi2pak9sxdgr"))))
-    (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t
            #:cargo-inputs
            `(("rust-quote" ,rust-quote-1)
              ("rust-rustc-version" ,rust-rustc-version-0.4)
-             ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/la10736/rstest")
-    (synopsis "Reuse rstest attributes")
-    (description
-     "This package provides a Rust library for reusing rstest
-attributes by creating a set of tests and applying it to every
-scenario you want to test.")
-    (license (list license:expat license:asl2.0))))
+             ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-rstest-reuse-0.3
   (package
-- 
2.41.0

[bug#67919] [PATCH 23/55] gnu: Add rust-rstest-0.18.

[Jaeme Sifat via Guix-patches via]

Reduce dependency graph for other crates as well by skipping the build step.

* gnu/packages/crates-io.scm (rust-rstest-0.18): New variable.
* gnu/packages/crates-io.scm (rust-rstest-0.16): Skip build.
* gnu/packages/crates-io.scm (rust-rstest-0.9): Skip build.
* gnu/packages/crates-io.scm (rust-rstest-0.8): Skip build.
* gnu/packages/crates-io.scm (rust-rstest-0.7): Skip build.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4c2cde2b02..41267516f9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63712,36 +63712,24 @@ (define-public rust-rstar-0.8
                                    ("rust-rand-hc" ,rust-rand-hc-0.2)
                                    ("rust-serde-json" ,rust-serde-json-1))))))
 
-(define-public rust-rstest-0.16
+(define-public rust-rstest-0.18
   (package
     (name "rust-rstest")
-    (version "0.16.0")
+    (version "0.18.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rstest" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1pqfpj727hkn4rr7nspnaab0h74gl9yxqlb53vn9h8a7dhbjszxh"))))
+        (base32 "1681ncnlzhc8894idm3pqf40nndn4k4kcp0kpv29n68a7hpspvlp"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f
-       #:cargo-inputs
-       (("rust-futures" ,rust-futures-0.3)
-        ("rust-futures-timer" ,rust-futures-timer-3)
-        ("rust-rstest-macros" ,rust-rstest-macros-0.16)
-        ("rust-rustc-version" ,rust-rustc-version-0.4))
-       #:cargo-development-inputs
-       (("rust-actix-rt" ,rust-actix-rt-2)
-        ("rust-async-std" ,rust-async-std-1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
-        ("rust-rstest" ,rust-rstest-0.13)
-        ("rust-rstest-reuse" ,rust-rstest-reuse-0.4)
-        ("rust-rstest-test" ,rust-rstest-test-0.9)
-        ("rust-temp-testdir" ,rust-temp-testdir-0.2)
-        ("rust-tokio" ,rust-tokio-1)
-        ("rust-unindent" ,rust-unindent-0.1))))
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-futures" ,rust-futures-0.3)
+                       ("rust-futures-timer" ,rust-futures-timer-3)
+                       ("rust-rstest-macros" ,rust-rstest-macros-0.18)
+                       ("rust-rustc-version" ,rust-rustc-version-0.4))))
     (home-page "https://github.com/la10736/rstest")
     (synopsis "Rust fixture based test framework")
     (description
@@ -63749,6 +63737,26 @@ (define-public rust-rstest-0.16
 and table-based tests.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rstest-0.16
+  (package
+    (inherit rust-rstest-0.18)
+    (name "rust-rstest")
+    (version "0.16.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rstest" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1pqfpj727hkn4rr7nspnaab0h74gl9yxqlb53vn9h8a7dhbjszxh"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-futures" ,rust-futures-0.3)
+        ("rust-futures-timer" ,rust-futures-timer-3)
+        ("rust-rstest-macros" ,rust-rstest-macros-0.16)
+        ("rust-rustc-version" ,rust-rustc-version-0.4))))))
+
 (define-public rust-rstest-0.15
   (package
     (inherit rust-rstest-0.16)
@@ -63865,23 +63873,13 @@ (define-public rust-rstest-0.9
        (sha256
         (base32 "07b4j1wkrv7l5c4wyqylr7f1wsif5qwmixg5nbycyq648njqcz67"))))
     (arguments
-     `(#:tests? #f
+     `(#:skip-build? #t
        #:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-rustc-version" ,rust-rustc-version-0.3)
-        ("rust-syn" ,rust-syn-1))
-       #:cargo-development-inputs
-       (("rust-actix-rt" ,rust-actix-rt-2)
-        ("rust-async-std" ,rust-async-std-1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-0.7)
-        ("rust-rstest" ,rust-rstest-0.8)
-        ("rust-rstest-reuse" ,rust-rstest-reuse-0.1)
-        ("rust-rstest-test" ,rust-rstest-test-0.2)
-        ("rust-temp-testdir" ,rust-temp-testdir-0.2)
-        ("rust-unindent" ,rust-unindent-0.1))))))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-rstest-0.8
   (package
@@ -63896,23 +63894,13 @@ (define-public rust-rstest-0.8
        (sha256
         (base32 "0zqb6ab637w04vblv9ys6nw9j54zhz5b74gfh0wfjcjndhrwlqdr"))))
     (arguments
-     `(#:tests? #f
+     `(#:skip-build? #t
        #:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-rustc-version" ,rust-rustc-version-0.3)
-        ("rust-syn" ,rust-syn-1))
-       #:cargo-development-inputs
-       (("rust-actix-rt" ,rust-actix-rt-2)
-        ("rust-async-std" ,rust-async-std-1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-0.7)
-        ("rust-rstest" ,rust-rstest-0.7)
-        ("rust-rstest-reuse" ,rust-rstest-reuse-0.1)
-        ("rust-rstest-test" ,rust-rstest-test-0.2)
-        ("rust-temp-testdir" ,rust-temp-testdir-0.2)
-        ("rust-unindent" ,rust-unindent-0.1))))))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-rstest-0.7
   (package
@@ -63927,23 +63915,13 @@ (define-public rust-rstest-0.7
        (sha256
         (base32 "1iiw4gv79ghfv8znh3d5r2px1cbl4x8zjbi9x1q8ahzxghgbqmjh"))))
     (arguments
-     `(#:tests? #f
+     `(#:skip-build? #t
        #:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-rustc-version" ,rust-rustc-version-0.3)
-        ("rust-syn" ,rust-syn-1))
-       #:cargo-development-inputs
-       (("rust-actix-rt" ,rust-actix-rt-2)
-        ("rust-async-std" ,rust-async-std-1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-0.7)
-        ("rust-rstest" ,rust-rstest-0.6)
-        ("rust-rstest-reuse" ,rust-rstest-reuse-0.1)
-        ("rust-rstest-test" ,rust-rstest-test-0.2)
-        ("rust-temp-testdir" ,rust-temp-testdir-0.2)
-        ("rust-unindent" ,rust-unindent-0.1))))))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-rstest-0.6
   (package
-- 
2.41.0

[bug#67919] [PATCH 24/55] gnu: rust-time-core-0.1: Update to 0.1.2.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-time-core-0.1): Update to 0.1.2.

Change-Id: Iee5667d93d8c9ccb52b0d9c8ae9e7acf933bfd37
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 41267516f9..51fa29fc71 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79491,13 +79491,13 @@ (define-public rust-timeago-0.4
 (define-public rust-time-core-0.1
   (package
     (name "rust-time-core")
-    (version "0.1.1")
+    (version "0.1.2")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "time-core" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "1yz6d246zbmx9v6wpfg1jyfjlsgagirz7km96pr1mp6snkpzn03k"))))
+               (base32 "1wx3qizcihw6z151hywfzzyd1y5dl804ydyxci6qm07vbakpr4pg"))))
     (build-system cargo-build-system)
     (arguments '(#:tests? #f))      ; use of undeclared crate or module `time`
     (home-page "https://github.com/time-rs/time")
-- 
2.41.0

[bug#67919] [PATCH 25/55] gnu: rust-time-macros-0.2: Update to 0.2.15.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-time-macros-0.2): Update to 0.2.15.

Change-Id: If46324c3e1027768eb20ecf3a2a8119c3d1660b5
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 51fa29fc71..de408e2c76 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79509,14 +79509,14 @@ (define-public rust-time-core-0.1
 (define-public rust-time-macros-0.2
   (package
     (name "rust-time-macros")
-    (version "0.2.14")
+    (version "0.2.15")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "time-macros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0wn52hwaq1hy4r5yijzkdi4j40zvqapbpcjsjdkyyy4l6d22z50s"))))
+        (base32 "086frcn3m2yh3fji3wv9r35c3zjxjq8ngam7xnngiqd9vdl0vmsa"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-time-core" ,rust-time-core-0.1))))
-- 
2.41.0

[bug#67919] [PATCH 26/55] gnu: rust-time-0.3: Update to 0.3.30.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-time-0.3): Update to 0.3.30.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index de408e2c76..14886c107b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79368,31 +79368,34 @@ (define-public rust-tikv-jemalloc-ctl-0.4
 (define-public rust-time-0.3
   (package
     (name "rust-time")
-    (version "0.3.28")
+    (version "0.3.30")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "time" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0j3yl5q4w9vcw55hxxb1a3crls1w82v5dahicj7c4ifjgxavpxhp"))))
+        (base32 "1xgnflidij6361zjg4mzz4lqndayq1ph82n1cbjydppj02rlm8y4"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; Not all files included
-       #:cargo-inputs (("rust-deranged" ,rust-deranged-0.3)
-                       ("rust-itoa" ,rust-itoa-1)
-                       ("rust-js-sys" ,rust-js-sys-0.3)
-                       ("rust-libc" ,rust-libc-0.2)
-                       ("rust-num-threads" ,rust-num-threads-0.1)
-                       ("rust-quickcheck" ,rust-quickcheck-1)
-                       ("rust-rand" ,rust-rand-0.8)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-time-core" ,rust-time-core-0.1)
-                       ("rust-time-macros" ,rust-time-macros-0.2))
+       #:cargo-inputs
+       (("rust-deranged" ,rust-deranged-0.3)
+        ("rust-itoa" ,rust-itoa-1)
+        ("rust-js-sys" ,rust-js-sys-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-num-threads" ,rust-num-threads-0.1)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-time-core" ,rust-time-core-0.1)
+        ("rust-time-macros" ,rust-time-macros-0.2))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.5)
         ("rust-quickcheck-macros" ,rust-quickcheck-macros-1)
         ("rust-rand" ,rust-rand-0.8)
+        ("rust-rstest" ,rust-rstest-0.18)
+        ("rust-rstest-reuse" ,rust-rstest-reuse-0.6)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-serde-test" ,rust-serde-test-1)
-- 
2.41.0

[bug#67919] [PATCH 27/55] gnu: Add rust-quick-xml-0.31.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-quick-xml-0.31): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 14886c107b..f4a07f8952 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59321,18 +59321,17 @@ (define-public rust-quick-error-1
          (base32
           "1q6za3v78hsspisc197bg3g7rpc989qycy8ypr8ap8igv10ikl51"))))))
 
-(define-public rust-quick-xml-0.28
+(define-public rust-quick-xml-0.31
   (package
     (name "rust-quick-xml")
-    (version "0.28.2")
+    (version "0.31.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "quick-xml" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1lfr3512x0s0i9kbyglyzn0rq0i1bvd2mqqfi8gs685808rfgr8c"))))
+        (base32 "0cravqanylzh5cq2v6hzlfqgxcid5nrp2snnb3pf4m0and2a610h"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -59356,6 +59355,36 @@ (define-public rust-quick-xml-0.28
      "This package provides a high performance XML reader and writer.")
     (license license:expat)))
 
+(define-public rust-quick-xml-0.28
+  (package
+    (inherit rust-quick-xml-0.31)
+    (name "rust-quick-xml")
+    (version "0.28.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "quick-xml" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1lfr3512x0s0i9kbyglyzn0rq0i1bvd2mqqfi8gs685808rfgr8c"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-document-features" ,rust-document-features-0.2)
+        ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+        ("rust-memchr" ,rust-memchr-2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-serde-value" ,rust-serde-value-0.7)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-test" ,rust-tokio-test-0.4))))))
+
 (define-public rust-quick-xml-0.27
   (package
     (inherit rust-quick-xml-0.28)
-- 
2.41.0

[bug#67919] [PATCH 28/55] gnu: Add rust-elain-0.3.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-elain-0.3): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f4a07f8952..3b4c095ce1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23726,6 +23726,25 @@ (define-public rust-either-1
 @code{Right} is a general purpose sum type with two cases.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-elain-0.3
+  (package
+    (name "rust-elain")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "elain" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0wgpyy0m48vdnrip0f4x1h8w4bp2lxgy8pqk78qwhrbxmr7hj8im"))))
+    (build-system cargo-build-system)
+    (home-page "https://crates.io/crates/elain")
+    (synopsis "Set a type's minimum alignment with const generics")
+    (description
+     "This package allows setting a type's minimum alignment with const
+generics.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-elf-0.0.10
   (package
     (name "rust-elf")
-- 
2.41.0

[bug#67919] [PATCH 29/55] gnu: Add rust-zerocopy-derive-0.7.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-zerocopy-derive-0.7): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3b4c095ce1..6a4d44724a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -91522,8 +91522,37 @@ (define-public rust-zerocopy-0.3
         ("rust-zerocopy-derive" ,rust-zerocopy-derive-0.2))))
     (license license:bsd-3)))
 
+(define-public rust-zerocopy-derive-0.7
+  (package
+    (name "rust-zerocopy-derive")
+    (version "0.7.31")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "zerocopy-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06k0zk4x4n9s1blgxmxqb1g81y8q334aayx61gyy6v9y1dajkhdk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs
+       (("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://github.com/google/zerocopy")
+    (synopsis "Custom derive for traits from the zerocopy Rust crate")
+    (description
+     "This package provides custom derive for traits from the zerocopy Rust
+crate.")
+    (license license:bsd-2)))
+
 (define-public rust-zerocopy-derive-0.3
   (package
+    (inherit rust-zerocopy-derive-0.7)
     (name "rust-zerocopy-derive")
     (version "0.3.2")
     (source (origin
@@ -91533,19 +91562,12 @@ (define-public rust-zerocopy-derive-0.3
               (sha256
                (base32
                 "18qr7dqlj89v1xl1g58l2xd6jidv0sbccscgl131gpppba0yc1b5"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-syn" ,rust-syn-1)
-        ("rust-synstructure" ,rust-synstructure-0.12))))
-    (home-page "https://github.com/google/zerocopy")
-    (synopsis "Custom derive for traits from the zerocopy Rust crate")
-    (description
-     "This package provides custom derive for traits from the zerocopy Rust
-crate.")
-    (license license:bsd-2)))
+        ("rust-synstructure" ,rust-synstructure-0.12))))))
 
 (define-public rust-zerocopy-derive-0.2
   (package
-- 
2.41.0

[bug#67919] [PATCH 30/55] gnu: rust-zerocopy-derive-0.3: Add build step.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-zerocopy-derive-0.3): Add build step.
[arguments]: Remove #:skip-build? #t

Change-Id: Ie55b12ec02b4978159775eb19929bf55374acdb2
---
 gnu/packages/crates-io.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6a4d44724a..ad33ddc545 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -91563,11 +91563,14 @@ (define-public rust-zerocopy-derive-0.3
                (base32
                 "18qr7dqlj89v1xl1g58l2xd6jidv0sbccscgl131gpppba0yc1b5"))))
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1)
-        ("rust-synstructure" ,rust-synstructure-0.12))))))
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-rustversion" ,rust-rustversion-1)
+        ("rust-trybuild" ,rust-trybuild-1))))))
 
 (define-public rust-zerocopy-derive-0.2
   (package
-- 
2.41.0

[bug#67919] [PATCH 31/55] gnu: rust-zerocopy-derive-0.2: Downgrade to 0.2.0.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-zerocopy-derive-0.2): Downgrade to 0.2.0.
[arguments]: Allow building.

Change-Id: I857d26dfddb22d3e018b13e5cc2e54149559c06b
---
 gnu/packages/crates-io.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ad33ddc545..eb37bbcda9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -91576,20 +91576,22 @@ (define-public rust-zerocopy-derive-0.2
   (package
     (inherit rust-zerocopy-derive-0.3)
     (name "rust-zerocopy-derive")
-    (version "0.2.1")
+    (version "0.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "zerocopy-derive" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1594sf9wwgpbavl1hb1avyz6n7km9apm8afc03x9y8h3spk3k76w"))))
+        (base32 "1yzd3057gr3csn3x4wrl8y4ji52hr8rirbh9cz487svvzp8xp66l"))))
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-syn" ,rust-syn-1)
-        ("rust-synstructure" ,rust-synstructure-0.12))))
+        ("rust-synstructure" ,rust-synstructure-0.12))
+       #:cargo-development-inputs
+       (("rust-compiletest-rs" ,rust-compiletest-rs-0.3))))
     (license license:bsd-3)))
 
 (define-public rust-zeroize-1
-- 
2.41.0

[bug#67919] [PATCH 32/55] gnu: Add rust-zerocopy-0.7.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-zerocopy-0.7): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index eb37bbcda9..e55ef06ce5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -91481,8 +91481,40 @@ (define-public rust-zbus-polkit-1
     (description "@code{PolicyKit} binding.")
     (license license:expat)))
 
+(define-public rust-zerocopy-0.7
+  (package
+    (name "rust-zerocopy")
+    (version "0.7.31")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "zerocopy" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gcfyrmlrhmsz16qxjp2qzr6vixyaw1p04zl28f08lxkvfz62h0w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-zerocopy-derive" ,rust-zerocopy-derive-0.7))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-elain" ,rust-elain-0.3)
+        ("rust-itertools" ,rust-itertools-0.11)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-zerocopy-derive" ,rust-zerocopy-derive-0.7))))
+    (home-page "https://github.com/google/zerocopy")
+    (synopsis "Utilities for zero-copy parsing and serialization")
+    (description "Utilities for zero-copy parsing and serialization")
+    (license (list license:bsd-2 license:asl2.0 license:expat))))
+
 (define-public rust-zerocopy-0.6
   (package
+    (inherit rust-zerocopy-0.7)
     (name "rust-zerocopy")
     (version "0.6.1")
     (source (origin
@@ -91492,16 +91524,11 @@ (define-public rust-zerocopy-0.6
               (sha256
                (base32
                 "0dpj4nd9v56wy93ahjkp95znjzj91waqvidqch8gxwdwq661hbrk"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-byteorder" ,rust-byteorder-1)
-        ("rust-zerocopy-derive" ,rust-zerocopy-derive-0.3))))
-    (home-page "https://github.com/google/zerocopy")
-    (synopsis "Utilities for zero-copy parsing and serialization")
-    (description "Utilities for zero-copy parsing and serialization")
-    (license license:bsd-2)))
+        ("rust-zerocopy-derive" ,rust-zerocopy-derive-0.3))))))
 
 (define-public rust-zerocopy-0.3
   (package
-- 
2.41.0

[bug#67919] [PATCH 33/55] gnu: rust-ahash-0.8: Update to 0.8.6.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-ahash-0.8): Update to 0.8.6.
[arguments]: Skip tests.

Change-Id: I3966210979ccbc0aa081aafe16bcf9bf95f5348e
---
 gnu/packages/crates-io.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e55ef06ce5..8ce05fd31a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2613,24 +2613,26 @@ (define-public rust-afl-0.8
 (define-public rust-ahash-0.8
   (package
     (name "rust-ahash")
-    (version "0.8.3")
+    (version "0.8.6")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "ahash" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0bzcsxdl2wd6j2p4214qh9sqkqn69gi7f9lk1xi8yj063r6zd69c"))))
+                "0yn9i8nc6mmv28ig9w3dga571q09vg9f1f650mi5z8phx42r6hli"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:tests? #f
+       #:cargo-inputs
        (("rust-atomic-polyfill" ,rust-atomic-polyfill-1)
         ("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-const-random" ,rust-const-random-0.1)
         ("rust-getrandom" ,rust-getrandom-0.2)
         ("rust-once-cell" ,rust-once-cell-1)
         ("rust-serde" ,rust-serde-1)
-        ("rust-version-check" ,rust-version-check-0.9))
+        ("rust-version-check" ,rust-version-check-0.9)
+        ("rust-zerocopy" ,rust-zerocopy-0.7))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
         ("rust-fnv" ,rust-fnv-1)
-- 
2.41.0

[bug#67919] [PATCH 34/55] gnu: rust-hashbrown-0.14: Update to 0.14.3.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-hashbrown-0.14): Update to 0.14.3.

Change-Id: Ieb7bcaad5d9e38721896fb653880d4ad00a594c1
---
 gnu/packages/crates-io.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8ce05fd31a..743e6e04a2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34259,14 +34259,14 @@ (define-public rust-hash32-derive-0.1
 (define-public rust-hashbrown-0.14
   (package
     (name "rust-hashbrown")
-    (version "0.14.0")
+    (version "0.14.3")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "hashbrown" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0yj3nf0w30pf30w503kgaw4sbjnh62l5cbmc7dd0mnczzywh2qic"))
+                "012nywlg0lj9kwanh69my5x67vjlfmzfi9a0rq4qvis2j8fil3r9"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -34279,6 +34279,7 @@ (define-public rust-hashbrown-0.14
        (("rust-ahash" ,rust-ahash-0.8)
         ("rust-allocator-api2" ,rust-allocator-api2-0.2)
         ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-equivalent" ,rust-equivalent-1)
         ("rust-rayon" ,rust-rayon-1)
         ("rust-rkyv" ,rust-rkyv-0.7)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
-- 
2.41.0

[bug#67919] [PATCH 35/55] gnu: rust-indexmap-2: Update to 2.1.0.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-indexmap-2): Update to 2.1.0.

Change-Id: Iacc0b0f96758167b44ccb5a561a80dd6bfc9b100
---
 gnu/packages/crates-io.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 743e6e04a2..fda27f695b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37391,14 +37391,14 @@ (define-public rust-indenter-0.3
 (define-public rust-indexmap-2
   (package
     (name "rust-indexmap")
-    (version "2.0.0")
+    (version "2.1.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "indexmap" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0pdnbvv6gnyxx2li8mks8p00fya3ynmhx3n6infpcy8a4gi7yiym"))))
+                "07rxrqmryr1xfnmhrjlz8ic6jw28v6h5cig3ws2c9d0wifhy2c6m"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -37412,7 +37412,7 @@ (define-public rust-indexmap-2
        #:cargo-development-inputs
        (("rust-fnv" ,rust-fnv-1)
         ("rust-fxhash" ,rust-fxhash-0.2)
-        ("rust-itertools" ,rust-itertools-0.10)
+        ("rust-itertools" ,rust-itertools-0.11)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-quickcheck" ,rust-quickcheck-1)
         ("rust-rand" ,rust-rand-0.8)
-- 
2.41.0

[bug#67919] [PATCH 36/55] gnu: rust-plist-1: Update to 1.6.0.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-plist-1): Update to 1.6.0.

Change-Id: I51d68312ed91774fb018c8cf0b86a5c09186867a
---
 gnu/packages/crates-io.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fda27f695b..06afb9ad04 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55904,23 +55904,26 @@ (define-public rust-pledge-0.4
 (define-public rust-plist-1
   (package
     (name "rust-plist")
-    (version "1.0.0")
+    (version "1.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "plist" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1zb7k48x1zf1dhqavs37qm24fxi98qb978xv2nzjkkp4x2a6scvv"))))
+        (base32 "1vscdjj7xy1pz80n3lwcg1jhsydcf2nvj4lfxsqs46ixlv49qsg5"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-base64" ,rust-base64-0.12)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-indexmap" ,rust-indexmap-1)
+       (("rust-base64" ,rust-base64-0.21)
+        ("rust-indexmap" ,rust-indexmap-2)
         ("rust-line-wrap" ,rust-line-wrap-0.1)
+        ("rust-quick-xml" ,rust-quick-xml-0.31)
         ("rust-serde" ,rust-serde-1)
-        ("rust-xml-rs" ,rust-xml-rs-0.8))))
+        ("rust-time" ,rust-time-0.3))
+       #:cargo-development-inputs
+       (("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-yaml" ,rust-serde-yaml-0.8))))
     (home-page "https://github.com/ebarnard/rust-plist/")
     (synopsis "Rusty plist parser")
     (description
-- 
2.41.0

[bug#67919] [PATCH 37/55] gnu: rust-percent-encoding-2: Update to 2.3.1.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-percent-encoding-2): Update to 2.3.1.

Change-Id: I7b8bde66799b9b3b9c80197137ae7c14b07a7315
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 06afb9ad04..3836631603 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54400,7 +54400,7 @@ (define-public rust-pep508-rs-0.2
 (define-public rust-percent-encoding-2
   (package
     (name "rust-percent-encoding")
-    (version "2.3.0")
+    (version "2.3.1")
     (source
      (origin
        (method url-fetch)
@@ -54408,7 +54408,7 @@ (define-public rust-percent-encoding-2
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "152slflmparkh27hprw62sph8rv77wckzhwl2dhqk6bf563lfalv"))))
+         "0gi8wgx0dcy8rnv1kywdv98lwcx67hz0a0zwpib5v2i08r88y573"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/servo/rust-url/")
     (synopsis "Percent encoding and decoding")
-- 
2.41.0

[bug#67919] [PATCH 38/55] gnu: Add rust-generic-array-0.11.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-generic-array-0.11): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3836631603..cbd23ba0be 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29310,6 +29310,28 @@ (define-public rust-generic-array-0.12
         (base32
          "1gfpay78vijl9vrwl1k9v7fbvbhkhcmnrk4kfg9l6x24y4s9zpzz"))))))
 
+(define-public rust-generic-array-0.11
+  (package
+    (inherit rust-generic-array-0.13)
+    (name "rust-generic-array")
+    (version "0.11.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "generic-array" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0a7w8w0rg47nmcinnfzv443lcyb8mplwc251p1jyr5xj2yh6wzv6"))))
+    (arguments
+     `(#:cargo-test-flags '("--release" "--"
+                            "--skip=arr::doctests_only::DocTests (line 116)"
+                            "--skip=arr::doctests_only::DocTests (line 85)")
+       #:cargo-inputs
+       (("rust-serde" ,rust-serde-1)
+        ("rust-typenum" ,rust-typenum-1))
+       #:cargo-development-inputs
+       (("rust-serde-json" ,rust-serde-json-1))))))
+
 (define-public rust-generic-array-0.9
   (package
     (inherit rust-generic-array-0.14)
-- 
2.41.0

[bug#67919] [PATCH 39/55] gnu: Add rust-alga-derive-0.7.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-alga-derive-0.7): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cbd23ba0be..1b69707a66 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3027,6 +3027,24 @@ (define-public rust-alga-derive-0.9
 @code{alga} crate.")
     (license license:asl2.0)))
 
+(define-public rust-alga-derive-0.7
+  (package
+    (inherit rust-alga-derive-0.9)
+    (name "rust-alga-derive")
+    (version "0.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "alga_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "05lccfjhm6sm1lalkmi1c2vdzcpz9h1s9yyk5cwkyh69s8a6xw46"))))
+    (arguments
+     `(#:cargo-inputs (("rust-edit-distance" ,rust-edit-distance-2)
+                       ("rust-quickcheck" ,rust-quickcheck-0.7)
+                       ("rust-quote" ,rust-quote-0.3)
+                       ("rust-syn" ,rust-syn-0.11))))))
+
 (define-public rust-aliasable-deref-trait-0.2
   (package
     (name "rust-aliasable-deref-trait")
-- 
2.41.0

[bug#67919] [PATCH 40/55] gnu: Add rust-alga-0.7.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-alga-0.7): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1b69707a66..4efa202206 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3000,6 +3000,31 @@ (define-public rust-alga-0.9
 code that is generic with regard to the algebraic entity types.")
     (license license:asl2.0)))
 
+(define-public rust-alga-0.7
+  (package
+    (inherit rust-alga-0.9)
+    (name "rust-alga")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "alga" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0y2p2n5i61a7qf7l49xy8vj0qcaj3lkjz33vfin9iwjrrbp01fr4"))))
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--lib" "--bins" "--tests")
+       #:cargo-inputs
+       (("rust-approx" ,rust-approx-0.3)
+        ("rust-decimal" ,rust-decimal-2)
+        ("rust-libm" ,rust-libm-0.1)
+        ("rust-num-complex" ,rust-num-complex-0.2)
+        ("rust-num-traits" ,rust-num-traits-0.2))
+       #:cargo-development-inputs
+       (("rust-alga-derive" ,rust-alga-derive-0.7)
+        ("rust-quickcheck" ,rust-quickcheck-0.7))))))
+
 (define-public rust-alga-derive-0.9
   (package
     (name "rust-alga-derive")
-- 
2.41.0

[bug#67919] [PATCH 41/55] gnu: Add rust-abomonation-0.5.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-abomonation-0.5): New variable.

Change-Id: I751260bc5ac2297e04d71aa751ceebb0850b7385
---
 gnu/packages/crates-io.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4efa202206..fd41b03766 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -286,6 +286,19 @@ (define-public rust-abomonation-0.7
 library in Rust.")
     (license license:expat)))
 
+(define-public rust-abomonation-0.5
+  (package
+    (inherit rust-abomonation-0.7)
+    (name "rust-abomonation")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "abomonation" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19h4s5ai8pbaap7n8pcd6yinqp22hx29ls9d2gdwsjka3m9xy6gv"))))))
+
 (define-public rust-actix-0.10
   (package
     (name "rust-actix")
-- 
2.41.0

[bug#67919] [PATCH 42/55] gnu: Add rust-nalgebra-0.16.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-nalgebra-0.16): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fd41b03766..d681eabf5a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46870,6 +46870,36 @@ (define-public rust-nalgebra-0.19
        (("rust-rand-xorshift" ,rust-rand-xorshift-0.2)
         ("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-nalgebra-0.16
+  (package
+    (inherit rust-nalgebra-0.19)
+    (name "rust-nalgebra")
+    (version "0.16.14")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nalgebra" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "163g3arb9m1l9p5c34621cnr3p9cjzj6sbz1yr4zbxgc97rnvf6c"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-abomonation" ,rust-abomonation-0.5)
+        ("rust-alga" ,rust-alga-0.7)
+        ("rust-approx" ,rust-approx-0.3)
+        ("rust-generic-array" ,rust-generic-array-0.11)
+        ("rust-matrixmultiply" ,rust-matrixmultiply-0.1)
+        ("rust-mint" ,rust-mint-0.5)
+        ("rust-num-complex" ,rust-num-complex-0.2)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-quickcheck" ,rust-quickcheck-0.6)
+        ("rust-rand" ,rust-rand-0.5)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-typenum" ,rust-typenum-1))
+       #:cargo-development-inputs
+       (("rust-serde-json" ,rust-serde-json-1))))))
+
 (define-public rust-nalgebra-macros-0.2
   (package
     (name "rust-nalgebra-macros")
-- 
2.41.0

[bug#67919] [PATCH 43/55] gnu: Add rust-scad-1.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-scad-1): New variable.

Change-Id: Ibd2d0fc6860687473c23a671b9f1e37207bfe4c6
---
 gnu/packages/crates-graphics.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index e7f777e83b..c0f876b4c5 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2340,6 +2340,35 @@ (define-public rust-rgb-0.8
 first-class Rust objects.")
     (license license:expat)))
 
+(define-public rust-scad-1
+  (package
+    (name "rust-scad")
+    (version "1.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "scad" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yvy7ckfd7r261iywm75na1ykd9cl8h0q8ajb1iwg1jmnbs6vry6"))
+       (modules '((guix build utils)))
+       (snippet
+        '(delete-file-recursively "docs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=common_objects::tests::cube_center_x"
+         "--skip=common_objects::tests::cube_center_yz")
+       #:cargo-inputs
+       (("rust-nalgebra" ,rust-nalgebra-0.16))))
+    (home-page "https://github.com/thezoq2/Rust-Scad")
+    (synopsis "Crate for generating OpenSCAD models using Rust")
+    (description
+     "This package provides a crate for generating @code{OpenSCAD} models
+using Rust.")
+    (license license:lgpl2.0+)))
+
 (define-public rust-sdl2-0.35
   (package
     (name "rust-sdl2")
-- 
2.41.0

[bug#67919] [PATCH 44/55] gnu: Add rust-rand-mt-4.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rand-mt-4): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d681eabf5a..233bfb1e50 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60806,6 +60806,31 @@ (define-public rust-rand-jitter-0.1
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-rand-mt-4
+  (package
+    (name "rust-rand-mt")
+    (version "4.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rand_mt" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1pz2l6kwhx9rvfkr8n4c4klr49fancpc31wqc19543nnvv31iq29"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-rand-core" ,rust-rand-core-0.6))
+       #:cargo-development-inputs
+       (("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-version-sync" ,rust-version-sync-0.9))))
+    (home-page "https://github.com/artichoke/rand_mt")
+    (synopsis "Reference Mersenne Twister random number generators")
+    (description
+     "This package provides Reference Mersenne Twister random number
+generators.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rand-os-0.2
   (package
     (name "rust-rand-os")
-- 
2.41.0

[bug#67919] [PATCH 45/55] gnu: Add rust-topology-traits-0.1.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-topology-traits-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 233bfb1e50..c6e5a44a81 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82477,6 +82477,27 @@ (define-public rust-tonic-0.6
 performance, interoperability, and flexibility.")
     (license license:expat)))
 
+(define-public rust-topology-traits-0.1
+  (package
+    (name "rust-topology-traits")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "topology-traits" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cj03w5h0yp3mfrpry5llyj5clmmj8q6xz9vbl8k07jk52sdmj60"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-num-traits" ,rust-num-traits-0.2))))
+    (home-page "https://github.com/NicolasKlenert/topology-traits")
+    (synopsis "Topological traits for generic mathematics in Rust")
+    (description
+     "This package provides topological traits for generic mathematics in
+Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-totp-lite-1
   (package
     (name "rust-totp-lite")
-- 
2.41.0

[bug#67919] [PATCH 46/55] gnu: Add rust-assert-float-eq-1.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-assert-float-eq-1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c6e5a44a81..589ef5f655 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5314,6 +5314,24 @@ (define-public rust-assert-cmd-0.9
        #:cargo-development-inputs
        (("rust-docmatic" ,rust-docmatic-0.1))))))
 
+(define-public rust-assert-float-eq-1
+  (package
+    (name "rust-assert-float-eq")
+    (version "1.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "assert_float_eq" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xryhlk2p012y109048c5jj5f448cv0b86ylkjgg5v7dzcpnbsjc"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/AlexHuszagh/assert_float_eq")
+    (synopsis "Assertions for floating-point equality")
+    (description
+     "This package provides assertions for floating-point equality.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-assert-fs-1
   (package
     (name "rust-assert-fs")
-- 
2.41.0

[bug#67919] [PATCH 47/55] gnu: Add rust-enterpolation-0.2.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-enterpolation-0.2): New variable.

Change-Id: I5e4ac4acf1357db36db12604fd688a5c508373c7
---
 gnu/packages/crates-graphics.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index c0f876b4c5..aa5ef73759 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -737,6 +737,34 @@ (define-public rust-dcv-color-primitives-0.4
      "This package provides a library to perform image color model conversion.")
     (license license:expat-0)))
 
+(define-public rust-enterpolation-0.2
+  (package
+    (name "rust-enterpolation")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "enterpolation" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ah41msghasm0i97awa67rv3mg6p3j0xijswy1gpdipprg4gbb8z"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ; circular dependency with rust-palette-0.7
+       #:cargo-inputs
+       (("rust-assert-float-eq" ,rust-assert-float-eq-1)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-topology-traits" ,rust-topology-traits-0.1))))
+    (home-page "https://github.com/NicolasKlenert/enterpolation")
+    (synopsis
+     "Library for creating and computing interpolations, extrapolations and
+smoothing of generic data points")
+    (description
+     "This package provides a library for creating and computing interpolations,
+extrapolations and smoothing of generic data points.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-euclid-0.22
   (package
     (name "rust-euclid")
-- 
2.41.0

[bug#67919] [PATCH 48/55] gnu: Add rust-find-crate-0.6.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-find-crate-0.6): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 589ef5f655..a051945955 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26841,6 +26841,31 @@ (define-public rust-field-offset-0.3
 implementation.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-find-crate-0.6
+  (package
+    (name "rust-find-crate")
+    (version "0.6.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "find-crate" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ljpkh11gj7940xwz47xjhsvfbl93c2q0ql7l2v0w77amjx8paar"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-toml" ,rust-toml-0.5))
+       #:cargo-development-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                                   ("rust-quote" ,rust-quote-1)
+                                   ("rust-semver" ,rust-semver-0.11))))
+    (home-page "https://github.com/taiki-e/find-crate")
+    (synopsis
+     "Find the crate name from the current @code{Cargo.toml}")
+    (description
+     "This package provides finding the crate name from the current
+@code{Cargo.toml}.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-findshlibs-0.10
   (package
     (name "rust-findshlibs")
-- 
2.41.0

[bug#67919] [PATCH 49/55] gnu: Add rust-palette-derive-0.7.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-palette-derive-0.7): New variable.

Change-Id: I0d4341fc5140ab62fccfee6b5e68d37ba4788f92
---
 gnu/packages/crates-graphics.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index aa5ef73759..135cae9cc0 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1848,6 +1848,31 @@ (define-public rust-osmesa-sys-0.1
     (description "This package provides OSMesa library bindings for Rust.")
     (license license:cc0)))
 
+(define-public rust-palette-derive-0.7
+  (package
+    (name "rust-palette-derive")
+    (version "0.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "palette_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02ps239sxcr5v294qf89d87sv7fdm9pr2cziwj2l6ggzql703nxp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-find-crate" ,rust-find-crate-0.6)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/Ogeon/palette")
+    (synopsis
+     "Automatically implement traits from the @code{palette} crate")
+    (description
+     "This package allows automatically implements traits from the
+@code{palette} crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-piston-float-1
   (package
     (name "rust-piston-float")
-- 
2.41.0

[bug#67919] [PATCH 50/55] gnu: Add rust-fast-srgb8-1.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-fast-srgb8-1): New variable.

Change-Id: If1ce13ad8c4f2a04b9f77a16063218d4540bd10e
---
 gnu/packages/crates-graphics.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 135cae9cc0..82a76dc190 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -871,6 +871,27 @@ (define-public rust-exr-1
     (description "Read and write OpenEXR files without any unsafe code")
     (license license:bsd-3)))
 
+(define-public rust-fast-srgb8-1
+  (package
+    (name "rust-fast-srgb8")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fast-srgb8" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18g6xwwh4gnkyx1352hnvwagpv0n4y98yp2llm8vyvwxh487abnx"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/thomcc/fast-srgb8")
+    (synopsis
+     "Very fast conversions between linear float and 8-bit @code{sRGB} (with
+@code{no_std} support)")
+    (description
+     "This package provides very fast conversions between linear float and
+8-bit @code{sRGB} (with @code{no_std} support).")
+    (license (list license:expat license:asl2.0 license:cc0))))
+
 (define-public rust-gfx-0.18
   (package
     (name "rust-gfx")
-- 
2.41.0

[bug#67919] [PATCH 51/55] gnu: Add rust-palette-0.7.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-palette-0.7): New variable.

Change-Id: Ia55d3b7788a04a410dacb7f53dcb2d2909f026c6
---
 gnu/packages/crates-graphics.scm | 46 ++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 82a76dc190..53e7ba3163 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1869,6 +1869,52 @@ (define-public rust-osmesa-sys-0.1
     (description "This package provides OSMesa library bindings for Rust.")
     (license license:cc0)))
 
+(define-public rust-palette-0.7
+  (package
+    (name "rust-palette")
+    (version "0.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "palette" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1p2inf23vsqy06w7vp7rcxmb9vk91asib534m9cafykn8x0z7qmj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ; Can't find regression tests.
+       #:cargo-inputs
+       (("rust-approx" ,rust-approx-0.5)
+        ("rust-bytemuck" ,rust-bytemuck-1)
+        ("rust-fast-srgb8" ,rust-fast-srgb8-1)
+        ("rust-libm" ,rust-libm-0.2)
+        ("rust-palette-derive" ,rust-palette-derive-0.7)
+        ("rust-phf" ,rust-phf-0.11)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-wide" ,rust-wide-0.7))
+       #:cargo-development-inputs
+       (("rust-clap" ,rust-clap-3)
+        ("rust-criterion" ,rust-criterion-0.4)
+        ("rust-csv" ,rust-csv-1)
+        ("rust-enterpolation" ,rust-enterpolation-0.2)
+        ("rust-image" ,rust-image-0.23)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-rand-mt" ,rust-rand-mt-4)
+        ("rust-ron" ,rust-ron-0.8)
+        ("rust-scad" ,rust-scad-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/Ogeon/palette")
+    (synopsis
+     "Convert and manage colors with a focus on correctness, flexibility and
+ease of use.")
+    (description
+     "This package provides converting and managing colors in Rust with a
+focus on correctness, flexibility and ease of use.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-palette-derive-0.7
   (package
     (name "rust-palette-derive")
-- 
2.41.0

[bug#67919] [PATCH 52/55] gnu: rust-once-cell-1: Update to 1.19.0.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-once-cell-1): Update to 1.19.0.

Change-Id: Ifa536773227ed58209605016f43d7bc157e200d5
---
 gnu/packages/crates-io.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a051945955..c5dfdeb8cc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51168,7 +51168,7 @@ (define-public rust-onig-sys-69.6
 (define-public rust-once-cell-1
   (package
     (name "rust-once-cell")
-    (version "1.18.0")
+    (version "1.19.0")
     (source
      (origin
        (method url-fetch)
@@ -51176,13 +51176,13 @@ (define-public rust-once-cell-1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0vapcd5ambwck95wyz3ymlim35jirgnqn9a0qmi19msymv95v2yx"))))
+         "14kvw7px5z96dk4dwdm1r9cqhhy2cyj1l5n5b29mynbb8yr15nrz"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-atomic-polyfill" ,rust-atomic-polyfill-1)
-        ("rust-critical-section" ,rust-critical-section-1)
-        ("rust-parking-lot-core" ,rust-parking-lot-core-0.9))
+       (("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))))
-- 
2.41.0

[bug#67919] [PATCH 53/55] gnu: eza: Update to 0.17.0.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/rust-apps.scm (eza): Update to 0.17.0.

Change-Id: I27f119478a97cc6789ec2c569db34c61962f188b
---
 gnu/packages/rust-apps.scm | 57 +++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index ab8534f64a..d3e4853645 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -476,42 +476,47 @@ (define-public exa
 (define-public eza
   (package
     (name "eza")
-    (version "0.15.2")
+    (version "0.17.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "eza" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "14qapnxc1rwqsq6c13b35wgaiypn23niajk39c44i1w3if91rd85"))))
+        (base32 "026xagh42nrdy2yg9197mmb2bhm5mdvbf9vd9fk9iysrj1iay63r"))))
     (build-system cargo-build-system)
     (arguments
      (list
       #:install-source? #f
-      #:cargo-inputs `(("rust-ansiterm" ,rust-ansiterm-0.12)
-                       ("rust-chrono" ,rust-chrono-0.4)
-                       ("rust-git2" ,rust-git2-0.18)
-                       ("rust-glob" ,rust-glob-0.3)
-                       ("rust-libc" ,rust-libc-0.2)
-                       ("rust-locale" ,rust-locale-0.2)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-natord" ,rust-natord-1)
-                       ("rust-num-cpus" ,rust-num-cpus-1)
-                       ("rust-number-prefix" ,rust-number-prefix-0.4)
-                       ("rust-once-cell" ,rust-once-cell-1)
-                       ("rust-percent-encoding" ,rust-percent-encoding-2)
-                       ("rust-phf" ,rust-phf-0.11)
-                       ("rust-proc-mounts" ,rust-proc-mounts-0.3)
-                       ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
-                       ("rust-terminal-size" ,rust-terminal-size-0.3)
-                       ("rust-timeago" ,rust-timeago-0.4)
-                       ("rust-unicode-width" ,rust-unicode-width-0.1)
-                       ("rust-uutils-term-grid" ,rust-uutils-term-grid-0.3)
-                       ("rust-uzers" ,rust-uzers-0.11)
-                       ("rust-windows-sys" ,rust-windows-sys-0.48)
-                       ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.5))
-      #:cargo-development-inputs `(("rust-criterion" ,rust-criterion-0.5)
-                                   ("rust-trycmd" ,rust-trycmd-0.14))
+      #:cargo-inputs
+      `(("rust-ansiterm" ,rust-ansiterm-0.12)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-git2" ,rust-git2-0.18)
+        ("rust-glob" ,rust-glob-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-locale" ,rust-locale-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-natord" ,rust-natord-1)
+        ("rust-num-cpus" ,rust-num-cpus-1)
+        ("rust-number-prefix" ,rust-number-prefix-0.4)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-palette" ,rust-palette-0.7)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-phf" ,rust-phf-0.11)
+        ("rust-plist" ,rust-plist-1)
+        ("rust-proc-mounts" ,rust-proc-mounts-0.3)
+        ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
+        ("rust-terminal-size" ,rust-terminal-size-0.3)
+        ("rust-timeago" ,rust-timeago-0.4)
+        ("rust-unicode-width" ,rust-unicode-width-0.1)
+        ("rust-uutils-term-grid" ,rust-uutils-term-grid-0.3)
+        ("rust-uzers" ,rust-uzers-0.11)
+        ("rust-windows-sys" ,rust-windows-sys-0.52)
+        ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.5))
+      #:cargo-development-inputs
+      `(("rust-criterion" ,rust-criterion-0.5)
+        ("rust-trycmd" ,rust-trycmd-0.14))
       #:phases #~(modify-phases %standard-phases
                    (add-after 'build 'build-manual
                      (lambda* (#:key inputs #:allow-other-keys)
-- 
2.41.0

[bug#67919] [PATCH 54/55] gnu: Remove exa.

[Jaeme Sifat via Guix-patches via]

exa is unmaintained/deprecated in favor of eza. Users should not use exa
anymore.

* gnu/packages/rust-apps.scm (exa): Delete variable.

Change-Id: Iab79a82dd54f4c627a26fc85749d69c66d2b619a
---
 gnu/packages/rust-apps.scm | 86 --------------------------------------
 1 file changed, 86 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index d3e4853645..cf29cf051c 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -387,92 +387,6 @@ (define-public dutree
 @end enumerate\n")
     (license license:gpl3)))
 
-(define-public exa
-  (package
-    (name "exa")
-    (version "0.10.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "exa" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1dd7waq2bnxc1xwygqphi8k1g2qzykr6fk0q4rgrhhxp2jd09f04"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:install-source? #f
-       #:cargo-inputs
-       (("rust-ansi-term" ,rust-ansi-term-0.12)
-        ("rust-datetime" ,rust-datetime-0.5)
-        ("rust-env-logger" ,rust-env-logger-0.6)
-        ("rust-git2" ,rust-git2-0.13)
-        ("rust-glob" ,rust-glob-0.3)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-locale" ,rust-locale-0.2)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-natord" ,rust-natord-1)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-number-prefix" ,rust-number-prefix-0.4)
-        ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
-        ("rust-term-grid" ,rust-term-grid-0.1)
-        ("rust-term-size" ,rust-term-size-0.3)
-        ("rust-unicode-width" ,rust-unicode-width-0.1)
-        ("rust-users" ,rust-users-0.11)
-        ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.5))
-       #:cargo-development-inputs
-       (("rust-datetime" ,rust-datetime-0.5))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'build 'build-manual
-           (lambda* (#:key inputs #:allow-other-keys)
-             (when (assoc-ref inputs "pandoc")
-               (map (lambda (page)
-                      (with-output-to-file page
-                        (lambda _
-                          (invoke "pandoc" "--standalone"
-                                  "-f" "markdown"
-                                  "-t" "man"
-                                  (string-append "man/" page ".md")))))
-                    (list "exa.1" "exa_colors.5")))))
-         (add-after 'install 'install-extras
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out   (assoc-ref outputs "out"))
-                    (share (string-append out "/share"))
-                    (man1  (string-append share "/man/man1"))
-                    (man5  (string-append share "/man/man5")))
-               (when (file-exists? "exa.1")
-                 (install-file "exa.1" man1))
-               (when (file-exists? "exa_colors.5")
-                 (install-file "exa_colors.5" man5))
-               (mkdir-p (string-append out "/etc/bash_completion.d"))
-               (mkdir-p (string-append share "/fish/vendor_completions.d"))
-               (mkdir-p (string-append share "/zsh/site-functions"))
-               (copy-file "completions/completions.bash"
-                          (string-append out "/etc/bash_completion.d/exa"))
-               (copy-file "completions/completions.fish"
-                          (string-append
-                            share "/fish/vendor_completions.d/exa.fish"))
-               (copy-file "completions/completions.zsh"
-                          (string-append
-                            share "/zsh/site-functions/_exa"))))))))
-    (inputs (list libgit2 zlib))
-    (native-inputs
-     (append
-       (list pkg-config)
-       (if (member (%current-system)
-                   (package-transitive-supported-systems pandoc))
-         (list pandoc)
-         '())))
-    (home-page "https://the.exa.website/")
-    (synopsis "Modern replacement for ls")
-    (description "@code{exa} is a modern replacement for the command-line
-program @code{ls}.  It uses colours to distinguish file types and metadata.  It
-also knows about symlinks, extended attributes, and Git.")
-    (license license:expat)))
-
 (define-public eza
   (package
     (name "eza")
-- 
2.41.0

[bug#67919] [PATCH 55/55] gnu: eza: Refactor package definition.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/rust-apps.scm (eza): Refactor package definition.
[arguments]: Made 'install-extras phase clearer.

Change-Id: I4df0fdcde11d8ab07eed5aeeb1d14a6fe5fe55c3
---
 gnu/packages/rust-apps.scm | 45 ++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index cf29cf051c..2f339f55d7 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -404,7 +404,6 @@ (define-public eza
       #:install-source? #f
       #:cargo-inputs
       `(("rust-ansiterm" ,rust-ansiterm-0.12)
-        ("rust-chrono" ,rust-chrono-0.4)
         ("rust-chrono" ,rust-chrono-0.4)
         ("rust-git2" ,rust-git2-0.18)
         ("rust-glob" ,rust-glob-0.3)
@@ -438,40 +437,44 @@ (define-public eza
                          (map (lambda (page)
                                 (with-output-to-file page
                                   (lambda _
-                                    (invoke "pandoc" "--standalone"
-                                            "-f" "markdown"
-                                            "-t" "man"
+                                    (invoke "pandoc"
+                                            "--standalone"
+                                            "-f"
+                                            "markdown"
+                                            "-t"
+                                            "man"
                                             (string-append "man/" page ".md")))))
                               (list "eza.1" "eza_colors.5")))))
                    (add-after 'install 'install-extras
                      (lambda* (#:key outputs #:allow-other-keys)
                        (let* ((out (assoc-ref outputs "out"))
                               (share (string-append out "/share"))
+                              (bash-completions-dir (string-append share
+                                                     "/bash-completion/completions"))
+                              (zsh-completions-dir (string-append share
+                                                    "/zsh/site-functions"))
+                              (fish-completions-dir (string-append share
+                                                     "/fish/vendor_completions.d"))
                               (man1 (string-append share "/man/man1"))
                               (man5 (string-append share "/man/man5")))
                          (when (file-exists? "eza.1")
                            (install-file "eza.1" man1))
                          (when (file-exists? "eza_colors.5")
                            (install-file "eza_colors.5" man5))
-                         (mkdir-p (string-append out "/etc/bash_completion.d"))
-                         (mkdir-p (string-append
-                                    share "/fish/vendor_completions.d"))
-                         (mkdir-p (string-append share "/zsh/site-functions"))
+                         (mkdir-p bash-completions-dir)
+                         (mkdir-p zsh-completions-dir)
+                         (mkdir-p fish-completions-dir)
                          (copy-file "completions/bash/eza"
-                                    (string-append
-                                      out "/etc/bash_completion.d/eza"))
-                         (copy-file "completions/fish/eza.fish"
-                                    (string-append
-                                      share "/fish/vendor_completions.d/eza.fish"))
+                                    (string-append bash-completions-dir "/eza"))
                          (copy-file "completions/zsh/_eza"
-                                    (string-append
-                                      share "/zsh/site-functions/_eza"))))))))
-    (native-inputs
-     (append
-       (list pkg-config)
-       (if (supported-package? pandoc)
-         (list pandoc)
-         '())))
+                                    (string-append zsh-completions-dir "/_eza"))
+                         (copy-file "completions/fish/eza.fish"
+                                    (string-append fish-completions-dir
+                                                   "/eza.fish"))))))))
+    (native-inputs (append (list pkg-config)
+                           (if (supported-package? pandoc)
+                               (list pandoc)
+                               '())))
     (inputs (list libgit2-1.7 zlib))
     (home-page "https://github.com/eza-community/eza")
     (synopsis "Modern replacement for ls")
-- 
2.41.0

bug#67919: [PATCH 00/55 rust-team] gnu: eza: Update to 0.17.0.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 603 bytes --]

Thanks for the patches!

I made a couple of changes along the way. I think the biggest one was
rust-scad-1 I checked upstream and was able to replace nalgebra@0.16
with 0.27 which meant we could drop a couple of patches.  I also changed
exa into a deprecated package which we can remove at a later date so
that way it doesn't just disappear.

Patches added to the rust-team branch

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]