[bug#67024] [PATCH 00/54] Series to add StackedGit 2.4

[bug#67024] [PATCH 00/54] Series to add StackedGit 2.4

[Steve George]

Depends on https://issues.guix.gnu.org/66563

StGit 2.4 is a rewrite in Rust, so have left 1.x in the archive as some users
may prefer to stay on it.

Steve George (54):
  gnu: Add rust-gix-hash-0.13.
  gnu: Add rust-prodash-26.
  gnu: Add rust-gix-features-0.35.
  gnu: Add rust-byteyarn-0.2.
  gnu: Add rust-gix-path-0.10.
  gnu: Add rust-gix-glob-0.13.
  gnu: Add rust-gix-attributes-0.19.
  gnu: Add rust-gix-date-0.8.
  gnu: Add rust-gix-actor-0.27.
  gnu: Add rust-gix-validate-0.8.
  gnu: Add rust-gix-object-0.37.
  gnu: Add rust-gix-packetline-blocking-0.16.
  gnu: Add rust-gix-filter-0.5.
  gnu: Add rust-gix-fs-0.7.
  gnu: Add rust-gix-tempfile-10.
  gnu: Add rust-gix-lock-10.
  gnu: Add rust-gix-commitgraph-0.21.
  gnu: Add rust-gix-hashtable-0.4.
  gnu: Add rust-gix-revwalk-0.8.
  gnu: Add rust-gix-traverse-0.33.
  gnu: Add rust-gix-index-0.25.
  gnu: Add rust-gix-ignore-0.8.
  gnu: Add rust-gix-worktree-0.26.
  gnu: Add rust-gix-worktree-state-0.3.
  gnu: Add rust-gix-worktree-stream-0.5.
  gnu: rust-libtest-mimic-0.6: Update to 0.6.1.
  gnu: Add rust-gix-url-0.24
  gnu: Add rust-gix-config-value-0.14.
  gnu: Add rust-gix-prompt-0.7.
  gnu: Add rust-gix-sec-0.10.
  gnu: Add rust-gix-credentials-0.20.
  gnu: Add rust-gix-transport-0.37.
  gnu: Add rust-gix-pathspec-0.3.
  gnu: Add rust-gix-status-0.1.
  gnu: Add rust-gix-revision-0.22.
  gnu: Add rust-gix-refspec-0.18.
  gnu: Add rust-gix-ref-0.37.
  gnu: Add rust-gix-protocol-0.40.
  gnu: Add rust-gix-diff-0.36.
  gnu: Add rust-gix-pack-0.43.
  gnu: Add rust-gix-odb-0.53.
  gnu: Add rust-gix-negotiate-0.8.
  gnu: Add rust-gix-mailmap-0.19.
  gnu: Add rust-gix-macros-0.1.
  gnu: Add rust-gix-discover-0.25.
  gnu: Add rust-gix-config-0.30.
  gnu: rust-zip-0.6: Update to 0.6.6.
  gnu: Add rust-gix-archive-0.5.
  gnu: Add rust-gix-submodule-0.4.
  gnu: Add rust-gix-0.54.
  gnu: rust-caps-0.5: Update to 0.5.5.
  gnu: Add rust-nix-0.27.
  gnu: rust-ctrlc-3: Update to 3.2.5.
  gnu: Add stgit-2.

 gnu/packages/crates-io.scm       | 1783 ++++++++++++++++++++++++++----
 gnu/packages/version-control.scm |   60 +
 2 files changed, 1628 insertions(+), 215 deletions(-)


base-commit: bbec79fd55ba8efe4cb015bd07e4f40fb7d252d1
prerequisite-patch-id: bf5a485e0fa5c58fc612d3f3b3c1f964d4097d85
-- 
2.41.0

[bug#67024] [PATCH 01/54] gnu: Add rust-gix-hash-0.13.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-hash-0.13): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 606ed5aa297..8c739575e1d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30865,8 +30865,34 @@ (define-public rust-gix-glob-0.8
 matching.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-hash-0.13
+  (package
+    (name "rust-gix-hash")
+    (version "0.13.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-hash" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0q6c3jjp6q17w7879lwi7r1xw2zr489yk75yq4bm51x03sscg10q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-faster-hex" ,rust-faster-hex-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Borrowed and owned git hash digests used to identify git objects")
+    (description
+     "Borrowed and owned git hash digests used to identify git objects.  This
+package is part of Gitoxide, a pure Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-hash-0.11
   (package
+    (inherit rust-gix-hash-0.13)
     (name "rust-gix-hash")
     (version "0.11.4")
     (source
@@ -30876,19 +30902,20 @@ (define-public rust-gix-hash-0.11
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0bq986grpsfc6ddav5dlb8zvz1aky264dnnnmax2h1lsmpr2yhjb"))))
-    (build-system cargo-build-system)
+    ;(build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-document-features" ,rust-document-features-0.2)
         ("rust-hex" ,rust-hex-0.4)
         ("rust-serde" ,rust-serde-1)
         ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis
-     "Borrowed and owned git hash digests used to identify git objects")
-    (description
-     "Borrowed and owned git hash digests used to identify git objects.")
-    (license (list license:expat license:asl2.0))))
+    ;(home-page "https://github.com/Byron/gitoxide")
+    ;(synopsis
+    ; "Borrowed and owned git hash digests used to identify git objects")
+    ;(description
+    ; "Borrowed and owned git hash digests used to identify git objects.")
+    ;(license (list license:expat license:asl2.0))
+    ))
 
 (define-public rust-gix-hashtable-0.2
   (package

base-commit: bbec79fd55ba8efe4cb015bd07e4f40fb7d252d1
prerequisite-patch-id: bf5a485e0fa5c58fc612d3f3b3c1f964d4097d85
-- 
2.41.0

[bug#67024] [PATCH 02/54] gnu: Add rust-prodash-26.

[Steve George]

gnu/packages/crate-io.scm (rust-prodash-26): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8c739575e1d..78f04e11de3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -56337,8 +56337,60 @@ (define-public rust-procedural-masquerade-0.1
 @code{proc_macro_derive} pretend to be @code{proc_macro}.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-prodash-26
+  (package
+    (name "rust-prodash")
+    (version "26.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "prodash" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kxvsxyh79qz524vl0r50svga84fcax4ngpcvkf576yiwbw5njvr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-io" ,rust-async-io-1)
+                       ("rust-bytesize" ,rust-bytesize-1)
+                       ("rust-compound-duration" ,rust-compound-duration-1)
+                       ("rust-crosstermion" ,rust-crosstermion-0.11)
+                       ("rust-ctrlc" ,rust-ctrlc-3)
+                       ("rust-dashmap" ,rust-dashmap-5)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-lite" ,rust-futures-lite-1)
+                       ("rust-human-format" ,rust-human-format-1)
+                       ("rust-humantime" ,rust-humantime-2)
+                       ("rust-is-terminal" ,rust-is-terminal-0.4)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-ratatui" ,rust-ratatui-0.20)
+                       ("rust-signal-hook" ,rust-signal-hook-0.3)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-tui-react" ,rust-tui-react-0.20)
+                       ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+                       ("rust-unicode-width" ,rust-unicode-width-0.1))
+       #:cargo-development-inputs(("rust-argh" ,rust-argh-0.1) ; >0.1.3
+                                  ("rust-asyn-executor" ,rust-async-executor-1)
+                                  ("rust-async-io" ,rust-async-io-1)
+                                  ("rust-blocking" ,rust-blocking-1)
+                                  ("rust-criterion" ,rust-criterion-0.5)
+                                  ("rust-env-logger" ,rust-env-logger-0.10)
+                                  ("rust-futures" ,rust-futures-0.3)
+                                  ("rust-futures-util" ,rust-futures-util-0.3)
+                                  ("rust-is-terminal" ,rust-is-terminal-0.4)
+                                  ("rust-once-cell" ,rust-once-cell-1)
+                                  ("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/Byron/prodash")
+    (synopsis
+     "Dashboard for visualizing progress of asynchronous and possibly blocking tasks")
+    (description
+     "This package provides a dashboard for visualizing the progress of asynchronous
+and possibly blocking tasks.")
+    (license license:expat)))
+
 (define-public rust-prodash-25
   (package
+    (inherit rust-prodash-26)
     (name "rust-prodash")
     (version "25.0.2")
     (source
@@ -56348,7 +56400,6 @@ (define-public rust-prodash-25
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1xva91iks58431asnsx3lfqyr4z4fvvkrc2b582llalr411fnrqx"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-async-io" ,rust-async-io-1)
@@ -56381,14 +56432,7 @@ (define-public rust-prodash-25
         ("rust-futures-util" ,rust-futures-util-0.3)
         ("rust-is-terminal" ,rust-is-terminal-0.4)
         ("rust-once-cell" ,rust-once-cell-1)
-        ("rust-rand" ,rust-rand-0.8))))
-    (home-page "https://github.com/Byron/prodash")
-    (synopsis
-     "Dashboard for visualizing progress of asynchronous and possibly blocking tasks")
-    (description
-     "This package provides a dashboard for visualizing progress of asynchronous and
-possibly blocking tasks.")
-    (license license:expat)))
+        ("rust-rand" ,rust-rand-0.8))))))
 
 (define-public rust-progress-0.2
   (package
-- 
2.41.0

[bug#67024] [PATCH 03/54] gnu: Add rust-gix-features-0.35.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-features-0.35): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 78f04e11de3..03d9c80b633 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30776,8 +30776,49 @@ (define-public rust-gix-discover-0.19
      "Discover git repositories and check if a directory is a git repository.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-features-0.35
+  (package
+    (name "rust-gix-features")
+    (version "0.35.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-features" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1k98r3742xrlqwyaq13a9gazppm5swyx2h4hcmigg0s9mqiz97wv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #f
+       #:cargo-inputs (("rust-bytes" ,rust-bytes-1)
+                       ("rust-bytesize" ,rust-bytesize-1)
+                       ("rust-crc32fast" ,rust-crc32fast-1)
+                       ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-flate2" ,rust-flate2-1)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-trace" ,rust-gix-trace-0.1)
+                       ("rust-jwalk" ,rust-jwalk-0.8)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-prodash" ,rust-prodash-26)
+                       ("rust-sha1" ,rust-sha1-0.10)
+                       ("rust-sha1-smol" ,rust-sha1-smol-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-walkdir" ,rust-walkdir-2))
+       #:cargo-development-inputs(("rust-bstr" ,rust-bstr-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "A crate to integrate various capabilities using compile-time feature flags")
+    (description
+     "This package provides a crate to integrate various capabilities using
+compile-time feature flags.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-features-0.30
   (package
+    (inherit rust-gix-features-0.35)
     (name "rust-gix-features")
     (version "0.30.0")
     (source
@@ -30787,7 +30828,6 @@ (define-public rust-gix-features-0.30
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0543ggy5vxr2lpi1405mcq93bshj3gfvpjgf13a60q5z14s4k31s"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bytes" ,rust-bytes-1)
@@ -30807,13 +30847,7 @@ (define-public rust-gix-features-0.30
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-walkdir" ,rust-walkdir-2))
        #:cargo-development-inputs
-       (("rust-bstr" ,rust-bstr-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Integrate various capabilities using compile-time feature flags")
-    (description
-     "This package provides a crate to integrate various capabilities using
-compile-time feature flags.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-bstr" ,rust-bstr-1))))))
 
 (define-public rust-gix-fs-0.2
   (package
-- 
2.41.0

[bug#67024] [PATCH 04/54] gnu: Add rust-byteyarn-0.2.

[Steve George]

gnu/packages/crates-io.scm (rust-byteyarn-0.2): New variable.

Change-Id: I561a03a986ba90255ecb56097c12715f99b4f5cb
---
 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 03d9c80b633..38019e11d62 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10798,6 +10798,24 @@ (define-public rust-bytestring-0.1
      "This package provides a UTF-8 encoded string with Bytes as a storage.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-byteyarn-0.2
+  (package
+    (name "rust-byteyarn")
+    (version "0.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "byteyarn" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zs2r5qiqwhd6fj7bqg8ziha63sbggy5xmq6vfsan5zaq00l6lx7"))))
+    (build-system cargo-build-system)
+    (arguments `())
+    (home-page "https://github.com/mcy/byteyarn")
+    (synopsis "Hyper-compact strings")
+    (description "Hyper-compact and space efficient strings.")
+    (license license:asl2.0)))
+
 (define-public rust-bzip2-0.4
   (package
     (name "rust-bzip2")
-- 
2.41.0

[bug#67024] [PATCH 05/54] gnu: Add rust-gix-path-0.10.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-path-0.10): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 38019e11d62..006a4b25225 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31281,8 +31281,36 @@ (define-public rust-gix-packetline-0.16
 pkt-line serialization format.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-path-0.10
+  (package
+    (name "rust-gix-path")
+    (version "0.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-path" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0fx71d9p7iq4szgrijyw1nj82abg15ylyvaw7kh3l7hp2l0kf7ba"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-gix-trace" ,rust-gix-trace-0.1)
+                       ("rust-home" ,rust-home-0.5)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Part of the Gitoxide project, this crate deals with paths and their conversions")
+    (description
+     "Part of the Gitoxide project, a lean and safe Rust implementation of
+Git.  This crate deals with paths and their conversions")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-path-0.8
   (package
+    (inherit rust-gix-path-0.10)
     (name "rust-gix-path")
     (version "0.8.4")
     (source
@@ -31292,7 +31320,6 @@ (define-public rust-gix-path-0.8
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0z5733b3z2wbnz1x0y2aq3gpanrhrlrqr4v4gjlqwl68ps69qq0q"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bstr" ,rust-bstr-1)
@@ -31301,14 +31328,7 @@ (define-public rust-gix-path-0.8
         ("rust-once-cell" ,rust-once-cell-1)
         ("rust-thiserror" ,rust-thiserror-1))
        #:cargo-development-inputs
-       (("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis
-     "Crate of the gitoxide project dealing paths and their conversions")
-    (description
-     "This package provides a crate of the gitoxide project dealing paths and their
-conversions.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-gix-prompt-0.5
   (package
-- 
2.41.0

[bug#67024] [PATCH 06/54] gnu: Add rust-gix-glob-0.13.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-glob-0.13): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 006a4b25225..7d53ef9d189 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30889,6 +30889,33 @@ (define-public rust-gix-fs-0.2
 `gitoxide`.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-glob-0.13
+  (package
+    (name "rust-gix-glob")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-glob" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17dix59mc93m8z97ywkgpssjsmjgl4cfkifja7vxql8jy62nxmx9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-bstr" ,rust-bstr-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Gitoxide project crate dealing with pattern matching")
+    (description
+     "This package provides a crate of the gitoxide project dealing with pattern
+matching")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-glob-0.8
   (package
     (name "rust-gix-glob")
-- 
2.41.0

[bug#67024] [PATCH 07/54] gnu: Add rust-gix-attributes-0.19.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-attributes-0.19): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7d53ef9d189..9d128cabd8e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30485,8 +30485,40 @@ (define-public rust-gix-actor-0.21
     (description "This package provides a way to identify git actors.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-attributes-0.19
+  (package
+    (name "rust-gix-attributes")
+    (version "0.19.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-attributes" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "086qgrh8srr5vyswbchn72kw967f25szjgk27dss96vhf1g6cl94"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-byteyarn" ,rust-byteyarn-0.2)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-glob" ,rust-gix-glob-0.13)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-gix-quote" ,rust-gix-quote-0.4)
+                       ("rust-gix-trace" ,rust-gix-trace-0.1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-unicode-bom" ,rust-unicode-bom-2))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Part of Gitoxide, this crates deals with .gitattributes")
+    (description
+     "This package provides a crate from the Gitoxide project dealing with
+.gitattributes files.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-attributes-0.13
   (package
+    (inherit rust-gix-attributes-0.19)
     (name "rust-gix-attributes")
     (version "0.13.1")
     (source
@@ -30496,7 +30528,6 @@ (define-public rust-gix-attributes-0.13
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0cfciacamnqbxl02l5fb7pcfbzn6r9gnyh86gvc80brqmj89bdvq"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bstr" ,rust-bstr-1)
@@ -30509,13 +30540,7 @@ (define-public rust-gix-attributes-0.13
         ("rust-serde" ,rust-serde-1)
         ("rust-smallvec" ,rust-smallvec-1)
         ("rust-thiserror" ,rust-thiserror-1)
-        ("rust-unicode-bom" ,rust-unicode-bom-2))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Crate of the gitoxide project dealing .gitattributes files")
-    (description
-     "This package provides a crate of the gitoxide project dealing .gitattributes
-files.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-unicode-bom" ,rust-unicode-bom-2))))))
 
 (define-public rust-gix-bitmap-0.2
   (package
-- 
2.41.0

[bug#67024] [PATCH 08/54] gnu: Add rust-gix-date-0.8.

[Steve George]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9d128cabd8e..fdd9ce3fddc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30733,8 +30733,35 @@ (define-public rust-gix-credentials-0.15
 credentials helpers.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-date-0.8
+  (package
+    (name "rust-gix-date")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-date" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "038yapmv9mm7d2xclhg18iakpc4hd3vl4xkk09ydr0lmcdlzczgw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #f
+       #:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-itoa" ,rust-itoa-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-time" ,rust-time-0.3))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Part of Gitoxide, this crate parses dates the way Git does")
+    (description
+     "Part of Gitoxide, this crate parses dates the way git does.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-date-0.5
   (package
+    (inherit rust-gix-date-0.8)
     (name "rust-gix-date")
     (version "0.5.1")
     (source
@@ -30744,7 +30771,6 @@ (define-public rust-gix-date-0.5
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "00jrc86398553z2mdljx9vh8skqgdydhsrr11ak3148fcx2l25mw"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bstr" ,rust-bstr-1)
@@ -30754,13 +30780,7 @@ (define-public rust-gix-date-0.5
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-time" ,rust-time-0.3))
        #:cargo-development-inputs
-       (("rust-once-cell" ,rust-once-cell-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Parse dates the way git does")
-    (description
-     "This package provides a crate of the gitoxide project parsing dates the
-way git does.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-once-cell" ,rust-once-cell-1))))))
 
 (define-public rust-gix-diff-0.30
   (package
-- 
2.41.0

[bug#67024] [PATCH 09/54] gnu: Add rust-gix-actor-0.27.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-actor-0.27): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fdd9ce3fddc..0b2b154e7d3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30454,8 +30454,41 @@ (define-public rust-gix-0.45
     (description "Interact with git repositories just like git would.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-actor-0.27
+  (package
+    (name "rust-gix-actor")
+    (version "0.27.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-actor" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09sychqipf8bsmrwn62svpda457h8wj65qnl49qqk42j5jc0xih8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; use of undeclared crate or module `gix_testtools`
+       #:cargo-inputs
+       (("rust-bstr" ,rust-bstr-1)
+        ("rust-btoi" ,rust-btoi-0.4)
+        ("rust-document-features" ,rust-document-features-0.2)
+        ("rust-gix-date" ,rust-gix-date-0.8)
+        ("rust-gix-features" ,rust-gix-features-0.35)
+        ("rust-itoa" ,rust-itoa-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-winnow" ,rust-winnow-0.5))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Part of Gitoxide, a way to identify Git actors")
+    (description "Part of Gitoxide, a pure Rust implementation of Git.  This
+package provides a way to identify Git actors.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-actor-0.21
   (package
+    (inherit rust-gix-actor-0.27)
     (name "rust-gix-actor")
     (version "0.21.0")
     (source
@@ -30465,7 +30498,6 @@ (define-public rust-gix-actor-0.21
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0f6q1ivdcgj26jln48nl2hphwmps6sb9m4dysldvzbz1dfgkzrwz"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; use of undeclared crate or module `gix_testtools`
        #:cargo-inputs
@@ -30479,11 +30511,7 @@ (define-public rust-gix-actor-0.21
         ("rust-serde" ,rust-serde-1)
         ("rust-thiserror" ,rust-thiserror-1))
        #:cargo-development-inputs
-       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Identify git actors")
-    (description "This package provides a way to identify git actors.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))))
 
 (define-public rust-gix-attributes-0.19
   (package
-- 
2.41.0

[bug#67024] [PATCH 10/54] gnu: Add rust-gix-validate-0.8.

[Steve George]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0b2b154e7d3..0820037a4ab 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31841,8 +31841,30 @@ (define-public rust-gix-utils-0.1
 feature toggles.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-validate-0.8
+  (package
+    (name "rust-gix-validate")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-validate" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1idq44xvqjf2pxw9kxxjvi5cwklzc4wallp0arhqcnx40cmsnp70"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Rust validation functions for various kinds of names in Git")
+    (description "Part of Gitoxide, a pure Rust implementation of Git.  This
+package contains validation functions for various kinds of names in Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-validate-0.7
   (package
+    (inherit rust-gix-validate-0.8)
     (name "rust-gix-validate")
     (version "0.7.7")
     (source
@@ -31852,15 +31874,10 @@ (define-public rust-gix-validate-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0h4hr3rpgwc7ixyynjp53s9il3sb0gq8ad332k8drwyfn8vkg6xs"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bstr" ,rust-bstr-1)
-        ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Validation functions for various kinds of names in git")
-    (description "Validation functions for various kinds of names in git.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-thiserror" ,rust-thiserror-1))))))
 
 (define-public rust-gix-worktree-0.18
   (package
-- 
2.41.0

[bug#67024] [PATCH 11/54] gnu: Add rust-gix-object-0.37.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-object-0.37): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0820037a4ab..6d8f70950e8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31237,8 +31237,47 @@ (define-public rust-gix-negotiate-0.2
 negotiation algorithms.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-object-0.37
+  (package
+    (name "rust-gix-object")
+    (version "0.37.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-object" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vzxayiss5k7pmlm0q4axaliidg9a3lq7bkv2ds775k7dihijzhy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-btoi" ,rust-btoi-0.4)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-actor" ,rust-gix-actor-0.27)
+                       ("rust-gix-date" ,rust-gix-date-0.8)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-validate" ,rust-gix-validate-0.8)
+                       ("rust-itoa" ,rust-itoa-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-winnow" ,rust-winnow-0.5))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.5)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Immutable and mutable Git objects with decoding and encoding support")
+    (description
+     "Part of Gitoxide, a pure Rust Git implementation.  This package contains
+functions to handle immutable and mutable git objects with decoding and encoding
+support.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-object-0.30
   (package
+    (inherit rust-gix-object-0.37)
     (name "rust-gix-object")
     (version "0.30.0")
     (source
@@ -31248,7 +31287,6 @@ (define-public rust-gix-object-0.30
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1is6hkzcv38m9k2yzja39h3d9s5rvs9vqpfb17kw7pj43kswh9l9"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bstr" ,rust-bstr-1)
@@ -31265,13 +31303,7 @@ (define-public rust-gix-object-0.30
         ("rust-smallvec" ,rust-smallvec-1)
         ("rust-thiserror" ,rust-thiserror-1))
        #:cargo-development-inputs
-       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis
-     "Immutable and mutable git objects with decoding and encoding support")
-    (description
-     "Immutable and mutable git objects with decoding and encoding support.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))))
 
 (define-public rust-gix-odb-0.46
   (package
-- 
2.41.0

[bug#67024] [PATCH 12/54] gnu: Add rust-gix-packetline-blocking-0.16.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-packetline-blocking-0.16) New variable.

Change-Id: I73bf86d4ee95eef2b85ba9caee1dffbdaa42b155
---
 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 6d8f70950e8..ce0cd16c69c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31413,6 +31413,32 @@ (define-public rust-gix-packetline-0.16
 pkt-line serialization format.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-packetline-blocking-0.16
+  (package
+    (name "rust-gix-packetline-blocking")
+    (version "0.16.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-packetline-blocking" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0f9dr79jz9y11qhf0syxwa4nvn4czpyka84hzshxd10wa3vrb0vx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-faster-hex" ,rust-faster-hex-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Duplicate of @code{gix-packetline} with @code{blocking-io} selected")
+    (description
+     "Part of Gitoxide, a pure Rust implementation of Git. This package is a
+duplicate of @code{gix-packetline} with the @code{blocking-io} feature pre-selected")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-path-0.10
   (package
     (name "rust-gix-path")
-- 
2.41.0

[bug#67024] [PATCH 13/54] gnu: Add rust-gix-filter-0.5.

[Steve George]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ce0cd16c69c..d615f23047b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30940,6 +30940,39 @@ (define-public rust-gix-features-0.30
        #:cargo-development-inputs
        (("rust-bstr" ,rust-bstr-1))))))
 
+(define-public rust-gix-filter-0.5
+  (package
+    (name "rust-gix-filter")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-filter" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "024bv38s7q59wsp3whzpcra0x40mv53xii2jrnv5ni21rll0vr0v"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; use of undeclared crate gix_testtools
+       #:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+                       ("rust-gix-attributes" ,rust-gix-attributes-0.19)
+                       ("rust-gix-command" ,rust-gix-command-0.2)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-packetline-blocking" ,rust-gix-packetline-blocking-0.16)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-gix-quote" ,rust-gix-quote-0.4)
+                       ("rust-gix-trace" ,rust-gix-trace-0.1)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Part of Gitoxide, this package implements Git filters in Rust")
+    (description
+     "This package provides a crate from the Gitoxide project implementing
+Git filters in Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-fs-0.2
   (package
     (name "rust-gix-fs")
-- 
2.41.0

[bug#67024] [PATCH 14/54] gnu: Add rust-gix-fs-0.7.

[Steve George]

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

Change-Id: I01c7f82c81503c751158e104000d5a0a763c9061
---
 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 d615f23047b..edccb7fcc16 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30973,28 +30973,43 @@ (define-public rust-gix-filter-0.5
 Git filters in Rust.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-gix-fs-0.2
+(define-public rust-gix-fs-0.7
   (package
     (name "rust-gix-fs")
-    (version "0.2.0")
+    (version "0.7.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gix-fs" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1ddah0c5ljpfpy2ab1gmgblli2lz4bpbgghm9vwqgnwa02bqknih"))))
+        (base32 "0db6bj773ssqvy03mi28glzy963cd1aaaxcbj4nv7s9glsmmz089"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-gix-features" ,rust-gix-features-0.30))
-       #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3))))
+     `(#:cargo-inputs (("rust-gix-features" ,rust-gix-features-0.35))))
     (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "File system specific utilities to `gitoxide`")
+    (synopsis "File system utilities for Gitoxide")
     (description
-     "This package provides a crate providing file system specific utilities to
-`gitoxide`.")
+     "Gitoxide is a pure Rust implementation of Git. This package provides
+file system utilities for Gitoxide.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-fs-0.2
+  (package
+    (inherit rust-gix-fs-0.7)
+    (name "rust-gix-fs")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-fs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ddah0c5ljpfpy2ab1gmgblli2lz4bpbgghm9vwqgnwa02bqknih"))))
+    (arguments
+     `(#:cargo-inputs (("rust-gix-features" ,rust-gix-features-0.30))
+       #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-gix-glob-0.13
   (package
     (name "rust-gix-glob")
-- 
2.41.0

[bug#67024] [PATCH 15/54] gnu: Add rust-gix-tempfile-10.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-tempfile-10): New variable.

Change-Id: Ia3af5caf892860ada0dd9f5f881549b862604f43
---
 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 edccb7fcc16..11b56ab751d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31776,8 +31776,39 @@ (define-public rust-gix-sec-0.8
 trust model.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-tempfile-10
+  (package
+    (name "rust-gix-tempfile")
+    (version "10.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-tempfile" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0kdc21s0dnqnbzfdazpsw8fclnw1gi3w4np71qlmgp0i7s7rgq2s"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-dashmap" ,rust-dashmap-5)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-fs" ,rust-gix-fs-0.7)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-signal-hook" ,rust-signal-hook-0.3)
+                       ("rust-signal-hook-registry" ,rust-signal-hook-registry-1)
+                       ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Rust tempfile implementation with assured clean-up")
+    (description
+     "Part of Gitoxide a Rust implementation of Git. This package provides a
+tempfile capability with a global registry to assure clean-up.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-tempfile-6
   (package
+    (inherit rust-gix-tempfile-10)
     (name "rust-gix-tempfile")
     (version "6.0.0")
     (source
@@ -31787,7 +31818,6 @@ (define-public rust-gix-tempfile-6
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "047baclw78xkzjg04z5290x7vhcz270jpw7vdm25rp7922q5qy5k"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-dashmap" ,rust-dashmap-5)
@@ -31798,13 +31828,7 @@ (define-public rust-gix-tempfile-6
         ("rust-parking-lot" ,rust-parking-lot-0.12)
         ("rust-signal-hook" ,rust-signal-hook-0.3)
         ("rust-signal-hook-registry" ,rust-signal-hook-registry-1)
-        ("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Tempfile implementation with a global registry to assure cleanup")
-    (description
-     "This package provides a tempfile implementation with a global registry to
-assure cleanup.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-gix-trace-0.1
   (package
-- 
2.41.0

[bug#67024] [PATCH 16/54] gnu: Add rust-gix-lock-10.

[Steve George]

* gnu/packaes/crates-io.scm (rust-gix-lock-10): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 11b56ab751d..748414f30b8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31205,8 +31205,31 @@ (define-public rust-gix-index-0.17
 dedicated implementing the git index file.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-lock-10
+  (package
+    (name "rust-gix-lock")
+    (version "10.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-lock" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15dazvw49bdx60366vngmrfn69rvxf0pr411a1ak6vbbigx9dz27"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gix-tempfile" ,rust-gix-tempfile-10)
+                       ("rust-gix-utils" ,rust-gix-utils-0.1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Git style lock files implemented in Rust")
+    (description "Part of Gitoxide, a pure rust implementation of Git.  This
+package provides git style lock files.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-lock-6
   (package
+    (inherit rust-gix-lock-10)
     (name "rust-gix-lock")
     (version "6.0.0")
     (source
@@ -31216,18 +31239,13 @@ (define-public rust-gix-lock-6
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1lpqi927lacn2vz22q2mhacc4plkrlz5whm779ax65kky3kdbi9y"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-gix-tempfile" ,rust-gix-tempfile-6)
         ("rust-gix-utils" ,rust-gix-utils-0.1)
         ("rust-thiserror" ,rust-thiserror-1))
        #:cargo-development-inputs
-       (("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Git-style lock-file implementation")
-    (description "This package provides a git-style lock-file implementation.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-gix-mailmap-0.13
   (package
-- 
2.41.0

[bug#67024] [PATCH 17/54] gnu: Add rust-gix-commitgraph-0.21.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-commitgraph-0.21): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 748414f30b8..2e42323ba99 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30634,8 +30634,36 @@ (define-public rust-gix-command-0.2
 command execution.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-commitgraph-0.21
+  (package
+    (name "rust-gix-commitgraph")
+    (version "0.21.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-commitgraph" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "12nzyh8gyg0k15swsy51m1iy521a7p5xbdg9pw1a1w1cw9g9fnp7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-chunk" ,rust-gix-chunk-0.4)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-memmap2" ,rust-memmap2-0.7)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Read only access to Git the commitgraph file format")
+    (description "Part of Gitoxide, a pure Rust implementation of Git.  This
+package provides read only access to git commitgraph file.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-commitgraph-0.16
   (package
+    (inherit rust-gix-commitgraph-0.21)
     (name "rust-gix-commitgraph")
     (version "0.16.0")
     (source
@@ -30645,7 +30673,6 @@ (define-public rust-gix-commitgraph-0.16
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "028s0ai44gb9ynic2ch3ingzg8h44c47q90xlzk4fp6mnghhljg8"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bstr" ,rust-bstr-1)
@@ -30655,11 +30682,7 @@ (define-public rust-gix-commitgraph-0.16
         ("rust-gix-hash" ,rust-gix-hash-0.11)
         ("rust-memmap2" ,rust-memmap2-0.5)
         ("rust-serde" ,rust-serde-1)
-        ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Read-only access to the git commitgraph file format")
-    (description "Read-only access to the git commitgraph file format.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-thiserror" ,rust-thiserror-1))))))
 
 (define-public rust-gix-config-0.23
   (package
-- 
2.41.0

[bug#67024] [PATCH 18/54] gnu: Add rust-gix-hashtable-0.4.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-hashtable-0.4): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2e42323ba99..10dd1482c5f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31140,8 +31140,33 @@ (define-public rust-gix-hash-0.11
     ;(license (list license:expat license:asl2.0))
     ))
 
+(define-public rust-gix-hashtable-0.4
+  (package
+    (name "rust-gix-hashtable")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-hashtable" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "05ka2z2z1qcxmfw8abvc5fgvygrrjfiaaz61h6701ba11146i4j0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-hashbrown" ,rust-hashbrown-0.14)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Hashtable based data structures optimized to utilize ObjectId keys")
+    (description
+     "Hashtable based data structures optimized to utilize @code{ObjectId}
+keys. Part of Gitoxide a Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-hashtable-0.2
   (package
+    (inherit rust-gix-hashtable-0.4)
     (name "rust-gix-hashtable")
     (version "0.2.4")
     (source
@@ -31151,18 +31176,11 @@ (define-public rust-gix-hashtable-0.2
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "13f5v6vghfpzxm5xkmk86gjhsjfqng9rpam37hqjssgkxkk4qprq"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-gix-hash" ,rust-gix-hash-0.11)
         ("rust-hashbrown" ,rust-hashbrown-0.14)
-        ("rust-parking-lot" ,rust-parking-lot-0.12))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Hashtable based data structures optimized to utilize ObjectId keys")
-    (description
-     "This package provides a crate that provides hashtable based data structures
-optimized to utilize @code{ObjectId} keys.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-parking-lot" ,rust-parking-lot-0.12))))))
 
 (define-public rust-gix-ignore-0.3
   (package
-- 
2.41.0

[bug#67024] [PATCH 19/54] gnu: Add rust-gix-revwalk-0.8.

[Steve George]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 10dd1482c5f..6719eb28c18 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31780,8 +31780,37 @@ (define-public rust-gix-revision-0.15
 names for revisions and parsing specifications.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-revwalk-0.8
+  (package
+    (name "rust-gix-revwalk")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-revwalk" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0yd27ip3xhxplsw6cmyjz1vk6q5c0qhkn33icx2hiwij21mhr1z9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #f
+       #:cargo-inputs (("rust-gix-commitgraph" ,rust-gix-commitgraph-0.21)
+                       ("rust-gix-date" ,rust-gix-date-0.8)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-hashtable" ,rust-gix-hashtable-0.4)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Utilities for walking the Git's revision graph")
+    (description
+     "Utilities for walking Git's revision graph.  This crate is part of
+Gitoxide, a pure Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-revwalk-0.1
   (package
+    (inherit rust-gix-revwalk-0.8)
     (name "rust-gix-revwalk")
     (version "0.1.0")
     (source
@@ -31791,7 +31820,6 @@ (define-public rust-gix-revwalk-0.1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1jnkyb5yk8y76q5gbmdykm2snxn5v9dbc4jy3walz4a7hyx269mw"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-gix-commitgraph" ,rust-gix-commitgraph-0.16)
@@ -31799,12 +31827,7 @@ (define-public rust-gix-revwalk-0.1
         ("rust-gix-hashtable" ,rust-gix-hashtable-0.2)
         ("rust-gix-object" ,rust-gix-object-0.30)
         ("rust-smallvec" ,rust-smallvec-1)
-        ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Crate providing utilities for walking the revision graph")
-    (description "This package provides a crate providing utilities for walking
-the revision graph.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-thiserror" ,rust-thiserror-1))))))
 
 (define-public rust-gix-sec-0.8
   (package
-- 
2.41.0

[bug#67024] [PATCH 20/54] gnu: Add rust-gix-traverse-0.33.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-traverse-0.33): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6719eb28c18..53430233159 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31979,8 +31979,36 @@ (define-public rust-gix-transport-0.32
 implementing the git transport layer.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-traverse-0.33
+  (package
+    (name "rust-gix-traverse")
+    (version "0.33.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-traverse" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "180vp1piwlalsv8qkmmif03l7h2kdxfx5vawkclbmb236smh9vr2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gix-commitgraph" ,rust-gix-commitgraph-0.21)
+                       ("rust-gix-date" ,rust-gix-date-0.8)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-hashtable" ,rust-gix-hashtable-0.4)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-revwalk" ,rust-gix-revwalk-0.8)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Ways to traverse Git commit graphs and trees for Gix.")
+    (description "Part of Gitoxide, a pure Rust implementation of Git.  This
+package is used to traverse Git commit graphs and trees.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-traverse-0.26
   (package
+    (inherit rust-gix-traverse-0.33)
     (name "rust-gix-traverse")
     (version "0.26.0")
     (source
@@ -31990,17 +32018,12 @@ (define-public rust-gix-traverse-0.26
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1n9kgzw5jal2jsqb56bpaj1xp35zp2hz6nf5klrjdgxl9jc2x15h"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-gix-hash" ,rust-gix-hash-0.11)
         ("rust-gix-hashtable" ,rust-gix-hashtable-0.2)
         ("rust-gix-object" ,rust-gix-object-0.30)
-        ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Crate of the gitoxide project")
-    (description "This package provides a crate of the gitoxide project.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-thiserror" ,rust-thiserror-1))))))
 
 (define-public rust-gix-url-0.19
   (package
-- 
2.41.0

[bug#67024] [PATCH 21/54] gnu: Add rust-gix-index-0.25.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-index-0.25): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 53430233159..117ddd12402 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31208,8 +31208,50 @@ (define-public rust-gix-ignore-0.3
 .gitignore files.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-index-0.25
+  (package
+    (name "rust-gix-index")
+    (version "0.25.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-index" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1dqp5ri3kh87qgy0gxzlr0m4jki8xk5sr8zm867hh4rws6ln6kgm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       (list "--release" "--"
+             "--skip=access::tests::entry_by_path_with_conflicting_file")
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-bstr" ,rust-bstr-1)
+                       ("rust-btoi" ,rust-btoi-0.4)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-filetime" ,rust-filetime-0.2)
+                       ("rust-gix-bitmap" ,rust-gix-bitmap-0.2)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-fs" ,rust-gix-fs-0.7)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-lock" ,rust-gix-lock-10)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-traverse" ,rust-gix-traverse-0.33)
+                       ("rust-itoa" ,rust-itoa-1)
+                       ("rust-memmap2" ,rust-memmap2-0.7)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Part of Gitoxide, this crate implements the Git index file")
+    (description
+     "Part of Gitoxide, a pure Rust implementation of Rust.  This package's
+crate implements the Git index file.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-index-0.17
   (package
+    (inherit rust-gix-index-0.25)
     (name "rust-gix-index")
     (version "0.17.0")
     (source
@@ -31219,7 +31261,6 @@ (define-public rust-gix-index-0.17
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "10kvzsrn7wjgwb3y4xwj9szcg9j81mlkab04z9ii5cdzz9cajsv1"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-2)
@@ -31237,14 +31278,7 @@ (define-public rust-gix-index-0.17
         ("rust-memmap2" ,rust-memmap2-0.5)
         ("rust-serde" ,rust-serde-1)
         ("rust-smallvec" ,rust-smallvec-1)
-        ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis
-     "Crate of the gitoxide project dedicated implementing the git index file")
-    (description
-     "This package provides a work-in-progress crate of the gitoxide project
-dedicated implementing the git index file.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-thiserror" ,rust-thiserror-1))))))
 
 (define-public rust-gix-lock-10
   (package
-- 
2.41.0

[bug#67024] [PATCH 22/54] gnu: Add rust-gix-ignore-0.8.

[Steve George]

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

Change-Id: Ife70e383026bb3cc2d87c8cfff4cafa88d7acc1f
---
 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 117ddd12402..daabf287184 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31182,8 +31182,34 @@ (define-public rust-gix-hashtable-0.2
         ("rust-hashbrown" ,rust-hashbrown-0.14)
         ("rust-parking-lot" ,rust-parking-lot-0.12))))))
 
+(define-public rust-gix-ignore-0.8
+  (package
+    (name "rust-gix-ignore")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-ignore" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qzmpylhwqqnnb7hcbwfbvblbzg3hzid4d2w42j2vc7nl51z8j5h"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-glob" ,rust-gix-glob-0.13)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-unicode-bom" ,rust-unicode-bom-2))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "This Gitoxide crate handles .gitignore files")
+    (description
+     "This crate is part of Gitoxide, it handles .gitignore files.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-ignore-0.3
   (package
+    (inherit rust-gix-ignore-0.8)
     (name "rust-gix-ignore")
     (version "0.3.0")
     (source
@@ -31193,7 +31219,6 @@ (define-public rust-gix-ignore-0.3
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "09anfy62zfsclkkvvrsp0bi99pny66hqn07pvc4fik0c3887yvzw"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bstr" ,rust-bstr-1)
@@ -31201,12 +31226,7 @@ (define-public rust-gix-ignore-0.3
         ("rust-gix-glob" ,rust-gix-glob-0.8)
         ("rust-gix-path" ,rust-gix-path-0.8)
         ("rust-serde" ,rust-serde-1)
-        ("rust-unicode-bom" ,rust-unicode-bom-2))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Crate of the gitoxide project dealing .gitignore files")
-    (description "This package provides a crate of the gitoxide project dealing
-.gitignore files.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-unicode-bom" ,rust-unicode-bom-2))))))
 
 (define-public rust-gix-index-0.25
   (package
-- 
2.41.0

[bug#67024] [PATCH 23/54] gnu: Add rust-gix-worktree-0.26.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-worktree-0.26): New variable.

Change-Id: Ia82c3aef6cf29bcd038146f9d544fb3a2763a5e4
---
 gnu/packages/crates-io.scm | 43 +++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index daabf287184..0b1f36193d1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32168,8 +32168,42 @@ (define-public rust-gix-validate-0.7
        (("rust-bstr" ,rust-bstr-1)
         ("rust-thiserror" ,rust-thiserror-1))))))
 
+(define-public rust-gix-worktree-0.26
+  (package
+    (name "rust-gix-worktree")
+    (version "0.26.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-worktree" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zhl1wlf4zl0ny1mwp7j24gzln63xy2grrh9cvaq5g8152bk4plz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-attributes" ,rust-gix-attributes-0.19)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-fs" ,rust-gix-fs-0.7)
+                       ("rust-gix-glob" ,rust-gix-glob-0.13)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-ignore" ,rust-gix-ignore-0.8)
+                       ("rust-gix-index" ,rust-gix-index-0.25)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Gitoxide functions for handling shared Git worktree types and utilities")
+    (description
+     "This package provides functions for handling shared Git worktree related
+types and utilities.  Part of Gitoxide a pure Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-worktree-0.18
   (package
+    (inherit rust-gix-worktree-0.26)
     (name "rust-gix-worktree")
     (version "0.18.0")
     (source
@@ -32179,7 +32213,6 @@ (define-public rust-gix-worktree-0.18
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1xjhxw6lmjhnmcnhajaks34dnsqgg7w7lf576hkl0m485sbav26k"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bstr" ,rust-bstr-1)
@@ -32200,13 +32233,7 @@ (define-public rust-gix-worktree-0.18
        #:cargo-development-inputs
        (("rust-symlink" ,rust-symlink-0.1)
         ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-walkdir" ,rust-walkdir-2))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Shared worktree related types and utilities")
-    (description
-     "This package provides a crate of the gitoxide project for shared worktree
-related types and utilities.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-walkdir" ,rust-walkdir-2))))))
 
 (define-public rust-gjson-0.8
   (package
-- 
2.41.0

[bug#67024] [PATCH 24/54] gnu: Add rust-gix-worktree-state-0.3.

[Steve George]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0b1f36193d1..9c25d92a1e5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32235,6 +32235,39 @@ (define-public rust-gix-worktree-0.18
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-walkdir" ,rust-walkdir-2))))))
 
+(define-public rust-gix-worktree-state-0.3
+  (package
+    (name "rust-gix-worktree-state")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-worktree-state" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1bcpspxpvl8yybz8b0p64pjxb69b7kmkhsyv9jgarigjc1lv1bn3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-filter" ,rust-gix-filter-0.5)
+                       ("rust-gix-fs" ,rust-gix-fs-0.7)
+                       ("rust-gix-glob" ,rust-gix-glob-0.13)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-index" ,rust-gix-index-0.25)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-gix-worktree" ,rust-gix-worktree-0.26)
+                       ("rust-io-close" ,rust-io-close-0.3)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Gitoxide project functions that set Git's worktree to a particular state")
+    (description
+     "This package provides functions for setting the Git worktree to a particular
+state. Used by Gitoxide a pure Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gjson-0.8
   (package
     (name "rust-gjson")
-- 
2.41.0

[bug#67024] [PATCH 25/54] gnu: Add rust-gix-worktree-stream-0.5.

[Steve George]

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

Change-Id: I48bf12d15cc90952c80e4bdc373979f59c544cba
---
 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 9c25d92a1e5..5cb37674fc0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32268,6 +32268,36 @@ (define-public rust-gix-worktree-state-0.3
 state. Used by Gitoxide a pure Rust implementation of Git.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-worktree-stream-0.5
+  (package
+    (name "rust-gix-worktree-stream")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-worktree-stream" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0sbmcar5r2wrv5dacx3381ykvc06fpfsfad4dfnw6p7428xfk7y8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ; using undeclared crates gix_worktree/gix_testtools
+       #:cargo-inputs (("rust-gix-attributes" ,rust-gix-attributes-0.19)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-filter" ,rust-gix-filter-0.5)
+                       ("rust-gix-fs" ,rust-gix-fs-0.7)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-gix-traverse" ,rust-gix-traverse-0.33)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "This crate generates a byte-stream from a git-tree")
+    (description "This crate provides the ability to generate a byte-stream
+from a git-tree. It's part of Gitoxide, a pure Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gjson-0.8
   (package
     (name "rust-gjson")
-- 
2.41.0

[bug#67024] [PATCH 26/54] gnu: rust-libtest-mimic-0.6: Update to 0.6.1.

[Steve George]

* gnu/packages/crates-io.scm (rust-libtest-mimic-0.6): Update to 0.6.1.

Change-Id: I362dab1b8651191ec0487ce5dc6402520067e7e4

-- >8 -- >8
* rebuilt rust-snapbox-0.4 and rust-toml-edit-0.20 as tests

Change-Id: Ied7666960201b6da95b39c0f5f15b64c8685d208
---
 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 5cb37674fc0..327c0419cd9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41914,13 +41914,14 @@ (define-public rust-libssh2-sys-0.2
 (define-public rust-libtest-mimic-0.6
   (package
     (name "rust-libtest-mimic")
-    (version "0.6.0")
+    (version "0.6.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "libtest-mimic" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "1yipifm9fgfg6my2jj3i5wrc6ri9wqix02fys0isplb7cx8h7dnp"))))
+               (base32
+                 "1rwwdrzc5hmfisc9c3zcvnab14rgh0zfa636c2jbhv4az5qf73bd"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f              ; terse_output test fails
-- 
2.41.0

[bug#67024] [PATCH 27/54] gnu: Add rust-gix-url-0.24

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-url-0.24): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 327c0419cd9..2c96744ad7f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32079,8 +32079,40 @@ (define-public rust-gix-traverse-0.26
         ("rust-gix-object" ,rust-gix-object-0.30)
         ("rust-thiserror" ,rust-thiserror-1))))))
 
+(define-public rust-gix-url-0.24
+  (package
+    (name "rust-gix-url")
+    (version "0.24.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-url" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03s2ds2z6whd44qapyvz4kqfpniik0issv6s09rbys4cdvsfq9b1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ; undeclared crate gix_testtools
+       #:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-home" ,rust-home-0.5)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs (("rust-libtest-mimic" ,rust-libtest-mimic-0.6))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "This crate implements parsing and serialization of gix-url for Gitoxide")
+    (description
+     "This package is part of Gitoxide a Rust implementation of Git.  It
+provides a crate for parsing and serialization of gix-url's.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-url-0.19
   (package
+    (inherit rust-gix-url-0.24)
     (name "rust-gix-url")
     (version "0.19.0")
     (source
@@ -32090,7 +32122,6 @@ (define-public rust-gix-url-0.19
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0qy8shn5s8r9fjchcqrz0xwg89lsjykd463naji4f864bbr3srpi"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bstr" ,rust-bstr-1)
@@ -32100,13 +32131,7 @@ (define-public rust-gix-url-0.19
         ("rust-home" ,rust-home-0.5)
         ("rust-serde" ,rust-serde-1)
         ("rust-thiserror" ,rust-thiserror-1)
-        ("rust-url" ,rust-url-2))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Parse and serialize gix-url")
-    (description
-     "This package provides a crate of the gitoxide project implementing parsing
-and serialization of gix-url.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-url" ,rust-url-2))))))
 
 (define-public rust-gix-utils-0.1
   (package
-- 
2.41.0

[bug#67024] [PATCH 28/54] gnu: Add rust-gix-config-value-0.14.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-config-value-0.14): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2c96744ad7f..5032d4aed25 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30723,8 +30723,37 @@ (define-public rust-gix-config-0.23
 project.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-config-value-0.14
+  (package
+    (name "rust-gix-config-value")
+    (version "0.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-config-value" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0irgjzwq84rjx3qdjsb68vgdi1igp9laadcpw8rpk3jdgywhaxga"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-bstr" ,rust-bstr-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "This crate implements @code{git-config} value parsing")
+    (description
+     "This package is a crate for @code{git-config} value parsing.  Part of
+Gitoxide a Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-config-value-0.12
   (package
+    (inherit rust-gix-config-value-0.14)
     (name "rust-gix-config-value")
     (version "0.12.5")
     (source
@@ -30734,7 +30763,6 @@ (define-public rust-gix-config-value-0.12
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "15rqyj523ckas16sn0jbqpgzln4h1fcpdsnwj4lw0hbl8d0lz1vf"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-2)
@@ -30743,14 +30771,7 @@ (define-public rust-gix-config-value-0.12
         ("rust-gix-path" ,rust-gix-path-0.8)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-serde" ,rust-serde-1)
-        ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis
-     "Crate of the gitoxide project providing git-config value parsing")
-    (description
-     "This package provides a crate of the gitoxide project providing git-config
-value parsing.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-thiserror" ,rust-thiserror-1))))))
 
 (define-public rust-gix-credentials-0.15
   (package
-- 
2.41.0

[bug#67024] [PATCH 29/54] gnu: Add rust-gix-prompt-0.7.

[Steve George]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5032d4aed25..43d33a9ac3b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31670,8 +31670,37 @@ (define-public rust-gix-path-0.8
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gix-prompt-0.7
+  (package
+    (name "rust-gix-prompt")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-prompt" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0y26b3d7z222b223ir9qf8yqwhknzc3c5yksjffmwvsid4vr36jw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gix-command" ,rust-gix-command-0.2)
+                       ("rust-gix-config-value" ,rust-gix-config-value-0.14)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-rustix" ,rust-rustix-0.38)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs(("rust-expectrl" ,rust-expectrl-0.7)
+                                  ("rust-serial-test" ,rust-serial-test-2))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Handles prompts in the terminal as part of Gitoxide")
+    (description
+     "Gitoxide is a Rust implementation of Git.  This crate handles the
+terminals prompt.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-prompt-0.5
   (package
+    (inherit rust-gix-prompt-0.7)
     (name "rust-gix-prompt")
     (version "0.5.5")
     (source
@@ -31681,7 +31710,6 @@ (define-public rust-gix-prompt-0.5
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1sm5b24jpcv4whzxymk6fpb1ph1hhq6842115fpcqqx0yk5dw8ic"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-gix-command" ,rust-gix-command-0.2)
@@ -31691,14 +31719,7 @@ (define-public rust-gix-prompt-0.5
         ("rust-thiserror" ,rust-thiserror-1))
        #:cargo-development-inputs
        (("rust-expectrl" ,rust-expectrl-0.7)
-        ("rust-serial-test" ,rust-serial-test-2))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis
-     "Crate of the gitoxide project for handling prompts in the terminal")
-    (description
-     "This package provides a crate of the gitoxide project for handling prompts in
-the terminal.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-serial-test" ,rust-serial-test-2))))))
 
 (define-public rust-gix-protocol-0.33
   (package
-- 
2.41.0

[bug#67024] [PATCH 30/54] gnu: Add rust-gix-sec-0.10.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-sec-0.10): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 43d33a9ac3b..6f9ee879ec3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31925,8 +31925,34 @@ (define-public rust-gix-revwalk-0.1
         ("rust-smallvec" ,rust-smallvec-1)
         ("rust-thiserror" ,rust-thiserror-1))))))
 
+(define-public rust-gix-sec-0.10
+  (package
+    (name "rust-gix-sec")
+    (version "0.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-sec" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0a0g1b25hkgc68svxl2rx22a64d16703yyyislpc1a15q0m59fcj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-windows" ,rust-windows-0.48))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Part of Gitoxide, this create provides a shared trust model")
+    (description
+     "This package is part of Gitoxide, it implements a shared trust model.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-sec-0.8
   (package
+    (inherit rust-gix-sec-0.10)
     (name "rust-gix-sec")
     (version "0.8.4")
     (source
@@ -31936,7 +31962,6 @@ (define-public rust-gix-sec-0.8
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1iz9rcyx7lpb4gxg5gyv93ygp0n321c5xmrcjkmqm2annkbcn5cn"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-2)
@@ -31946,13 +31971,7 @@ (define-public rust-gix-sec-0.8
         ("rust-serde" ,rust-serde-1)
         ("rust-windows" ,rust-windows-0.48))
        #:cargo-development-inputs
-       (("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Providing a shared trust model")
-    (description
-     "This package provides a crate of the gitoxide project providing a shared
-trust model.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-gix-tempfile-10
   (package
-- 
2.41.0

[bug#67024] [PATCH 31/54] gnu: Add rust-gix-credentials-0.20.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-credentials-0.20): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6f9ee879ec3..2ad1c4fa162 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30773,8 +30773,41 @@ (define-public rust-gix-config-value-0.12
         ("rust-serde" ,rust-serde-1)
         ("rust-thiserror" ,rust-thiserror-1))))))
 
+(define-public rust-gix-credentials-0.20
+  (package
+    (name "rust-gix-credentials")
+    (version "0.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-credentials" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "12mwq0fah6wai26lnq9k3m71lr8cgih43rqy2in6mby59j40p426"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;wants undeclared crate gix_testtools
+       #:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-command" ,rust-gix-command-0.2)
+                       ("rust-gix-config-value" ,rust-gix-config-value-0.14)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-gix-prompt" ,rust-gix-prompt-0.7)
+                       ("rust-gix-sec" ,rust-gix-sec-0.10)
+                       ("rust-gix-url" ,rust-gix-url-0.24)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Git credentials handlers for Gitoxide")
+    (description
+     "Gitoxide is a Rust implementation of Git.  This package provides helpers
+to interact with Git credentials.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-credentials-0.15
   (package
+    (inherit rust-gix-credentials-0.20)
     (name "rust-gix-credentials")
     (version "0.15.0")
     (source
@@ -30784,7 +30817,6 @@ (define-public rust-gix-credentials-0.15
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0r8dr9d1xzfq74sg3j2bhd6zsyk3y5322155izpzaa6dibm9zy66"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; use of undeclared crate or module `gix_testtools`
        #:cargo-inputs
@@ -30797,13 +30829,7 @@ (define-public rust-gix-credentials-0.15
         ("rust-gix-sec" ,rust-gix-sec-0.8)
         ("rust-gix-url" ,rust-gix-url-0.19)
         ("rust-serde" ,rust-serde-1)
-        ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Interact with git credentials helpers")
-    (description
-     "This package provides a crate of the gitoxide project to interact with git
-credentials helpers.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-thiserror" ,rust-thiserror-1))))))
 
 (define-public rust-gix-date-0.8
   (package
-- 
2.41.0

[bug#67024] [PATCH 32/54] gnu: Add rust-gix-transport-0.37.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-transport-0.37): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2ad1c4fa162..1e466e1c25f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32076,8 +32076,54 @@ (define-public rust-gix-trace-0.1
 can be turned off to zero cost.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-transport-0.37
+  (package
+    (name "rust-gix-transport")
+    (version "0.37.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-transport" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0kpv0aqx7c3hbsc14rk7c01yd7b73mm14d4swnn6hpi4d9p75v5r"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-base64" ,rust-base64-0.21)
+        ("rust-bstr" ,rust-bstr-1)
+        ("rust-curl" ,rust-curl-0.4)
+        ("rust-document-features" ,rust-document-features-0.2)
+        ("rust-futures-io" ,rust-futures-io-0.3)
+        ("rust-futures-lite" ,rust-futures-lite-1)
+        ("rust-gix-command" ,rust-gix-command-0.2)
+        ("rust-gix-credentials" ,rust-gix-credentials-0.20)
+        ("rust-gix-features" ,rust-gix-features-0.35)
+        ("rust-gix-packetline" ,rust-gix-packetline-0.16)
+        ("rust-gix-quote" ,rust-gix-quote-0.4)
+        ("rust-gix-sec" ,rust-gix-sec-0.10)
+        ("rust-gix-url" ,rust-gix-url-0.24)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-reqwest" ,rust-reqwest-0.11)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-blocking" ,rust-blocking-1)
+        ("rust-maybe-async" ,rust-maybe-async-0.2))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Implements the Git transport layer for Gitoxide")
+    (description
+     "This package is part of Gitoxide a Rust implementation of Git. It provides an
+implementation of the Git transport layer")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-transport-0.32
   (package
+    (inherit rust-gix-transport-0.37)
     (name "rust-gix-transport")
     (version "0.32.0")
     (source
@@ -32087,7 +32133,6 @@ (define-public rust-gix-transport-0.32
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "05fzh609x4d6djizmrv5m98axinp2m5hcpk003bqw1x9v7z9z8v4"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-async-std" ,rust-async-std-1)
@@ -32112,13 +32157,7 @@ (define-public rust-gix-transport-0.32
        #:cargo-development-inputs
        (("rust-async-std" ,rust-async-std-1)
         ("rust-blocking" ,rust-blocking-1)
-        ("rust-maybe-async" ,rust-maybe-async-0.2))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Implement the git transport layer")
-    (description
-     "This package provides a crate of the gitoxide project dedicated to
-implementing the git transport layer.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-maybe-async" ,rust-maybe-async-0.2))))))
 
 (define-public rust-gix-traverse-0.33
   (package
-- 
2.41.0

[bug#67024] [PATCH 33/54] gnu: Add rust-gix-pathspec-0.3.

[Steve George]

* gnu/packages/crates-io.scm: New variable.

Change-Id: I6d3097adc108b522c76f4d18803829f959d5098f
---
 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 1e466e1c25f..cdd483292da 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31696,6 +31696,36 @@ (define-public rust-gix-path-0.8
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gix-pathspec-0.3
+  (package
+    (name "rust-gix-pathspec")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-pathspec" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zg5m586s0sxxwadlvsx9hrrkyym9d4q936kk0zyf6y58ydnrqn3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;undeclared crate gix_testtools
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-bstr" ,rust-bstr-1)
+                       ("rust-gix-attributes" ,rust-gix-attributes-0.19)
+                       ("rust-gix-config-value" ,rust-gix-config-value-0.14)
+                       ("rust-gix-glob" ,rust-gix-glob-0.13)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1)
+                                   ("rust-serial-test" ,rust-serial-test-2))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Capabilities to handle Git's pathspecs")
+    (description
+     "This package provides capabilities for handling Git's pathspecs.  It is
+part of Gitoxide, a Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-prompt-0.7
   (package
     (name "rust-gix-prompt")
-- 
2.41.0

[bug#67024] [PATCH 34/54] gnu: Add rust-gix-status-0.1.

[Steve George]

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

Change-Id: I41a3d7795b24c14da84413313e6c37b9182aa221
---
 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 cdd483292da..796b0f4ebd0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32029,6 +32029,37 @@ (define-public rust-gix-sec-0.8
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gix-status-0.1
+  (package
+    (name "rust-gix-status")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-status" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yi2wl5c1zacr5nr8qj9g7rq9ylwp2ckvkjwgd0g41x75g202a08"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-filetime" ,rust-filetime-0.2)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-fs" ,rust-gix-fs-0.7)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-index" ,rust-gix-index-0.25)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-gix-pathspec" ,rust-gix-pathspec-0.3)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Provides @code{git status} functionality")
+    (description
+     "This package provides @code{git status} functionality to Gitoxide, a
+Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-tempfile-10
   (package
     (name "rust-gix-tempfile")
-- 
2.41.0

[bug#67024] [PATCH 35/54] gnu: Add rust-gix-revision-0.22.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-revision-0.22): New variable.

Change-Id: I46ac7721d44615b1c9c951e5ea938cd639b223f1
---
 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 796b0f4ebd0..d73579a1f62 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31902,6 +31902,37 @@ (define-public rust-gix-refspec-0.11
 representing refspecs.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-revision-0.22
+  (package
+    (name "rust-gix-revision")
+    (version "0.22.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-revision" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "128fi6mblg4ic6h1q5vy2zq6vly8hxhi9vxkpkskaymby9fb3i68"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-date" ,rust-gix-date-0.8)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-hashtable" ,rust-gix-hashtable-0.4)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-revwalk" ,rust-gix-revwalk-0.8)
+                       ("rust-gix-trace" ,rust-gix-trace-0.1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "This Gitoxide crate finds names for revisions and parsing specifications")
+    (description
+     "This package is part of Gitoxide, a pure Rust implementation of Git.  It handles
+finding names and parsing specifications.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-revision-0.15
   (package
     (name "rust-gix-revision")
-- 
2.41.0

[bug#67024] [PATCH 36/54] gnu: Add rust-gix-refspec-0.18.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-refspec-0.18): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d73579a1f62..2697a4213f6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31875,8 +31875,36 @@ (define-public rust-gix-ref-0.30
     (description "This package provides a crate to handle git references.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-refspec-0.18
+  (package
+    (name "rust-gix-refspec")
+    (version "0.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-refspec" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07pniqh74kkm0n727m7wjxgrgwnaypljkhsh8nyw7wvh3rxwp588"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-revision" ,rust-gix-revision-0.22)
+                       ("rust-gix-validate" ,rust-gix-validate-0.8)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "This package provides parsing and representing refspecs to Gitoxide")
+    (description
+     "This package parses and represents Git refspecs.  It's part of Gitoxide
+a pure Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-refspec-0.11
   (package
+    (inherit rust-gix-refspec-0.18)
     (name "rust-gix-refspec")
     (version "0.11.0")
     (source
@@ -31886,7 +31914,6 @@ (define-public rust-gix-refspec-0.11
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1x0cayswa8m0yiybi8g3jimpc6jggfvrw6y53snxhvf8mciddgvj"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bstr" ,rust-bstr-1)
@@ -31894,13 +31921,7 @@ (define-public rust-gix-refspec-0.11
         ("rust-gix-revision" ,rust-gix-revision-0.15)
         ("rust-gix-validate" ,rust-gix-validate-0.7)
         ("rust-smallvec" ,rust-smallvec-1)
-        ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Parsing and representing refspecs")
-    (description
-     "This package provides a crate of the gitoxide project for parsing and
-representing refspecs.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-thiserror" ,rust-thiserror-1))))))
 
 (define-public rust-gix-revision-0.22
   (package
-- 
2.41.0

[bug#67024] [PATCH 37/54] gnu: Add rust-gix-ref-0.37.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-ref-0.37): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2697a4213f6..e2da7e7772c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31839,8 +31839,44 @@ (define-public rust-gix-quote-0.4
 quotations used by git.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-ref-0.37
+  (package
+    (name "rust-gix-ref")
+    (version "0.37.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-ref" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1r4d0zpin2c62s4j88n32cd0gf1f2da1kp4yfr0kcq8bcr4vgri2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;undeclared crate gix_testtools
+       #:cargo-inputs (("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-actor" ,rust-gix-actor-0.27)
+                       ("rust-gix-date" ,rust-gix-date-0.8)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-fs" ,rust-gix-fs-0.7)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-lock" ,rust-gix-lock-10)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-gix-tempfile" ,rust-gix-tempfile-10)
+                       ("rust-gix-validate" ,rust-gix-validate-0.8)
+                       ("rust-memmap2" ,rust-memmap2-0.7)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-winnow" ,rust-winnow-0.5))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Part of Gitoxide, this crate handles Git references")
+    (description "This package provides a crate to handle git references.
+Part of Gitoxide, a project to create a pure Rust Git implementation.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-ref-0.30
   (package
+    (inherit rust-gix-ref-0.37)
     (name "rust-gix-ref")
     (version "0.30.0")
     (source
@@ -31850,7 +31886,6 @@ (define-public rust-gix-ref-0.30
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "073y77045km55bb53ack6hzjd70mkj3rk6d8xxg8mkplas99kpgb"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; use of undeclared crate or module `gix_testtools`
        #:cargo-inputs
@@ -31869,11 +31904,7 @@ (define-public rust-gix-ref-0.30
         ("rust-serde" ,rust-serde-1)
         ("rust-thiserror" ,rust-thiserror-1))
        #:cargo-development-inputs
-       (("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Handle git references")
-    (description "This package provides a crate to handle git references.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-gix-refspec-0.18
   (package
-- 
2.41.0

[bug#67024] [PATCH 38/54] gnu: Add rust-gix-protocol-0.40.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-protocol-0.40): New variable.

Change-Id: Ia3f4697cd4a6ce7532cc2689540106e0b8d9ddac
---
 gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e2da7e7772c..e231a605802 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31777,8 +31777,44 @@ (define-public rust-gix-prompt-0.5
        (("rust-expectrl" ,rust-expectrl-0.7)
         ("rust-serial-test" ,rust-serial-test-2))))))
 
+(define-public rust-gix-protocol-0.40
+  (package
+    (name "rust-gix-protocol")
+    (version "0.40.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-protocol" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16qc5q53z5jdqb433106lzzifhf321zgv89ha65bxj8cq86p0yyc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-bstr" ,rust-bstr-1)
+                       ("rust-btoi" ,rust-btoi-0.4)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-futures-io" ,rust-futures-io-0.3)
+                       ("rust-futures-lite" ,rust-futures-lite-1)
+                       ("rust-gix-credentials" ,rust-gix-credentials-0.20)
+                       ("rust-gix-date" ,rust-gix-date-0.8)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-transport" ,rust-gix-transport-0.37)
+                       ("rust-maybe-async" ,rust-maybe-async-0.2)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-winnow" ,rust-winnow-0.5))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "An implementation of Git protocols that's part of Gitoxide")
+    (description
+     "This package implements Git protocols for Gitoxide.  Gitoxide is a pure
+Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-protocol-0.33
   (package
+    (inherit rust-gix-protocol-0.40)
     (name "rust-gix-protocol")
     (version "0.33.2")
     (source
@@ -31788,7 +31824,6 @@ (define-public rust-gix-protocol-0.33
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "093c9zlqxy8248nynyb909g12xkfxsv5z32j8w41yijwnic718cj"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-async-trait" ,rust-async-trait-0.1)
@@ -31807,13 +31842,7 @@ (define-public rust-gix-protocol-0.33
         ("rust-thiserror" ,rust-thiserror-1))
        #:cargo-development-inputs
        (("rust-async-std" ,rust-async-std-1)
-        ("rust-gix-packetline" ,rust-gix-packetline-0.16))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Crate of the gitoxide project for implementing git protocols")
-    (description
-     "This package provides a crate of the gitoxide project for implementing git
-protocols.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-gix-packetline" ,rust-gix-packetline-0.16))))))
 
 (define-public rust-gix-quote-0.4
   (package
-- 
2.41.0

[bug#67024] [PATCH 39/54] gnu: Add rust-gix-diff-0.36.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-diff-0.36): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e231a605802..41aac389b13 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30880,8 +30880,35 @@ (define-public rust-gix-date-0.5
        #:cargo-development-inputs
        (("rust-once-cell" ,rust-once-cell-1))))))
 
+(define-public rust-gix-diff-0.36
+  (package
+    (name "rust-gix-diff")
+    (version "0.36.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-diff" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "134jv0rw7v9lgci65ynq4xy85mvy9rbvpg1n3zl0d0iq5haxp3bq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-getrandom" ,rust-getrandom-0.2)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-imara-diff" ,rust-imara-diff-0.1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Calculate differences between various Git objects")
+    (description "Calculate differences between various Git objects.  Part of
+Gitoxide, a pure Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-diff-0.30
   (package
+    (inherit rust-gix-diff-0.36)
     (name "rust-gix-diff")
     (version "0.30.1")
     (source
@@ -30891,7 +30918,6 @@ (define-public rust-gix-diff-0.30
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0cqf3b2dypnd4hl1lwzj4sy8lfb6pdkbzczms95nla6chc0asach"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-getrandom" ,rust-getrandom-0.2)
@@ -30899,11 +30925,7 @@ (define-public rust-gix-diff-0.30
         ("rust-gix-object" ,rust-gix-object-0.30)
         ("rust-imara-diff" ,rust-imara-diff-0.1)
         ("rust-serde" ,rust-serde-1)
-        ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Calculate differences between various git objects")
-    (description "Calculate differences between various git objects.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-thiserror" ,rust-thiserror-1))))))
 
 (define-public rust-gix-discover-0.19
   (package
-- 
2.41.0

[bug#67024] [PATCH 40/54] gnu: Add rust-gix-pack-0.43.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-pack-0.43): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 41aac389b13..cdd8a8561da 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31572,8 +31572,47 @@ (define-public rust-gix-odb-0.46
     (description "This package implements various git object databases.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-pack-0.43
+  (package
+    (name "rust-gix-pack")
+    (version "0.43.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-pack" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1cqsxdqz6sdk1m96mpa0f33kddx1inx91gsbd72in7mk8lx20dkm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;use of undeclared create gix_testtools
+       #:cargo-inputs (("rust-clru" ,rust-clru-0.6)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-chunk" ,rust-gix-chunk-0.4)
+                       ("rust-gix-diff" ,rust-gix-diff-0.36)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-hashtable" ,rust-gix-hashtable-0.4)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-gix-tempfile" ,rust-gix-tempfile-10)
+                       ("rust-gix-traverse" ,rust-gix-traverse-0.33)
+                       ("rust-memmap2" ,rust-memmap2-0.7)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-uluru" ,rust-uluru-3))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Implements Git packs and related data structures")
+    (description
+     "Git packs and related data structures for Gitoxide.  Gitoxide is a pure
+Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-pack-0.36
   (package
+    (inherit rust-gix-pack-0.43)
     (name "rust-gix-pack")
     (version "0.36.0")
     (source
@@ -31583,7 +31622,7 @@ (define-public rust-gix-pack-0.36
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "125gs2hw111izv81zcj9i4mm503ikchbfv3xn7npw0sn675i8akx"))))
-    (build-system cargo-build-system)
+    ;(build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; use of undeclared crate or module `gix_testtools`
        #:cargo-inputs
@@ -31604,11 +31643,12 @@ (define-public rust-gix-pack-0.36
         ("rust-smallvec" ,rust-smallvec-1)
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-uluru" ,rust-uluru-3))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Implements git packs and related data structures")
-    (description
-     "This package implements git packs and related data structures.")
-    (license (list license:expat license:asl2.0))))
+    ;(home-page "https://github.com/Byron/gitoxide")
+    ;(synopsis "Implements git packs and related data structures")
+    ;(description
+    ; "This package implements git packs and related data structures.")
+    ;(license (list license:expat license:asl2.0))
+))
 
 (define-public rust-gix-packetline-0.16
   (package
-- 
2.41.0

[bug#67024] [PATCH 41/54] gnu: Add rust-gix-odb-0.53.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-odb-0.53): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cdd8a8561da..d1d8e55aadd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31535,8 +31535,41 @@ (define-public rust-gix-object-0.30
        #:cargo-development-inputs
        (("rust-pretty-assertions" ,rust-pretty-assertions-1))))))
 
+(define-public rust-gix-odb-0.53
+  (package
+    (name "rust-gix-odb")
+    (version "0.53.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-odb" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gv4zvmizqvxh4n3gnv3yzp83v3spklj0cf6rlrz38m3dcn3jsld"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-arc-swap" ,rust-arc-swap-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-date" ,rust-gix-date-0.8)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-pack" ,rust-gix-pack-0.43)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-gix-quote" ,rust-gix-quote-0.4)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-tempfile" ,rust-tempfile-3)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Implements various Git object databases")
+    (description "Implements various Git object databases for Gitoxide.
+Gitoxide is a pure Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-odb-0.46
   (package
+    (inherit rust-gix-odb-0.53)
     (name "rust-gix-odb")
     (version "0.46.0")
     (source
@@ -31546,7 +31579,6 @@ (define-public rust-gix-odb-0.46
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1wzqj6r0vgr2v0v9578s1hikg9abbh85m2vwj0psrvkqca04s8sb"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; tests not included in release
        #:cargo-inputs
@@ -31566,11 +31598,7 @@ (define-public rust-gix-odb-0.46
        (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
         ("rust-filetime" ,rust-filetime-0.2)
         ("rust-maplit" ,rust-maplit-1)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Implements various git object databases")
-    (description "This package implements various git object databases.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1))))))
 
 (define-public rust-gix-pack-0.43
   (package
-- 
2.41.0

[bug#67024] [PATCH 42/54] gnu: Add rust-gix-negotiate-0.8.

[Steve George]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d1d8e55aadd..73b74a42894 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31437,8 +31437,40 @@ (define-public rust-gix-mailmap-0.13
 parsing mailmap files.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-negotiate-0.8
+  (package
+    (name "rust-gix-negotiate")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-negotiate" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01408hs82nhj40arkdx145cfmdccf7pydf89sywd3ihik6zrf5kg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;user of undeclared crate gix_testtools
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-gix-commitgraph" ,rust-gix-commitgraph-0.21)
+                       ("rust-gix-date" ,rust-gix-date-0.8)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-revwalk" ,rust-gix-revwalk-0.8)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-odb" ,rust-gix-odb-0.53))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Implements Git's negotiation algorithms as part of Gixoxide")
+    (description
+     "Gitoxide is a pure Rust implementation of Git.  This package consists of
+Git's negotiation algorithms.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-negotiate-0.2
   (package
+    (inherit rust-gix-negotiate-0.8)
     (name "rust-gix-negotiate")
     (version "0.2.1")
     (source
@@ -31448,7 +31480,6 @@ (define-public rust-gix-negotiate-0.2
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "137hyq036adi5kapw98vd9b0087lxljfkjaz81glmr0jx7qkwp4l"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; use of undeclared crate or module `gix_testtools`
        #:cargo-inputs
@@ -31458,14 +31489,7 @@ (define-public rust-gix-negotiate-0.2
         ("rust-gix-object" ,rust-gix-object-0.30)
         ("rust-gix-revision" ,rust-gix-revision-0.15)
         ("rust-smallvec" ,rust-smallvec-1)
-        ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis
-     "Crate of the gitoxide project implementing negotiation algorithms")
-    (description
-     "This package provides a crate of the gitoxide project implementing
-negotiation algorithms.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-thiserror" ,rust-thiserror-1))))))
 
 (define-public rust-gix-object-0.37
   (package
-- 
2.41.0

[bug#67024] [PATCH 43/54] gnu: Add rust-gix-mailmap-0.19.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-mailmap-0.19): New variable.

Change-Id: Ie374558396398120647338891c898829635bdc1d
---
 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 73b74a42894..62863ba69f3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31411,8 +31411,36 @@ (define-public rust-gix-lock-6
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gix-mailmap-0.19
+  (package
+    (name "rust-gix-mailmap")
+    (version "0.19.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-mailmap" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1nx713bx8bi76h14zgg4786afpzryph16pcg43pndq19dslhzw20"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ;undeclared crate `gix_testtools`
+       #:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-actor" ,rust-gix-actor-0.27)
+                       ("rust-gix-date" ,rust-gix-date-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Functions for parsing mailmap files in Gitoxide")
+    (description
+     "This package contains functions for parsing mailmap files.  It's part of
+Gitoxide, a pure Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-mailmap-0.13
   (package
+    (inherit rust-gix-mailmap-0.19)
     (name "rust-gix-mailmap")
     (version "0.13.0")
     (source
@@ -31422,7 +31450,6 @@ (define-public rust-gix-mailmap-0.13
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0spslf6r4l51z640fxqpw2nq4j7imzz0jhxwy44y086948cp0ls6"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; use of undeclared crate or module `gix_testtools`
        #:cargo-inputs
@@ -31430,12 +31457,7 @@ (define-public rust-gix-mailmap-0.13
         ("rust-document-features" ,rust-document-features-0.2)
         ("rust-gix-actor" ,rust-gix-actor-0.21)
         ("rust-serde" ,rust-serde-1)
-        ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Crate of the gitoxide project for parsing mailmap files")
-    (description "This package provides a crate of the gitoxide project for
-parsing mailmap files.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-thiserror" ,rust-thiserror-1))))))
 
 (define-public rust-gix-negotiate-0.8
   (package
-- 
2.41.0

[bug#67024] [PATCH 44/54] gnu: Add rust-gix-macros-0.1.

[Steve George]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 62863ba69f3..889e9dcdc8e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31411,6 +31411,29 @@ (define-public rust-gix-lock-6
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gix-macros-0.1
+  (package
+    (name "rust-gix-macros")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1dhqxmj29k5b6l8y30ylkacscrzgz6ij18qr5l7mzmb8wrgcp2lx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Proc-macro utilities for gix")
+    (description "Proc-macro utilities for Gitoxide.  Gitoxide is a pure Rust
+implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-mailmap-0.19
   (package
     (name "rust-gix-mailmap")
-- 
2.41.0

[bug#67024] [PATCH 45/54] gnu: Add rust-gix-discover-0.25.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-discover-0.25): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 889e9dcdc8e..455b6771840 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30927,8 +30927,43 @@ (define-public rust-gix-diff-0.30
         ("rust-serde" ,rust-serde-1)
         ("rust-thiserror" ,rust-thiserror-1))))))
 
+(define-public rust-gix-discover-0.25
+  (package
+    (name "rust-gix-discover")
+    (version "0.25.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-discover" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cyy5yahngnh16n08n9qjp69aavxa7nkrxzw0ajaj3jssx1pcl39"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bstr" ,rust-bstr-1)
+        ("rust-dunce" ,rust-dunce-1)
+        ("rust-gix-hash" ,rust-gix-hash-0.13)
+        ("rust-gix-path" ,rust-gix-path-0.10)
+        ("rust-gix-ref" ,rust-gix-ref-0.37)
+        ("rust-gix-sec" ,rust-gix-sec-0.10)
+        ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-defer" ,rust-defer-0.1)
+        ("rust-is-ci" ,rust-is-ci-1)
+        ("rust-serial-test" ,rust-serial-test-2)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis
+     "Discover Git repositories and check if a directory is a Git repository")
+    (description
+     "Discover Git repositories and check if a directory is a repository.
+This package is part of Gitoxide, a pure Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-discover-0.19
   (package
+    (inherit rust-gix-discover-0.25)
     (name "rust-gix-discover")
     (version "0.19.0")
     (source
@@ -30938,7 +30973,6 @@ (define-public rust-gix-discover-0.19
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0ijg43psf0ijg0z7g0wwsh94c0058gg77pl1apkfzcpjs70cdadb"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bstr" ,rust-bstr-1)
@@ -30952,12 +30986,7 @@ (define-public rust-gix-discover-0.19
        (("rust-defer" ,rust-defer-0.1)
         ("rust-is-ci" ,rust-is-ci-1)
         ("rust-serial-test" ,rust-serial-test-2)
-        ("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Discover git repositories")
-    (description
-     "Discover git repositories and check if a directory is a git repository.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-gix-features-0.35
   (package
-- 
2.41.0

[bug#67024] [PATCH 46/54] gnu: Add rust-gix-config-0.30.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-config-0.30): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 455b6771840..1f4779798ac 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30684,8 +30684,47 @@ (define-public rust-gix-commitgraph-0.16
         ("rust-serde" ,rust-serde-1)
         ("rust-thiserror" ,rust-thiserror-1))))))
 
+(define-public rust-gix-config-0.30
+  (package
+    (name "rust-gix-config")
+    (version "0.30.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-config" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1dcaz3ylf2x763mjfg7jd4qhx65c8l7zqzp3g9kkyza8815m2wf1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bstr" ,rust-bstr-1)
+        ("rust-document-features" ,rust-document-features-0.2)
+        ("rust-gix-config-value" ,rust-gix-config-value-0.14)
+        ("rust-gix-features" ,rust-gix-features-0.35)
+        ("rust-gix-glob" ,rust-gix-glob-0.13)
+        ("rust-gix-path" ,rust-gix-path-0.10)
+        ("rust-gix-ref" ,rust-gix-ref-0.37)
+        ("rust-gix-sec" ,rust-gix-sec-0.10)
+        ("rust-memchr" ,rust-memchr-2)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-smallvec" ,rust-smallvec-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-unicode-bom" ,rust-unicode-bom-2)
+        ("rust-winnow" ,rust-winnow-0.5))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.5))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Git-config file parser and editor from the Gitoxide project")
+    (description
+     "A git-config file parser and editor from the Gitoxide project.  Gitoxide
+is a pure Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-config-0.23
   (package
+    (inherit rust-gix-config-0.30)
     (name "rust-gix-config")
     (version "0.23.0")
     (source
@@ -30695,7 +30734,6 @@ (define-public rust-gix-config-0.23
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0738kwxlmdp409rypczzr0ampbcvrrv2icigll68zfp118911wsi"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bstr" ,rust-bstr-1)
@@ -30715,13 +30753,7 @@ (define-public rust-gix-config-0.23
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-unicode-bom" ,rust-unicode-bom-2))
        #:cargo-development-inputs
-       (("rust-criterion" ,rust-criterion-0.4))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Git-config file parser and editor from the gitoxide project")
-    (description
-     "This package provides a git-config file parser and editor from the gitoxide
-project.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-criterion" ,rust-criterion-0.4))))))
 
 (define-public rust-gix-config-value-0.14
   (package
-- 
2.41.0

[bug#67024] [PATCH 47/54] gnu: rust-zip-0.6: Update to 0.6.6.

[Steve George]

* gnu/packages/crates-io.scm (rust-zip-0.6): Update to 0.6.6.

Change-Id: I0e6ab726961dd750e2c6fb5b73a59401351d2a0c

--- >8 ---
- rebuilt rust-android-tzdata to test
- rebuilt rust-python-pkginfo-0.5 to test
---
 gnu/packages/crates-io.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1f4779798ac..f790cb41684 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -91039,7 +91039,7 @@ (define-public rust-zeroize-derive-1
 (define-public rust-zip-0.6
   (package
     (name "rust-zip")
-    (version "0.6.4")
+    (version "0.6.6")
     (source
      (origin
        (method url-fetch)
@@ -91047,11 +91047,12 @@ (define-public rust-zip-0.6
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1vydb0v9xl6skr63r6prjs9a67hjzcdc25j3kd9r7fr4r7xx0i84"))))
+        (base32
+          "0qcjbqfvbwxi5g9wbymf2r05cvziic2qqj4xy64q3hp48vi980vn"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-aes" ,rust-aes-0.7)
+       (("rust-aes" ,rust-aes-0.8)
         ("rust-byteorder" ,rust-byteorder-1)
         ("rust-bzip2" ,rust-bzip2-0.4)
         ("rust-constant-time-eq" ,rust-constant-time-eq-0.1)
-- 
2.41.0

[bug#67024] [PATCH 48/54] gnu: Add rust-gix-archive-0.5.

[Steve George]

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

Change-Id: I6ce891db56c45d241e73755c39fee8be07c172ca
---
 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 f790cb41684..91b7685af94 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30513,6 +30513,37 @@ (define-public rust-gix-actor-0.21
        #:cargo-development-inputs
        (("rust-pretty-assertions" ,rust-pretty-assertions-1))))))
 
+(define-public rust-gix-archive-0.5
+  (package
+    (name "rust-gix-archive")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-archive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1izajfmninmjg7mvcp6y0mdy641hkvvqmsd7gp6d92mkgxgn6wdb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ; undeclared crate gix_worktree, gix_filter, gix_odb
+       #:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-flate2" ,rust-flate2-1)
+                       ("rust-gix-date" ,rust-gix-date-0.8)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-gix-worktree-stream" ,rust-gix-worktree-stream-0.5)
+                       ("rust-tar" ,rust-tar-0.4)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-zip" ,rust-zip-0.6))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Archive generation of a Git worktree")
+    (description "Archive generation of a worktree.  Part of Gitoxide a pure
+Rust implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-attributes-0.19
   (package
     (name "rust-gix-attributes")
-- 
2.41.0

[bug#67024] [PATCH 49/54] gnu: Add rust-gix-submodule-0.4.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-submoduule-0.4): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 91b7685af94..bc7b88a0b18 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32423,6 +32423,34 @@ (define-public rust-gix-status-0.1
 Rust implementation of Git.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-gix-submodule-0.4
+  (package
+    (name "rust-gix-submodule")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix-submodule" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1dz2w3ikhbf938rfamlqkmxl9hznz4i7mm9dmgrd70lj5vl500fx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;undeclared crate gix_testtools
+       #:cargo-inputs (("rust-bstr" ,rust-bstr-1)
+                       ("rust-gix-config" ,rust-gix-config-0.30)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-gix-pathspec" ,rust-gix-pathspec-0.3)
+                       ("rust-gix-refspec" ,rust-gix-refspec-0.18)
+                       ("rust-gix-url" ,rust-gix-url-0.24)
+                       ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Functions for dealing with Git submodules")
+    (description
+     "Functions for dealing with Git submodules.  Part of Gitoxide a pure Rust
+implementation of Git.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-tempfile-10
   (package
     (name "rust-gix-tempfile")
-- 
2.41.0

[bug#67024] [PATCH 50/54] gnu: Add rust-gix-0.54.

[Steve George]

* gnu/packages/crates-io.scm (rust-gix-0.54): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bc7b88a0b18..36a72b896c4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30381,8 +30381,90 @@ (define-public rust-git2-curl-0.17
         ("rust-log" ,rust-log-0.4)
         ("rust-url" ,rust-url-2))))))
 
+(define-public rust-gix-0.54
+  (package
+    (name "rust-gix")
+    (version "0.54.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gix" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ly919iq2jnb28fvac5iwqv9jqn1pr7fl63xsn89cial8kkk4vdd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1)
+                       ("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-gix-actor" ,rust-gix-actor-0.27)
+                       ("rust-gix-archive" ,rust-gix-archive-0.5)
+                       ("rust-gix-attributes" ,rust-gix-attributes-0.19)
+                       ("rust-gix-commitgraph" ,rust-gix-commitgraph-0.21)
+                       ("rust-gix-config" ,rust-gix-config-0.30)
+                       ("rust-gix-credentials" ,rust-gix-credentials-0.20)
+                       ("rust-gix-date" ,rust-gix-date-0.8)
+                       ("rust-gix-diff" ,rust-gix-diff-0.36)
+                       ("rust-gix-discover" ,rust-gix-discover-0.25)
+                       ("rust-gix-features" ,rust-gix-features-0.35)
+                       ("rust-gix-filter" ,rust-gix-filter-0.5)
+                       ("rust-gix-fs" ,rust-gix-fs-0.7)
+                       ("rust-gix-glob" ,rust-gix-glob-0.13)
+                       ("rust-gix-hash" ,rust-gix-hash-0.13)
+                       ("rust-gix-hashtable" ,rust-gix-hashtable-0.4)
+                       ("rust-gix-ignore" ,rust-gix-ignore-0.8)
+                       ("rust-gix-index" ,rust-gix-index-0.25)
+                       ("rust-gix-lock" ,rust-gix-lock-10)
+                       ("rust-gix-macros" ,rust-gix-macros-0.1)
+                       ("rust-gix-mailmap" ,rust-gix-mailmap-0.19)
+                       ("rust-gix-negotiate" ,rust-gix-negotiate-0.8)
+                       ("rust-gix-object" ,rust-gix-object-0.37)
+                       ("rust-gix-odb" ,rust-gix-odb-0.53)
+                       ("rust-gix-pack" ,rust-gix-pack-0.43)
+                       ("rust-gix-path" ,rust-gix-path-0.10)
+                       ("rust-gix-pathspec" ,rust-gix-pathspec-0.3)
+                       ("rust-gix-prompt" ,rust-gix-prompt-0.7)
+                       ("rust-gix-protocol" ,rust-gix-protocol-0.40)
+                       ("rust-gix-ref" ,rust-gix-ref-0.37)
+                       ("rust-gix-refspec" ,rust-gix-refspec-0.18)
+                       ("rust-gix-revision" ,rust-gix-revision-0.22)
+                       ("rust-gix-revwalk" ,rust-gix-revwalk-0.8)
+                       ("rust-gix-sec" ,rust-gix-sec-0.10)
+                       ("rust-gix-status" ,rust-gix-status-0.1)
+                       ("rust-gix-submodule" ,rust-gix-submodule-0.4)
+                       ("rust-gix-tempfile" ,rust-gix-tempfile-10)
+                       ("rust-gix-trace" ,rust-gix-trace-0.1)
+                       ("rust-gix-transport" ,rust-gix-transport-0.37)
+                       ("rust-gix-traverse" ,rust-gix-traverse-0.33)
+                       ("rust-gix-url" ,rust-gix-url-0.24)
+                       ("rust-gix-utils" ,rust-gix-utils-0.1)
+                       ("rust-gix-validate" ,rust-gix-validate-0.8)
+                       ("rust-gix-worktree" ,rust-gix-worktree-0.26)
+                       ("rust-gix-worktree-state" ,rust-gix-worktree-state-0.3)
+                       ("rust-gix-worktree-stream" ,rust-gix-worktree-stream-0.5)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-prodash" ,rust-prodash-26)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-reqwest" ,rust-reqwest-0.11)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-signal-hook" ,rust-signal-hook-0.3)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-unicode-normalization" ,rust-unicode-normalization-0.1))
+       #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1)
+                                   ("rust-async-std" ,rust-async-std-1)
+                                   ("rust-is-ci" ,rust-is-ci-1)
+                                   ("rust-serial-test" ,rust-serial-test-2)
+                                   ("rust-walkdir" ,rust-walkdir-2))))
+    (home-page "https://github.com/Byron/gitoxide")
+    (synopsis "Interact with Git repositories using a pure Rust implementation")
+    (description "Gitoxide is a pure Rust implementation of Git that aims to be lean
+and correct.  Interact with Git repositories just like Git would.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-gix-0.45
   (package
+    (inherit rust-gix-0.54)
     (name "rust-gix")
     (version "0.45.1")
     (source
@@ -30392,7 +30474,6 @@ (define-public rust-gix-0.45
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "10ndy5kvczbgfpv7zjqh71hl3w8lin7p3az3pard297fcvn06amz"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; Tests aren't included
        #:cargo-inputs
@@ -30448,11 +30529,7 @@ (define-public rust-gix-0.45
         ("rust-async-std" ,rust-async-std-1)
         ("rust-is-ci" ,rust-is-ci-1)
         ("rust-serial-test" ,rust-serial-test-2)
-        ("rust-walkdir" ,rust-walkdir-2))))
-    (home-page "https://github.com/Byron/gitoxide")
-    (synopsis "Interact with git repositories just like git would")
-    (description "Interact with git repositories just like git would.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-walkdir" ,rust-walkdir-2))))))
 
 (define-public rust-gix-actor-0.27
   (package
-- 
2.41.0

[bug#67024] [PATCH 51/54] gnu: rust-caps-0.5: Update to 0.5.5.

[Steve George]

* gnu/packages/crates-io.scm (rust-caps-0.5): Update to 0.5.5.

Change-Id: Iabc5465783c9c8fb2f63ffeec1255b299e5c10be

--- >8 ---
- rebuilt rust-boxxy-0.12 to test
- rebuilt rust-nix-0.24 to test
---
 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 36a72b896c4..3b1cd966b4f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11370,23 +11370,23 @@ (define-public rust-capnpc-0.13
 (define-public rust-caps-0.5
   (package
     (name "rust-caps")
-    (version "0.5.2")
+    (version "0.5.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "caps" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0h4m9s09plj85y5lb5j9hck36r8w63ifpc9s09mzi0zjvvfz5260"))))
+        (base32
+          "02vk0w48rncgvfmj2mz2kpzvdgc14z225451w7lvvkwvaansl2qr"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-errno" ,rust-errno-0.2)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-thiserror" ,rust-thiserror-1))))
     (home-page "https://github.com/lucab/caps-rs")
-    (synopsis "Pure-Rust library to work with Linux capabilities")
+    (synopsis "Pure Rust library to work with Linux capabilities")
     (description
      "This package provides a pure-Rust library to work with Linux
 capabilities.")
-- 
2.41.0

[bug#67024] [PATCH 52/54] gnu: Add rust-nix-0.27.

[Steve George]

* gnu/packages/crates-io.scm (rust-nix-0.27): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3b1cd966b4f..90c16435811 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48212,8 +48212,45 @@ (define-public rust-nitrokey-test-state-0.1
 nitrokey-test crate.")
     (license license:gpl3+)))
 
+(define-public rust-nix-0.27
+  (package
+    (name "rust-nix")
+    (version "0.27.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nix" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ly0kkmij5f0sqz35lx9czlbk6zpihb7yh1bsy4irzwfd2f4xc1f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-2)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-memoffset" ,rust-memoffset-0.9)
+        ("rust-pin-utils" ,rust-pin-utils-0.1))
+       #:cargo-development-inputs
+       (("rust-assert-impl" ,rust-assert-impl-0.1)
+        ("rust-caps" ,rust-caps-0.5)
+        ("rust-parking-lot" ,rust-parking-lot-0.12)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-semver" ,rust-semver-1)
+        ("rust-sysctl" ,rust-sysctl-0.4)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/nix-rust/nix")
+    (synopsis "Rust friendly bindings to *nix APIs")
+    (description
+      "Nix seeks to provide friendly bindings to various *nix platform APIs.
+The goal is to not provide a 100% unified interface, but to unify what can be
+while still providing platform specific APIs.")
+    (license license:expat)))
+
 (define-public rust-nix-0.26
   (package
+    (inherit rust-nix-0.27)
     (name "rust-nix")
     (version "0.26.2")
     (source
@@ -48223,7 +48260,7 @@ (define-public rust-nix-0.26
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "06lfvjhsj5zlslsg2jhijrm69npprmsh7r1667qnl7c2jv8s7pdz"))))
-    (build-system cargo-build-system)
+    ;(build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t
            #:cargo-inputs
@@ -48232,14 +48269,7 @@ (define-public rust-nix-0.26
              ("rust-libc" ,rust-libc-0.2)
              ("rust-memoffset" ,rust-memoffset-0.7)
              ("rust-pin-utils" ,rust-pin-utils-0.1)
-             ("rust-static-assertions" ,rust-static-assertions-1))))
-    (home-page "https://github.com/nix-rust/nix")
-    (synopsis "Rust friendly bindings to *nix APIs")
-    (description
-     "Nix seeks to provide friendly bindings to various *nix platform APIs.
-The goal is to not provide a 100% unified interface, but to unify what can be
-while still providing platform specific APIs.")
-    (license license:expat)))
+             ("rust-static-assertions" ,rust-static-assertions-1))))))
 
 (define-public rust-nix-0.25
   (package
-- 
2.41.0

[bug#67024] [PATCH 53/54] gnu: rust-ctrlc-3: Update to 3.2.5.

[Steve George]

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

Change-Id: I8514dcd6fa42517569990e8c3dfe6c794e3e53d6

- tested rust-boxxy
- tested rust-prodash-26

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 90c16435811..c0b00726563 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19149,22 +19149,24 @@ (define-public rust-ctr-0.6
 (define-public rust-ctrlc-3
   (package
     (name "rust-ctrlc")
-    (version "3.2.5")
+    (version "3.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "ctrlc" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0fgng4k7d3bx2q86z2djkngwss43wkrfkriswhgf9jqqlv137kxv"))))
+        (base32
+          "1pyglsl1j3b54mdgv1bkxnvgp823n11pkipxmxabh18rcaymzsc2"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-nix" ,rust-nix-0.26)
-        ("rust-windows-sys" ,rust-windows-sys-0.45))
+       (("rust-nix" ,rust-nix-0.27)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))
        #:cargo-development-inputs
-       (("rust-windows-sys" ,rust-windows-sys-0.45))))
+       (("rust-signal-hook" ,rust-signal-hook-0.3)
+        ("rust-windows-sys" ,rust-windows-sys-0.45))))
     (home-page "https://github.com/Detegr/rust-ctrlc")
     (synopsis "Easy Ctrl-C handler for Rust projects")
     (description
-- 
2.41.0

[bug#67024] [PATCH 54/54] gnu: Add stgit-2.

[Steve George]

* gnu/packages/version-control.scm (stgit-2): New variable.

Change-Id: Ic5f29a5f0e3b5caa6c2aee4daf65d7e5dc09a6d5
---
 gnu/packages/version-control.scm | 60 ++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 1cc870e3c6a..1a3fe24fe1b 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -74,6 +74,7 @@ (define-module (gnu packages version-control)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix hg-download)
+  #:use-module (guix build-system cargo)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
@@ -91,6 +92,7 @@ (define-module (gnu packages version-control)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cook)
+  #:use-module (gnu packages crates-io)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages docbook)
@@ -1517,6 +1519,64 @@ (define-public git-flow
 lot easier.")
     (license license:bsd-2)))
 
+(define-public stgit-2
+  (package
+    (name "stgit")
+    (version "2.4.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/stacked-git/stgit")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0cgv7chxqkjaqmzi4691in26j2fm8r0vanw8xzb9cqnz6350wvvj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anstyle" ,rust-anstyle-1)
+                       ("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-bstr" ,rust-bstr-1)
+                       ("rust-bzip2-rs" ,rust-bzip2-rs-0.1)
+                       ("rust-clap" ,rust-clap-4)
+                       ("rust-ctrlc" ,rust-ctrlc-3)
+                       ("rust-curl" ,rust-curl-0.4)
+                       ("rust-encoding_rs" ,rust-encoding-rs-0.8)
+                       ("rust-flate2" ,rust-flate2-1)
+                       ("rust-gix" ,rust-gix-0.54)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-is-terminal" ,rust-is-terminal-0.4)
+                       ("rust-nom" ,rust-nom-7)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-strsim" ,rust-strsim-0.10)
+                       ("rust-tar" ,rust-tar-0.4)
+                       ("rust-tempfile" ,rust-tempfile-3)
+                       ("rust-termcolor" ,rust-termcolor-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-time" ,rust-time-0.3))))
+    (native-inputs (list pkg-config))
+    (inputs (list openssl zlib curl))
+    (home-page "https://stacked-git.github.io/")
+    (synopsis "Stacked Git (StGit) manages Git commits as a stack of patches")
+    (description "StGit uses a patch stack workflow.  Each individual patch
+focuses on a single concern, while a stack of patches forms a series of commits.
+Patches are stored as normal git commits, allowing easy merging of StGit
+patches into other repositories using standard Git.
+
+Features include:
+@itemize
+@item Import and export patches from Git with @command{stg commit} and
+@command{stg uncommit}
+@item Create new patches and add them to the stack with @command{stg new}
+@item Update a patch from the working tree with @command{stg refresh} and
+@command{stg edit}
+@item See information about the stack or patch with @command{stg series} and
+@command{stg show}
+@item Export and send a series of patches by email using @command{stg email}
+@end itemize")
+    (license license:gpl2)))
+
 (define-public stgit
   (package
     (name "stgit")
-- 
2.41.0

bug#67024: [PATCH 00/54] Series to add StackedGit 2.4

[Efraim Flashner]

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

Thanks. Patches pushed 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 --]