[bug#70461] gitui-0.26.1

[bug#70461] gitui-0.26.1

[András Vöröskői]

Hi,

These patches update gitui to 0.26.1. These are against rust-team branch.

Thanks,

[bug#70461] [PATCH 01/10] gnu: rust-rayon: Update to 1.10.0.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-rayon): Update to 1.10.0.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fd87a0f8c7..9b5a531182 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60605,14 +60605,14 @@ (define-public rust-rawslice-0.1
 (define-public rust-rayon-1
   (package
     (name "rust-rayon")
-    (version "1.9.0")
+    (version "1.10.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rayon" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1gdk945j52vq3zx5vb4yzc3yyz19bf2vs8kh47pg7r46pk8kx5p4"))))
+        (base32 "1ylgnzwgllajalr4v00y4kj22klq2jbwllm70aha232iah0sc65l"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs

base-commit: 2c90e7aa2f078da27d517b2b77b61810f4513809
-- 
2.41.0

[bug#70461] [PATCH 02/10] gnu: Add rust-bcrypt-pbkdf-0.10.0.

[VÖRÖSKŐI András]

* gnu/packages/crates-crypto.scm (rust-bcrypt-pbkdf): New variable.

Change-Id: I4956528cd0538c7f68b50f58859eddf233742052
---
 gnu/packages/crates-crypto.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 2073f8fb9d..ed7344931b 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -647,6 +647,30 @@ (define-public rust-base64ct-1
 @code{no_std} support.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-bcrypt-pbkdf-0.10
+  (package
+    (name "rust-bcrypt-pbkdf")
+    (version "0.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bcrypt-pbkdf" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18pjhsy3m2v0silsp4mjzz8i92zrpqxk9b059zrnk1w8zvhw5ska"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-blowfish" ,rust-blowfish-0.9)
+                       ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-hex-literal" ,rust-hex-literal-0.3))))
+    (home-page
+     "https://github.com/RustCrypto/password-hashes/tree/master/bcrypt-pbkdf")
+    (synopsis "bcrypt-pbkdf password-based key derivation function")
+    (description "bcrypt-pbkdf password-based key derivation function")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-blake2-0.10
   (package
     (name "rust-blake2")
-- 
2.41.0

[bug#70461] [PATCH 03/10] gnu: rust-primeorder: Update to 0.13.6.

[VÖRÖSKŐI András]

* gnu/packages/crates-crypto.scm (rust-primeorder): Update to 0.13.6.

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index ed7344931b..8f3b14a2a2 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -4040,14 +4040,14 @@ (define-public rust-ppv-lite86-0.2
 (define-public rust-primeorder-0.13
   (package
     (name "rust-primeorder")
-    (version "0.13.1")
+    (version "0.13.6")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "primeorder" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1ddz0d0fzzcpdlsj6c6989va8ykf702g3zmf7dszfa0y6rski3fg"))))
+                "1rp16710mxksagcjnxqjjq9r9wf5vf72fs8wxffnvhb6i6hiqgim"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.41.0

[bug#70461] [PATCH 04/10] gnu: Add rust-p521-0.13.3.

[VÖRÖSKŐI András]

* gnu/packages/crates-crypto.scm (rust-p521): New variable.

Change-Id: I7dfd717125f0bfb05456659a50afe6b4ba758717
---
 gnu/packages/crates-crypto.scm | 35 ++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 8f3b14a2a2..bf43b48e55 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -3355,6 +3355,41 @@ (define-public rust-p384-0.13
 signing/verification, and general purpose curve arithmetic support.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-p521-0.13
+  (package
+    (name "rust-p521")
+    (version "0.13.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "p521" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1cl5y2aypa1vxg181a0na3abndz1981pfdp2zkyml88z3wbf5j8g"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-base16ct" ,rust-base16ct-0.2)
+                       ("rust-ecdsa" ,rust-ecdsa-0.16)
+                       ("rust-elliptic-curve" ,rust-elliptic-curve-0.13)
+                       ("rust-hex-literal" ,rust-hex-literal-0.4)
+                       ("rust-primeorder" ,rust-primeorder-0.13)
+                       ("rust-rand-core" ,rust-rand-core-0.6)
+                       ("rust-serdect" ,rust-serdect-0.2)
+                       ("rust-sha2" ,rust-sha2-0.10))
+       #:cargo-development-inputs (("rust-blobby" ,rust-blobby-0.3)
+                                   ("rust-ecdsa" ,rust-ecdsa-0.16)
+                                   ("rust-hex-literal" ,rust-hex-literal-0.4)
+                                   ("rust-primeorder" ,rust-primeorder-0.13)
+                                   ("rust-proptest" ,rust-proptest-1)
+                                   ("rust-rand-core" ,rust-rand-core-0.6))))
+    (home-page
+     "https://github.com/RustCrypto/elliptic-curves/tree/master/p521")
+    (synopsis "Rust implementation of the NIST P-521")
+    (description
+     "Pure Rust implementation of the NIST P-521 (a.k.a.  secp521r1) elliptic curve as
+defined in SP 800-186")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-pbkdf2-0.12
   (package
     (name "rust-pbkdf2")
-- 
2.41.0

[bug#70461] [PATCH 05/10] gnu: Add rust-ssh-encoding-0.2.0.

[VÖRÖSKŐI András]

* gnu/packages/crates-crypto.scm (rust-ssh-encoding): New variable.

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index bf43b48e55..898d9b8766 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -6174,6 +6174,31 @@ (define-public rust-spki-0.4
         (base32 "0ckgkcg6db5y94dqhmyikgn8yrsah6pyf4j197hv1c51bp0s00aw"))))
     (arguments `(#:skip-build? #t #:cargo-inputs (("rust-der" ,rust-der-0.4))))))
 
+(define-public rust-ssh-encoding-0.2
+  (package
+    (name "rust-ssh-encoding")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ssh-encoding" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "05aavlhk68vm60vbw8lcgx1p5wry367ck8niij7af221xywl54pb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-base64ct" ,rust-base64ct-1)
+                       ("rust-bytes" ,rust-bytes-1)
+                       ("rust-pem-rfc7468" ,rust-pem-rfc7468-0.7)
+                       ("rust-sha2" ,rust-sha2-0.10))
+       #:cargo-development-inputs
+          (("rust-hex-literal", rust-hex-literal-0.4))))
+    (home-page "https://github.com/RustCrypto/SSH/tree/master/ssh-encoding")
+    (synopsis "Rust implementation of SSH data types as described in RFC4251")
+    (description
+     "Pure Rust implementation of SSH data type decoders/encoders as described in
+RFC4251.")
+    (license (list license:asl2.0 license:expat))))
 (define-public rust-stream-cipher-0.4
   (package
     (name "rust-stream-cipher")
-- 
2.41.0

[bug#70461] [PATCH 06/10] gnu: Add rust-ssh-cipher-0.2.0.

[VÖRÖSKŐI András]

* gnu/packages/crates-crypto.scm (rust-ssh-cipher): New variable.

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 898d9b8766..1e52f72ca5 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -6174,6 +6174,39 @@ (define-public rust-spki-0.4
         (base32 "0ckgkcg6db5y94dqhmyikgn8yrsah6pyf4j197hv1c51bp0s00aw"))))
     (arguments `(#:skip-build? #t #:cargo-inputs (("rust-der" ,rust-der-0.4))))))
 
+(define-public rust-ssh-cipher-0.2
+  (package
+    (name "rust-ssh-cipher")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ssh-cipher" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0kvq113x9fcy2jcxp00xk472zxm8d9zxxz2vyqx3rlzh88ki7b6a"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-aes" ,rust-aes-0.8)
+                       ("rust-aes-gcm" ,rust-aes-gcm-0.10)
+                       ("rust-cbc" ,rust-cbc-0.1)
+                       ("rust-chacha20" ,rust-chacha20-0.9)
+                       ("rust-cipher" ,rust-cipher-0.4)
+                       ("rust-ctr" ,rust-ctr-0.9)
+                       ("rust-des" ,rust-des-0.8)
+                       ("rust-poly1305" ,rust-poly1305-0.8)
+                       ("rust-ssh-encoding" ,rust-ssh-encoding-0.2)
+                       ("rust-subtle" ,rust-subtle-2))))
+    (home-page "https://github.com/RustCrypto/SSH/tree/master/ssh-cipher")
+    (synopsis
+     "Rust implementation of SSH symmetric encryption")
+    (description
+     "Pure Rust implementation of SSH symmetric encryption including support for the
+modern aes128, aes256 and chacha20-poly1305 algorithms as well as legacy support for older
+ciphers.  Built on the pure Rust cryptography implementations maintained by the
+@code{RustCrypto} organization.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-ssh-encoding-0.2
   (package
     (name "rust-ssh-encoding")
-- 
2.41.0

[bug#70461] [PATCH 07/10] gnu: Add rust-ssh-key-0.6.6.

[VÖRÖSKŐI András]

* gnu/packages/crates-crypto.scm (rust-ssh-key-0.6): New variable.

Change-Id: I4ce4c4439cb28de053c21bccc0b214ec79ec8747
---
 gnu/packages/crates-crypto.scm | 44 ++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 1e52f72ca5..d0308c276c 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -6232,6 +6232,50 @@ (define-public rust-ssh-encoding-0.2
      "Pure Rust implementation of SSH data type decoders/encoders as described in
 RFC4251.")
     (license (list license:asl2.0 license:expat))))
+
+(define-public rust-ssh-key-0.6
+  (package
+    (name "rust-ssh-key")
+    (version "0.6.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ssh-key" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1z5sxiv5qk0ld9k3zhy0m1063d5zmq84vkzl0rjbn66gh1m3d6ya"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bcrypt-pbkdf" ,rust-bcrypt-pbkdf-0.10)
+                       ("rust-dsa" ,rust-dsa-0.6)
+                       ("rust-ed25519-dalek" ,rust-ed25519-dalek-2)
+                       ("rust-num-bigint-dig" ,rust-num-bigint-dig-0.8)
+                       ("rust-p256" ,rust-p256-0.13)
+                       ("rust-p384" ,rust-p384-0.13)
+                       ("rust-p521" ,rust-p521-0.13)
+                       ("rust-rand-core" ,rust-rand-core-0.6)
+                       ("rust-rsa" ,rust-rsa-0.9)
+                       ("rust-sec1" ,rust-sec1-0.7)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sha1" ,rust-sha1-0.10)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-signature" ,rust-signature-2)
+                       ("rust-ssh-cipher" ,rust-ssh-cipher-0.2)
+                       ("rust-ssh-encoding" ,rust-ssh-encoding-0.2)
+                       ("rust-subtle" ,rust-subtle-2)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-hex-literal" ,rust-hex-literal-0.4)
+                                   ("rust-rand-chacha" ,rust-rand-chacha-0.3))))
+    (home-page "https://github.com/RustCrypto/SSH/tree/master/ssh-key")
+    (synopsis "Pure Rust implementation of SSH key file format")
+    (description
+     "Pure Rust implementation of SSH key file format decoders/encoders as described
+in RFC4251/RFC4253 and @code{OpenSSH} key formats, as well as @code{sshsig}
+signatures and certificates (including certificate validation and certificate
+authority support), with further support for the @code{authorized_keys} and
+@code{known_hosts} file formats.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-stream-cipher-0.4
   (package
     (name "rust-stream-cipher")
-- 
2.41.0

[bug#70461] [PATCH 08/10] gnu: Add rust-asyncgit-0.26.0.

[VÖRÖSKŐI András]

* gnu/packages/crates-vcs.scm (rust-asyncgit-0.26): New variable.

Change-Id: I0c28e7159aa6cc58bc83af684801e8e09cbc12c5
---
 gnu/packages/crates-vcs.scm | 48 +++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/gnu/packages/crates-vcs.scm b/gnu/packages/crates-vcs.scm
index f7461f4441..d55f0b1922 100644
--- a/gnu/packages/crates-vcs.scm
+++ b/gnu/packages/crates-vcs.scm
@@ -44,6 +44,54 @@ (define-module (gnu packages crates-vcs)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control))
 
+(define-public rust-asyncgit-0.26
+  (package
+    (name "rust-asyncgit")
+    (version "0.26.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "asyncgit" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0q5pbfnsysaqvrhyzj6c4xdhc1702dn7nq0v2js06a99anlhgn60"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--release" "--"
+                            "--skip" "reject_in_subfolder"      ; /bin/sh
+                            "--skip" "test_pre_commit_workdir"  ; /bin/sh
+                            "--skip" "sync::submodules::tests::test_smoke") ; network
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
+                       ("rust-dirs" ,rust-dirs-5)
+                       ("rust-easy-cast" ,rust-easy-cast-0.5)
+                       ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3)
+                       ("rust-git2" ,rust-git2-0.18)
+                       ("rust-git2-hooks" ,rust-git2-hooks-0.3)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-rayon" ,rust-rayon-1)
+                       ("rust-rayon-core" ,rust-rayon-core-1)
+                       ("rust-scopetime" ,rust-scopetime-0.1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-ssh-key" ,rust-ssh-key-0.6)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-unicode-truncate" ,rust-unicode-truncate-0.2)
+                       ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.11)
+        ("rust-invalidstring" ,rust-invalidstring-0.1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-serial-test" ,rust-serial-test-3)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (native-inputs (list pkg-config git-minimal))
+    (inputs (list libgit2-1.7 libssh2 openssl zlib))
+    (home-page "https://github.com/extrawurst/gitui")
+    (synopsis "Use git2 in an asynchronous context")
+    (description
+     "This package provides for using git2 in an asynchronous context.")
+    (license license:expat)))
+
 (define-public rust-asyncgit-0.25
   (package
     (name "rust-asyncgit")
-- 
2.41.0

[bug#70461] [PATCH 09/10] gnu: Add rust-two-face-0.3.0.

[VÖRÖSKŐI András]

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

Change-Id: I50c654f5020c314074b16f09c44d95674e4931c1
---
 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 9b5a531182..f3b48ee0a5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -84104,6 +84104,29 @@ (define-public rust-tun-tap-0.1
     (description "This package provides a TUN/TAP interface wrapper.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-two-face-0.3
+  (package
+    (name "rust-two-face")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "two-face" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ssydfj3cdjf28pmy84wjhayp5s66xnr0b57zgpcfn94bc9x5gip"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-syntect" ,rust-syntect-5))
+       #:cargo-development-inputs (("rust-strum" ,rust-strum-0.25)
+                                   ("rust-syntect" ,rust-syntect-5))))
+    (home-page "https://github.com/CosmicHorrorDev/two-face")
+    (synopsis "Extra syntax and theme definitions for syntect")
+    (description "Extra syntax and theme definitions for syntect")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-twoway-0.2
   (package
     (name "rust-twoway")
-- 
2.41.0

[bug#70461] [PATCH 10/10] gnu: gitui: Update to 0.26.1.

[VÖRÖSKŐI András]

* gnu/packages/rust-apps.scm (gitui): Update to 0.26.1.

Change-Id: Ie3fa21bf9ce8d2ee78b48f38d8e67b66eb379fad
---
 gnu/packages/rust-apps.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 8da7b827e7..b6255ead83 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -735,14 +735,14 @@ (define-public fd
 (define-public gitui
   (package
     (name "gitui")
-    (version "0.25.2")
+    (version "0.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gitui" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "19xv6bvp0hs1m5y8a0myifvh8xrxrv14wd4gknlsrka0l7d8ijg7"))))
+        (base32 "1b6w033w92gj2c9a16bxkf9pzld7kpzm359z8aphbz05bs26nwma"))))
     (build-system cargo-build-system)
     (arguments
      `(;; disable vendor-openssl from default flags
@@ -769,7 +769,7 @@ (define-public gitui
                           "--no-default-features"
                           "--features" (string-join features))))))
        #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
-                       ("rust-asyncgit" ,rust-asyncgit-0.25)
+                       ("rust-asyncgit" ,rust-asyncgit-0.26)
                        ("rust-backtrace" ,rust-backtrace-0.3)
                        ("rust-bitflags" ,rust-bitflags-2)
                        ("rust-bugreport" ,rust-bugreport-0.5)
@@ -801,6 +801,7 @@ (define-public gitui
                        ("rust-struct-patch" ,rust-struct-patch-0.4)
                        ("rust-syntect" ,rust-syntect-5)
                        ("rust-tui-textarea" ,rust-tui-textarea-0.4)
+                       ("rust-two-face" ,rust-two-face-0.3)
                        ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
                        ("rust-unicode-truncate" ,rust-unicode-truncate-0.2)
                        ("rust-unicode-width" ,rust-unicode-width-0.1)
@@ -808,7 +809,7 @@ (define-public gitui
        #:cargo-development-inputs
        (("rust-pretty-assertions" ,rust-pretty-assertions-1)
         ("rust-tempfile" ,rust-tempfile-3))))
-    (native-inputs (list pkg-config))
+    (native-inputs (list pkg-config git-minimal))
     (inputs (list libgit2-1.7 libssh2 openssl zlib))
     (home-page "https://github.com/extrawurst/gitui")
     (synopsis "Terminal UI for git")
-- 
2.41.0

[bug#70461] [PATCH 1/9] gnu: rust-insta: Update to 1.39.0.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-insta): Update to 1.39.0.

Change-Id: Ia048fe9d5a3e34d8efae680233072ead892457f9
---
 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 f3b48ee0a5..ac827e3b05 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34036,14 +34036,14 @@ (define-public rust-inout-0.1
 (define-public rust-insta-1
   (package
     (name "rust-insta")
-    (version "1.34.0")
+    (version "1.39.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "insta" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1z7v6mzm1djv9sn1k9j796xl2i3llwzj82klcz1cybsbwc5n0r2x"))
+        (base32 "1xd64139vi0hrxs8l8k3r1xqf2x8b0x5chsh47lwkqj85l2fc2l1"))
        (modules '((guix build utils)))
        (snippet
         '(begin (substitute* "Cargo.toml"
@@ -34067,10 +34067,10 @@ (define-public rust-insta-1
         ("rust-serde" ,rust-serde-1)
         ("rust-similar" ,rust-similar-2)
         ("rust-toml" ,rust-toml-0.5)
-        ("rust-walkdir" ,rust-walkdir-2)
-        ("rust-yaml-rust" ,rust-yaml-rust-0.4))
+        ("rust-walkdir" ,rust-walkdir-2))
        #:cargo-development-inputs
-       (("rust-serde" ,rust-serde-1)
+       (("rust-rustc-version" ,rust-rustc-version-0.4)
+        ("rust-serde" ,rust-serde-1)
         ("rust-similar-asserts" ,rust-similar-asserts-1))))
     (home-page "https://insta.rs/")
     (synopsis "Snapshot testing library for Rust")

base-commit: 2c90e7aa2f078da27d517b2b77b61810f4513809
prerequisite-patch-id: c368f06e2e1578ce969b050720f286c616d44e55
prerequisite-patch-id: 7825cb21526f679b8722ff2546b86ebe3d225e5d
prerequisite-patch-id: 16ba8d9da101f35a63509fa6fe1bb7196353af1d
prerequisite-patch-id: 4ea3b6a9acaedfc3e9c43dc535aeafa384013c75
prerequisite-patch-id: 30fcf0d2013883ed27cd839d7ce6f1484b18ea5f
prerequisite-patch-id: 21a6980398a615898006800c2f8879c978918d22
prerequisite-patch-id: 3612ec67b73325da9cdc47c3e6aa7a3db784a238
prerequisite-patch-id: 1fd8d934f2281fbd0a5d237db552c4d0be1f1a8f
prerequisite-patch-id: d92155a725cccc34367c972494bb8129dd7ee06f
prerequisite-patch-id: 3525df80a6d55c4cc822068781140ba78a0ac71d
-- 
2.41.0

[bug#70461] [PATCH 2/9] gnu: Add rust-two-face-0.4.0.

[VÖRÖSKŐI András]

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ac827e3b05..7dbaff252a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -84104,6 +84104,30 @@ (define-public rust-tun-tap-0.1
     (description "This package provides a TUN/TAP interface wrapper.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-two-face-0.4
+  (package
+    (name "rust-two-face")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "two-face" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0s225f05v590wk13qnkkky5asyv5x40awv61x6gn0703x91lik8c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-syntect" ,rust-syntect-5))
+       #:cargo-development-inputs (("rust-insta" ,rust-insta-1)
+                                   ("rust-strum" ,rust-strum-0.25)
+                                   ("rust-syntect" ,rust-syntect-5))))
+    (home-page "https://github.com/CosmicHorrorDev/two-face")
+    (synopsis "Extra syntax and theme definitions for syntect")
+    (description "Extra syntax and theme definitions for syntect")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-two-face-0.3
   (package
     (name "rust-two-face")
-- 
2.41.0

[bug#70461] [PATCH 3/9] gnu: Add rust-unicode-truncate-1.0.0.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-unicode-truncate-1): New variable.

Change-Id: I872422030d4d3c75683c09f59ad8d0f231303a5f
---
 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 7dbaff252a..28d3367882 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -85516,6 +85516,29 @@ (define-public rust-unicode-segmentation-1
 boundaries according to Unicode Standard Annex #29 rules.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-unicode-truncate-1
+  (package
+    (name "rust-unicode-truncate")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "unicode-truncate" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09lj06lqj408gzs0509aivy5lywjm7yvwkbiiihjqdmyvazblpss"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-itertools" ,rust-itertools-0.12)
+                       ("rust-unicode-width" ,rust-unicode-width-0.1))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5))))
+    (home-page "https://github.com/Aetf/unicode-truncate")
+    (synopsis "Unicode-aware `str` truncate")
+    (description
+     "This package provides a unicode-aware algorithm to pad or truncate `str`
+in terms of displayed width.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-unicode-truncate-0.2
   (package
     (name "rust-unicode-truncate")
-- 
2.41.0

[bug#70461] [PATCH 4/9] gnu: rust-tokio: Update to 1.37.0.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-tokio): Update to 1.37.0.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 28d3367882..b53346b95b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80304,14 +80304,14 @@ (define-public rust-tobj-2
 (define-public rust-tokio-1
   (package
     (name "rust-tokio")
-    (version "1.36.0")
+    (version "1.37.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tokio" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0c89p36zbd4abr1z3l5mipp43x7z4c9b4vp4s6r8y0gs2mjmya31"))))
+        (base32 "11v7qhvpwsf976frqgrjl1jy308bdkxq195gb38cypx7xkzypnqs"))))
     (build-system cargo-build-system)
     (arguments
      (list #:tests? #f  ; unresolved imports `crate::runtime::task`
-- 
2.41.0

[bug#70461] [PATCH 5/9] gnu: Add rust-sdd-0.2.0.

[VÖRÖSKŐI András]

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

Change-Id: Iae0894e2e53fb27ab3d0e40831d43560f8cf7f9f
---
 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 b53346b95b..ec99517454 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67188,6 +67188,29 @@ (define-public rust-sd-notify-0.3
        (sha256
         (base32 "1j1ff6hhzcyh3m9c0adxnnjrasnvl1v6qaiv5vj2zgajz0hqml0c"))))))
 
+(define-public rust-sdd-0.2
+  (package
+    (name "rust-sdd")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sdd" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "179h2b27wmv6jbfs3yldwhmn3dwrmb581yw2l1s34w5xr7j4ahxq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5)
+                                   ("rust-futures" ,rust-futures-0.3)
+                                   ("rust-loom" ,rust-loom-0.7)
+                                   ("rust-static-assertions" ,rust-static-assertions-1)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/wvwwvwwv/scalable-delayed-dealloc/")
+    (synopsis "Scalable lock-free memory reclaimer")
+    (description "Scalable lock-free memory reclaimer")
+    (license license:asl2.0)))
+
 (define-public rust-seahash-3
   (package
     (name "rust-seahash")
-- 
2.41.0

[bug#70461] [PATCH 6/9] gnu: Add rust-scc-2.1.1.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-scc-2): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ec99517454..215a9921ea 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66495,6 +66495,35 @@ (define-public rust-scan-fmt-0.2
     (description "This package provides a simple scanf()-like input for Rust.")
     (license license:expat)))
 
+(define-public rust-scc-2
+  (package
+    (name "rust-scc")
+    (version "2.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "scc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1p7gldp08856ny4pjl2c39ala07xnmxfvwm6nw3hl4751axjpbbn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-sdd" ,rust-sdd-0.2)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5)
+                                   ("rust-futures" ,rust-futures-0.3)
+                                   ("rust-proptest" ,rust-proptest-1)
+                                   ("rust-rand" ,rust-rand-0.8)
+                                   ("rust-serde-test" ,rust-serde-test-1)
+                                   ("rust-static-assertions" ,rust-static-assertions-1)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/wvwwvwwv/scalable-concurrent-containers/")
+    (synopsis "containers utilities concurrent asynchronous programming")
+    (description
+     "High performance containers and utilities for concurrent and asynchronous
+programming")
+    (license license:asl2.0)))
+
 (define-public rust-sce-0.1
   (package
     (name "rust-sce")
-- 
2.41.0

[bug#70461] [PATCH 7/9] gnu: rust-serial-test: Update to 3.1.1.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-serial-test): Update to 3.1.1.
* gnu/packages/crates-io.scm (rust-serial-test-derive): Update to 3.1.1.

Change-Id: I6e9f9f120a43a5a1e79f60a99d3fad3f5f7b6b25
---
 gnu/packages/crates-io.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 215a9921ea..ac5914fe5b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -69161,23 +69161,24 @@ (define-public rust-serde-wasm-bindgen-0.3
 (define-public rust-serial-test-3
   (package
     (name "rust-serial-test")
-    (version "3.0.0")
+    (version "3.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serial_test" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1381b9z83a0a39sx0jrrf1q91m08s1yhjp648g5sgb1s5csdjflm"))))
+        (base32 "0zfpzr8jl7dpf4m8dk8fr9w1wfwhnjrccmyg46h41wmcw9zlhjsb"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-dashmap" ,rust-dashmap-5)
-                       ("rust-document-features" ,rust-document-features-0.2)
+     `(#:cargo-inputs (("rust-document-features" ,rust-document-features-0.2)
+                       ("rust-env-logger" ,rust-env-logger-0.10)
                        ("rust-fslock" ,rust-fslock-0.2)
                        ("rust-futures" ,rust-futures-0.3)
-                       ("rust-lazy-static" ,rust-lazy-static-1)
                        ("rust-log" ,rust-log-0.4)
+                       ("rust-once-cell" ,rust-once-cell-1)
                        ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-scc" ,rust-scc-2)
                        ("rust-serial-test-derive" ,rust-serial-test-derive-3))
        #:cargo-development-inputs (("rust-itertools" ,rust-itertools-0.10)
                                    ("rust-tokio" ,rust-tokio-1))))
@@ -69321,14 +69322,14 @@ (define-public rust-serial-test-0.1
 (define-public rust-serial-test-derive-3
   (package
     (name "rust-serial-test-derive")
-    (version "3.0.0")
+    (version "3.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serial_test_derive" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "04i240k9ml91nz2knj2qxaksm6qnqj65xm7p8wdsq880qynv8gxr"))))
+        (base32 "0rrx13r2kdahbgs9qfvbx63zgzafrjjpiq42vsy1zvxw4nrrvzl2"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
-- 
2.41.0

[bug#70461] [PATCH 8/9] gnu: rust-asyncgit: Update to 0.26.2.

[VÖRÖSKŐI András]

* gnu/packages/crates-vcs.scm (rust-asyncgit): Update to 0.26.2.

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

diff --git a/gnu/packages/crates-vcs.scm b/gnu/packages/crates-vcs.scm
index d55f0b1922..660dff62a4 100644
--- a/gnu/packages/crates-vcs.scm
+++ b/gnu/packages/crates-vcs.scm
@@ -47,14 +47,14 @@ (define-module (gnu packages crates-vcs)
 (define-public rust-asyncgit-0.26
   (package
     (name "rust-asyncgit")
-    (version "0.26.0")
+    (version "0.26.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "asyncgit" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0q5pbfnsysaqvrhyzj6c4xdhc1702dn7nq0v2js06a99anlhgn60"))))
+        (base32 "1nfk7idivxzgv75kg1l09v3msrhm7ckkjgfhcn2ry43cg73wy74l"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags '("--release" "--"
@@ -76,7 +76,7 @@ (define-public rust-asyncgit-0.26
                        ("rust-serde" ,rust-serde-1)
                        ("rust-ssh-key" ,rust-ssh-key-0.6)
                        ("rust-thiserror" ,rust-thiserror-1)
-                       ("rust-unicode-truncate" ,rust-unicode-truncate-0.2)
+                       ("rust-unicode-truncate" ,rust-unicode-truncate-1)
                        ("rust-url" ,rust-url-2))
        #:cargo-development-inputs
        (("rust-env-logger" ,rust-env-logger-0.11)
-- 
2.41.0

[bug#70461] [PATCH 9/9] gnu: gitui: Update to 0.26.2.

[VÖRÖSKŐI András]

* gnu/packages/rust-apps.scm (gitui): Update to 0.26.2.

Change-Id: I38a80442510c6acb96b505e7af294035e1aaa677
---
 gnu/packages/rust-apps.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index b6255ead83..e8587f1b61 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -735,14 +735,14 @@ (define-public fd
 (define-public gitui
   (package
     (name "gitui")
-    (version "0.26.1")
+    (version "0.26.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gitui" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1b6w033w92gj2c9a16bxkf9pzld7kpzm359z8aphbz05bs26nwma"))))
+        (base32 "0743pb70h23mfsdca7nc27rsy5ad5sfs2mysazkc9smrfpqzlqg0"))))
     (build-system cargo-build-system)
     (arguments
      `(;; disable vendor-openssl from default flags
@@ -790,7 +790,7 @@ (define-public gitui
                        ("rust-notify" ,rust-notify-6)
                        ("rust-notify-debouncer-mini" ,rust-notify-debouncer-mini-0.4)
                        ("rust-once-cell" ,rust-once-cell-1)
-                       ("rust-ratatui" ,rust-ratatui-0.24)
+                       ("rust-ratatui" ,rust-ratatui-0.26)
                        ("rust-rayon-core" ,rust-rayon-core-1)
                        ("rust-ron" ,rust-ron-0.8)
                        ("rust-scopeguard" ,rust-scopeguard-1)
@@ -801,13 +801,14 @@ (define-public gitui
                        ("rust-struct-patch" ,rust-struct-patch-0.4)
                        ("rust-syntect" ,rust-syntect-5)
                        ("rust-tui-textarea" ,rust-tui-textarea-0.4)
-                       ("rust-two-face" ,rust-two-face-0.3)
+                       ("rust-two-face" ,rust-two-face-0.4)
                        ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
-                       ("rust-unicode-truncate" ,rust-unicode-truncate-0.2)
+                       ("rust-unicode-truncate" ,rust-unicode-truncate-1)
                        ("rust-unicode-width" ,rust-unicode-width-0.1)
                        ("rust-which" ,rust-which-6))
        #:cargo-development-inputs
-       (("rust-pretty-assertions" ,rust-pretty-assertions-1)
+       (("rust-env-logger" ,rust-env-logger-0.11)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
         ("rust-tempfile" ,rust-tempfile-3))))
     (native-inputs (list pkg-config git-minimal))
     (inputs (list libgit2-1.7 libssh2 openssl zlib))
-- 
2.41.0