4 files changed, 173 insertions, 168 deletions

diff --git a/gnu/packages/crates-audio.scm b/gnu/packages/crates-audio.scm
index 2b8e7d124b5..7a1c31937b0 100644
--- a/gnu/packages/crates-audio.scm
+++ b/gnu/packages/crates-audio.scm
@@ -1,3 +1,4 @@
+;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2023 Steve George <steve@futurile.net>
 ;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2024 Roman Scherer <roman@burningswell.com>
diff --git a/gnu/packages/crates-check.scm b/gnu/packages/crates-check.scm
index 50e92f3cddf..ed972f7da8d 100644
--- a/gnu/packages/crates-check.scm
+++ b/gnu/packages/crates-check.scm
@@ -1,10 +1,13 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
-;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
 ;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
+;;; Copyright © 2023 Steve George <steve@futurile.net>
 ;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2024 Aaron Covrig <aaron.covrig.us@ieee.org>
+;;; Copyright © 2024 Jordan Moore <lockbox@struct.foo>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -81,6 +84,173 @@
 (proc-macro crate).")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-mock-instant-0.3
+  (package
+    (name "rust-mock-instant")
+    (version "0.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mock_instant" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "180yr3i44a98w1mj36dd8xmym33rbzndpj0j1g13di52n8g8crlk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1))))
+    (home-page "https://github.com/museun/mock_instant")
+    (synopsis "Mock an std::time::Instant")
+    (description
+     "This package provides a simple way to mock an std::time::Instant in Rust.")
+    (license license:bsd-0)))
+
+(define-public rust-mock-instant-0.2
+  (package
+    (inherit rust-mock-instant-0.3)
+    (name "rust-mock-instant")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "mock_instant" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "0vg0kmz96zazjdq57l57nm24mc2in57y090ywcq827xq8fi2jzki"))))
+    (arguments
+     `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1))))))
+
+(define-public rust-mockall-0.13
+  (package
+    (name "rust-mockall")
+    (version "0.13.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mockall" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1lir70dd9cnsjlf20gi3i51ha9n7mlrkx74bx5gfszlcdk6bz9ir"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-downcast" ,rust-downcast-0.11)
+                       ("rust-fragile" ,rust-fragile-2)
+                       ("rust-mockall-derive" ,rust-mockall-derive-0.13)
+                       ("rust-predicates" ,rust-predicates-3)
+                       ("rust-predicates-tree" ,rust-predicates-tree-1))
+       #:cargo-development-inputs (("rust-async-trait" ,rust-async-trait-0.1)
+                                   ("rust-auto-enums" ,rust-auto-enums-0.8)
+                                   ("rust-futures" ,rust-futures-0.3)
+                                   ("rust-mockall-double" ,rust-mockall-double-0.3)
+                                   ("rust-serde" ,rust-serde-1)
+                                   ("rust-serde-derive" ,rust-serde-derive-1)
+                                   ("rust-serde-json" ,rust-serde-json-1)
+                                   ("rust-tracing" ,rust-tracing-0.1))))
+    (home-page "https://github.com/asomers/mockall")
+    (synopsis "Powerful mock object library for Rust")
+    (description
+     "This package provides a powerful mock object library for Rust.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-mockall-0.11
+  (package
+    (inherit rust-mockall-0.13)
+    (name "rust-mockall")
+    (version "0.11.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "mockall" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "15kww0a3wv300wkksc6zj0kz1jwk0hyly48daxs2vvpj300lk12c"))))
+    (arguments
+     `(#:tests? #f          ; Not all files included.
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-downcast" ,rust-downcast-0.11)
+        ("rust-fragile" ,rust-fragile-2)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-mockall-derive" ,rust-mockall-derive-0.11)
+        ("rust-predicates" ,rust-predicates-2)
+        ("rust-predicates-tree" ,rust-predicates-tree-1))
+       #:cargo-development-inputs
+       (("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-mockall-double" ,rust-mockall-double-0.3)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-tracing" ,rust-tracing-0.1))))))
+
+(define-public rust-mockall-derive-0.13
+  (package
+    (name "rust-mockall-derive")
+    (version "0.13.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mockall_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1608qajqrz23xbvv81alc6wm4l24as1bsqg4shdh3sggq8231ji5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))
+    (home-page "https://github.com/asomers/mockall")
+    (synopsis "Procedural macros for Mockall")
+    (description "This package provides procedural macros for Mockall.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-mockall-derive-0.11
+  (package
+    (inherit rust-mockall-derive-0.13)
+    (name "rust-mockall-derive")
+    (version "0.11.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "mockall_derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1fvc9kwjcc9ia6ng7z9z02b4qkl9dvsx9m4z51xz9i0mj1k7bki2"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))))
+
+(define-public rust-mockall-double-0.3
+  (package
+    (name "rust-mockall-double")
+    (version "0.3.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "mockall_double" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1s0k85929bf8afvdgq8m2vs8haqpkg9ysdimw7inl99mmkjrdjpi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/asomers/mockall")
+    (synopsis "Double test adapter that works well with Mockall")
+    (description
+     "This crate makes it even easier to use mocking by providing a way to
+select the mock struct at compile time.  Used with the Mockall crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-quickcheck-1
   (package
     (name "rust-quickcheck")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5abbe414718..60ac5d890ae 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47509,173 +47509,6 @@ possible over the OS abstractions.")
      "This package provides a library for dealing with memory-mapped I/O.")
     (license license:expat)))
 
-(define-public rust-mock-instant-0.3
-  (package
-    (name "rust-mock-instant")
-    (version "0.3.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "mock_instant" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "180yr3i44a98w1mj36dd8xmym33rbzndpj0j1g13di52n8g8crlk"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1))))
-    (home-page "https://github.com/museun/mock_instant")
-    (synopsis "Mock an std::time::Instant")
-    (description
-     "This package provides a simple way to mock an std::time::Instant in Rust.")
-    (license license:bsd-0)))
-
-(define-public rust-mock-instant-0.2
-  (package
-    (inherit rust-mock-instant-0.3)
-    (name "rust-mock-instant")
-    (version "0.2.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "mock_instant" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "0vg0kmz96zazjdq57l57nm24mc2in57y090ywcq827xq8fi2jzki"))))
-    (arguments
-     `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1))))))
-
-(define-public rust-mockall-0.13
-  (package
-    (name "rust-mockall")
-    (version "0.13.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "mockall" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1lir70dd9cnsjlf20gi3i51ha9n7mlrkx74bx5gfszlcdk6bz9ir"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
-                       ("rust-downcast" ,rust-downcast-0.11)
-                       ("rust-fragile" ,rust-fragile-2)
-                       ("rust-mockall-derive" ,rust-mockall-derive-0.13)
-                       ("rust-predicates" ,rust-predicates-3)
-                       ("rust-predicates-tree" ,rust-predicates-tree-1))
-       #:cargo-development-inputs (("rust-async-trait" ,rust-async-trait-0.1)
-                                   ("rust-auto-enums" ,rust-auto-enums-0.8)
-                                   ("rust-futures" ,rust-futures-0.3)
-                                   ("rust-mockall-double" ,rust-mockall-double-0.3)
-                                   ("rust-serde" ,rust-serde-1)
-                                   ("rust-serde-derive" ,rust-serde-derive-1)
-                                   ("rust-serde-json" ,rust-serde-json-1)
-                                   ("rust-tracing" ,rust-tracing-0.1))))
-    (home-page "https://github.com/asomers/mockall")
-    (synopsis "Powerful mock object library for Rust")
-    (description
-     "This package provides a powerful mock object library for Rust.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-mockall-0.11
-  (package
-    (inherit rust-mockall-0.13)
-    (name "rust-mockall")
-    (version "0.11.4")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "mockall" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "15kww0a3wv300wkksc6zj0kz1jwk0hyly48daxs2vvpj300lk12c"))))
-    (arguments
-     `(#:tests? #f          ; Not all files included.
-       #:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-downcast" ,rust-downcast-0.11)
-        ("rust-fragile" ,rust-fragile-2)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-mockall-derive" ,rust-mockall-derive-0.11)
-        ("rust-predicates" ,rust-predicates-2)
-        ("rust-predicates-tree" ,rust-predicates-tree-1))
-       #:cargo-development-inputs
-       (("rust-async-trait" ,rust-async-trait-0.1)
-        ("rust-futures" ,rust-futures-0.3)
-        ("rust-mockall-double" ,rust-mockall-double-0.3)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-tracing" ,rust-tracing-0.1))))))
-
-(define-public rust-mockall-derive-0.13
-  (package
-    (name "rust-mockall-derive")
-    (version "0.13.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "mockall_derive" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1608qajqrz23xbvv81alc6wm4l24as1bsqg4shdh3sggq8231ji5"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
-                       ("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quote" ,rust-quote-1)
-                       ("rust-syn" ,rust-syn-2))
-       #:cargo-development-inputs
-       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))
-    (home-page "https://github.com/asomers/mockall")
-    (synopsis "Procedural macros for Mockall")
-    (description "This package provides procedural macros for Mockall.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-mockall-derive-0.11
-  (package
-    (inherit rust-mockall-derive-0.13)
-    (name "rust-mockall-derive")
-    (version "0.11.4")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "mockall_derive" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1fvc9kwjcc9ia6ng7z9z02b4qkl9dvsx9m4z51xz9i0mj1k7bki2"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))
-       #:cargo-development-inputs
-       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))))
-
-(define-public rust-mockall-double-0.3
-  (package
-    (name "rust-mockall-double")
-    (version "0.3.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "mockall_double" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1s0k85929bf8afvdgq8m2vs8haqpkg9ysdimw7inl99mmkjrdjpi"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
-                       ("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quote" ,rust-quote-1)
-                       ("rust-syn" ,rust-syn-2))))
-    (home-page "https://github.com/asomers/mockall")
-    (synopsis "Double test adapter that works well with Mockall")
-    (description
-     "This crate makes it even easier to use mocking by providing a way to
-select the mock struct at compile time.  Used with the Mockall crate.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-modifier-0.1
   (package
     (name "rust-modifier")
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 23ed9e22ddb..2cc9d32f921 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -55,6 +55,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
+  #:use-module (gnu packages crates-check)
   #:use-module (gnu packages crates-crypto)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-vcs)