[bug#66805] [PATCH 00/22] gnu: rust-apps: Add eza.

[bug#66805] [PATCH 00/22] gnu: rust-apps: Add eza.

[Jaeme Sifat via Guix-patches via]

exa is unmaintained, eza has stepped up to be its replacement.

Jaeme Sifat (22):
  gnu: Add rust-uzers-0.11.
  gnu: Add rust-uutils-term-grid-0.3.
  gnu: Add rust-isolang-2.
  gnu: Add rust-timeago-0.4.
  gnu: Add rust-terminal-size-0.3.
  gnu: Add rust-partition-identity-0.3.
  gnu: Add rust-proc-mounts-0.3.
  gnu: rust-phf-shared-0.11: Update to 0.11.2.
  gnu: rust-phf-macros-0.11: Update to 0.11.2.
  gnu: rust-phf-0.11: Update to 0.11.2.
  gnu: rust-num-cpus-1: Update to 1.16.0.
  gnu: Add rust-libssh2-sys-0.3.
  gnu: Add rust-libgit2-sys-0.16.
  gnu: Add rust-git2-0.18.
  gnu: Add rust-windows-metadata-0.51.
  gnu: Add rust-windows-bindgen-0.51.
  gnu: Add rust-pure-rust-locales-0.7.
  gnu: Add rust-android-tzdata-0.1.
  gnu: rust-chrono-0.4: Update to 0.4.31.
  gnu: Add rust-ansiterm-0.12.
  gnu: Add eza.
  gnu: Update copyright header.

 gnu/packages/crates-graphics.scm |  27 ++
 gnu/packages/crates-io.scm       | 585 +++++++++++++++++++++++--------
 gnu/packages/rust-apps.scm       |  90 +++++
 3 files changed, 548 insertions(+), 154 deletions(-)


base-commit: b6e8d587c4551f0fd28fcef96f33909a8ab8e9df
-- 
2.34.1

[bug#66805] [PATCH 01/22] gnu: Add rust-uzers-0.11.

[Jaeme Sifat via Guix-patches via]

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

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: Ibf8373118929806667aade07f44bcc838f8e7e5c
---
 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 fc26147157..49efd1813f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80540,6 +80540,29 @@ (define-public rust-uuid-macro-internal-1
     ;; The user can choose either license.
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-uzers-0.11
+  (package
+    (name "rust-uzers")
+    (version "0.11.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uzers" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qrzbhncbv4s52lgyzs2pxn1b6gmx9k7h1rdwdwix44cgvf87lkn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7))))
+    (home-page "https://github.com/rustadopt/uzers-rs")
+    (synopsis "Library for getting information on Unix users and groups")
+    (description
+     "This package provides a library for getting information on Unix users
+and groups.  A more maintained fork of the @code{rust-users} crate.")
+    (license license:expat)))
+
 (define-public rust-v-frame-0.3
   (package
     (name "rust-v-frame")
-- 
2.34.1

[bug#66805] [PATCH 02/22] gnu: Add rust-uutils-term-grid-0.3.

[Jaeme Sifat via Guix-patches via]

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

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: Ifbf3fd1d66807b15c96b85fe5078c41602c0f544
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 49efd1813f..c569048c55 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80540,6 +80540,28 @@ (define-public rust-uuid-macro-internal-1
     ;; The user can choose either license.
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-uutils-term-grid-0.3
+  (package
+    (name "rust-uutils-term-grid")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uutils_term_grid" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ixvj893jrcvv76m7cgr99fc25la6xl2101qva6ni646aqm4b2dk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-unicode-width" ,rust-unicode-width-0.1))))
+    (home-page "https://github.com/uutils/uutils-term-grid")
+    (synopsis
+     "Fork of the @code{term_grid} for formatting strings into a grid layout")
+    (description
+     "A fork of @code{term_grid}, this package provides a library for
+formatting strings into a grid layout.")
+    (license license:expat)))
+
 (define-public rust-uzers-0.11
   (package
     (name "rust-uzers")
-- 
2.34.1

[bug#66805] [PATCH 03/22] gnu: Add rust-isolang-2.

[Jaeme Sifat via Guix-patches via]

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

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I717f61b64e1f8126f298cc8de165bec41b85d417
---
 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 c569048c55..20b05b2678 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34976,6 +34976,32 @@ (define-public rust-iso8601-0.3
     (description "Parsing ISO8601 dates using nom.")
     (license license:expat)))
 
+(define-public rust-isolang-2
+  (package
+    (name "rust-isolang")
+    (version "2.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "isolang" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0wg07gh7a1cvx0c1w238d7l4vh17cwwvjmw729qqnw5wn4fj43zq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags `("--"
+                            "--skip=generated_code_table_if_outdated")
+       #:cargo-inputs (("rust-phf" ,rust-phf-0.11)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-phf-codegen" ,rust-phf-codegen-0.11)
+                                   ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/humenda/isolang-rs")
+    (synopsis "Efficient, static lookup table for ISO 639 language codes")
+    (description
+     "This package provides an efficient, static lookup table for ISO 639
+language codes.")
+    (license license:asl2.0)))
+
 (define-public rust-itertools-0.11
   (package
     (name "rust-itertools")
-- 
2.34.1

[bug#66805] [PATCH 04/22] gnu: Add rust-timeago-0.4.

[Jaeme Sifat via Guix-patches via]

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

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I5be1440e86fd04f6e9e3307f2ac14f7f0baef27a
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

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

[bug#66805] [PATCH 05/22] gnu: Add rust-terminal-size-0.3.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-terminal-size-0.3): New variable.
* gnu/packages/crates-io.scm (rust-terminal-size-0.2): Inherit
rust-terminal-size-0.3.
* gnu/packages/crates-io.scm (rust-terminal-size-0.1): Inherit
rust-terminal-size-0.3.

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: If72b8f5359705bf0674a244f4588efd1f90345a1
---
 gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3efa5dadb5..3fd65dcc95 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -72907,8 +72907,31 @@ (define-public rust-termimad-0.20
     (description "Markdown Renderer for the Terminal.")
     (license license:expat)))
 
+(define-public rust-terminal-size-0.3
+  (package
+    (name "rust-terminal-size")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "terminal_size" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xqdzdjq77smg41z67vg3qwrcilf1zf5330gdrgm22lyghmvzgi1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs (("rust-rustix" ,rust-rustix-0.38)
+                       ("rust-windows-sys" ,rust-windows-sys-0.48))))
+    (home-page "https://github.com/eminence/terminal-size")
+    (synopsis "Gets the size of your Linux or Windows terminal")
+    (description
+     "This package gets the size of your Linux or Windows terminal.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-terminal-size-0.2
   (package
+    (inherit rust-terminal-size-0.3)
     (name "rust-terminal-size")
     (version "0.2.2")
     (source (origin
@@ -72918,20 +72941,14 @@ (define-public rust-terminal-size-0.2
               (sha256
                (base32
                 "0yhza8sc6jkka6j0nq5sl749ckx1jagvxp3b38yhh4px6k291jj0"))))
-    (build-system cargo-build-system)
     (arguments
      (list #:tests? #f          ;tests require /dev/stderr
            #:cargo-inputs
-           `(("rust-rustix" ,rust-rustix-0.35))))
-    (home-page "https://github.com/eminence/terminal-size")
-    (synopsis "Gets the size of your Linux or Windows terminal")
-    (description
-     "This package gets the size of your Linux or Windows terminal.")
-    (license (list license:expat license:asl2.0))))
+           `(("rust-rustix" ,rust-rustix-0.35))))))
 
 (define-public rust-terminal-size-0.1
   (package
-    (inherit rust-terminal-size-0.2)
+    (inherit rust-terminal-size-0.3)
     (name "rust-terminal-size")
     (version "0.1.17")
     (source
-- 
2.34.1

[bug#66805] [PATCH 06/22] gnu: Add rust-partition-identity-0.3.

[Jaeme Sifat via Guix-patches via]

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

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I8f61580cb1e31965564c8c7699e6218b78b82fd4
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3fd65dcc95..5bc1ad9a71 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -49215,6 +49215,28 @@ (define-public rust-partial-io-0.2
         ("rust-tokio-core" ,rust-tokio-core-0.1))))
     (license license:bsd-3)))
 
+(define-public rust-partition-identity-0.3
+  (package
+    (name "rust-partition-identity")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "partition-identity" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "08cymccnyf2b0pwc7x4wj889k1knqmrb8500idsjslybpvwjbacz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/pop-os/partition-identity")
+    (synopsis
+     "Find the ID of a device by its path, or find a device path by its ID")
+    (description
+     "This package provides the ability to find ID of a device by its path, or
+find a device path by its ID.")
+    (license license:expat)))
+
 (define-public rust-pasetors-0.6
   (package
     (name "rust-pasetors")
-- 
2.34.1

[bug#66805] [PATCH 07/22] gnu: Add rust-proc-mounts-0.3.

[Jaeme Sifat via Guix-patches via]

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

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I91ae3007deacd6a9e8a2ce020405caeb09951738
---
 gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5bc1ad9a71..5a2dacb5c5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53338,6 +53338,27 @@ (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-proc-mounts-0.3
+  (package
+    (name "rust-proc-mounts")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "proc-mounts" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1wpw3z2qq8wm3da8d0253a1h95nma6lad41m9yzp1ayh6n22yr8d"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-partition-identity" ,rust-partition-identity-0.3))))
+    (home-page "https://github.com/pop-os/proc-mounts")
+    (synopsis "Fetch active mounts and swaps on a Linux system")
+    (description
+     "This package provides fetching active mounts and swaps on a Linux
+system.")
+    (license license:expat)))
+
 (define-public rust-progress-0.2
   (package
     (name "rust-progress")
-- 
2.34.1

[bug#66805] [PATCH 08/22] gnu: rust-phf-shared-0.11: Update to 0.11.2.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-phf-shared-0.11): Update to 0.11.2.

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: Id64dc51bfa7f0efa359b9f0e30208782f300621a
---
 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 5a2dacb5c5..31af351431 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51002,14 +51002,14 @@ (define-public rust-phf-macros-0.7
 (define-public rust-phf-shared-0.11
   (package
     (name "rust-phf-shared")
-    (version "0.11.1")
+    (version "0.11.2")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "phf-shared" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0xp6krf3cd411rz9rbk7p6xprlz786a215039j6jlxvbh9pmzyz1"))))
+                "0azphb0a330ypqx3qvyffal5saqnks0xvl8rj73jlk3qxxgbkz4h"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.34.1

[bug#66805] [PATCH 09/22] gnu: rust-phf-macros-0.11: Update to 0.11.2.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-phf-macros-0.11): Update to 0.11.2.

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: Ieffb692dc61c2baf88bf7bb8472faac58f92993c
---
 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 31af351431..fd869fb5a2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -50871,14 +50871,14 @@ (define-public rust-phf-generator-0.7
 (define-public rust-phf-macros-0.11
   (package
     (name "rust-phf-macros")
-    (version "0.11.1")
+    (version "0.11.2")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "phf-macros" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0rncvjimjri2vancig85icbk8h03a5s3z4cyasd70s37y72wvalj"))))
+                "0js61lc0bhzzrbd9vhpcqp11vvwckdkz3g7k95z5h1k651p68i1l"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
2.34.1

[bug#66805] [PATCH 10/22] gnu: rust-phf-0.11: Update to 0.11.2.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-phf-0.11): Update to 0.11.2.

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: Ic1c3f2b1da5f93cb1560217ffeb69f12eca33124
---
 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 fd869fb5a2..2b72b88acd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -50544,14 +50544,14 @@ (define-public rust-petgraph-0.4
 (define-public rust-phf-0.11
   (package
     (name "rust-phf")
-    (version "0.11.1")
+    (version "0.11.2")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "phf" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1354fbpb52cp9gs5mlkaygc5qhdx6r07rfv3xy482m4kvqsnb34j"))))
+                "1p03rsw66l7naqhpgr1a34r9yzi1gv9jh16g3fsk6wrwyfwdiqmd"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f          ; Doc tests fail.
-- 
2.34.1

[bug#66805] [PATCH 11/22] gnu: rust-num-cpus-1: Update to 1.16.0.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-num-cpus-1): Update to 1.16.0.

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I65d5b88709c6b978fc8a12865003f204ce2e1439
---
 gnu/packages/crates-io.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2b72b88acd..a7bd189050 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45794,18 +45794,18 @@ (define-public rust-num-complex-0.1
 (define-public rust-num-cpus-1
   (package
     (name "rust-num-cpus")
-    (version "1.15.0")
+    (version "1.16.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "num-cpus" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0fsrjy3arnbcl41vz0gppya8d7d24cpkjgfflr3v8pivl4nrxb0g"))))
+        (base32 "0hra6ihpnh06dvfvz9ipscys0xfqa9ca9hzp384d5m02ssvgqqa1"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-hermit-abi" ,rust-hermit-abi-0.2)
+       (("rust-hermit-abi" ,rust-hermit-abi-0.3)
         ("rust-libc" ,rust-libc-0.2))))
     (home-page "https://github.com/seanmonstar/num_cpus")
     (synopsis "Get the number of CPUs on a machine")
-- 
2.34.1

[bug#66805] [PATCH 12/22] gnu: Add rust-libssh2-sys-0.3.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-libssh2-sys-0.3): New variable.
* gnu/packages/crates-io.scm (rust-libssh2-sys-0.2): Inherit
rust-libssh2-sys-0.3.
[source]: Add gexps.

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I6bca9f7b1573ee33c19a494c9e01b6b20fe7e335
---
 gnu/packages/crates-io.scm | 69 ++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a7bd189050..669baf7245 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38580,41 +38580,58 @@ (define-public rust-linux-raw-sys-0.0.46
            `(("rust-libc" ,rust-libc-0.2)
              ("rust-static-assertions" ,rust-static-assertions-1))))))
 
-(define-public rust-libssh2-sys-0.2
+(define-public rust-libssh2-sys-0.3
   (package
     (name "rust-libssh2-sys")
-    (version "0.2.19")
+    (version "0.3.0")
     (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "libssh2-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0mkhw4pksbz7gldj8hia7k6npc479n1x09i8r0pm275sac424ina"))
-        (modules '((guix build utils)))
-        (snippet
-         '(begin (delete-file-recursively "libssh2") #t))))
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libssh2-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1vkidqw5ll71ynqc93hgcq62iqkklzb5268zffd13ql7nwqa1j1d"))
+       (modules '((guix build utils)))
+       (snippet #~'(begin
+                     (delete-file-recursively "libssh2") #t))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-libz-sys" ,rust-libz-sys-1)
-        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
-        ;; Build dependencies:
-        ("rust-cc" ,rust-cc-1)
-        ("rust-pkg-config" ,rust-pkg-config-0.3)
-        ("rust-vcpkg" ,rust-vcpkg-0.2))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list libssh2 openssl zlib))
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libz-sys" ,rust-libz-sys-1)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3)
+                       ("rust-vcpkg" ,rust-vcpkg-0.2))))
+    (native-inputs (list pkg-config))
+    (inputs (list libssh2 openssl zlib))
     (home-page "https://github.com/alexcrichton/ssh2-rs")
     (synopsis "Native bindings to the libssh2 library")
     (description
      "This package provides native rust bindings to the @code{libssh2} library.")
-    (license (list license:asl2.0
-                   license:expat))))
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-libssh2-sys-0.2
+  (package
+    (inherit rust-libssh2-sys-0.3)
+    (name "rust-libssh2-sys")
+    (version "0.2.19")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libssh2-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0mkhw4pksbz7gldj8hia7k6npc479n1x09i8r0pm275sac424ina"))
+       (modules '((guix build utils)))
+       (snippet #~'(begin
+                     (delete-file-recursively "libssh2") #t))))
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libz-sys" ,rust-libz-sys-1)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3)
+                       ("rust-vcpkg" ,rust-vcpkg-0.2))))))
 
 (define-public rust-libtest-mimic-0.6
   (package
-- 
2.34.1

[bug#66805] [PATCH 13/22] gnu: Add rust-libgit2-sys-0.16.

[Jaeme Sifat via Guix-patches via]

This patch also adds gexps to the libgit2 snippet and cleans up the package
definitions.

* gnu/packages/crates-io.scm (rust-libgit2-sys-0.16): New variable.
* gnu/packages/crates-io.scm (rust-libgit2-sys-0.6): Fix name field.

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I8ebf29673c4f348171924ea1cc13d3baa0fdd3a7
---
 gnu/packages/crates-io.scm | 166 +++++++++++++++++++------------------
 1 file changed, 87 insertions(+), 79 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 669baf7245..ab1641279c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37131,35 +37131,30 @@ (define-public rust-libfuzzer-sys-0.3
     (license
      (list license:expat license:asl2.0 license:ncsa))))
 
-(define-public rust-libgit2-sys-0.14
+(define-public rust-libgit2-sys-0.16
   (package
     (name "rust-libgit2-sys")
-    (version "0.14.2+1.5.1")
+    (version "0.16.1+1.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "libgit2-sys" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1926x5f84ykr8j2lsdmb0n0bj4jz173j5bm722cgwx8hnpv9agbz"))
+        (base32 "030dnq7hz79qs4rxdllc3ailvqzc432jwwxk7g8av55hh0vbp8pj"))
        (modules '((guix build utils)))
-       (snippet
-        '(begin (delete-file-recursively "libgit2")))))
+       (snippet #~'(begin
+                     (delete-file-recursively "libgit2")))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-cc" ,rust-cc-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-libssh2-sys" ,rust-libssh2-sys-0.2)
-        ("rust-libz-sys" ,rust-libz-sys-1)
-        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
-        ("rust-pkg-config" ,rust-pkg-config-0.3))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list libgit2 openssl zlib))
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libssh2-sys" ,rust-libssh2-sys-0.3)
+                       ("rust-libz-sys" ,rust-libz-sys-1)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))
+    (native-inputs (list pkg-config))
+    (inputs (list libgit2 openssl zlib))
     (home-page "https://github.com/rust-lang/git2-rs")
     (synopsis "Native bindings to the libgit2 library")
     (description
@@ -37167,6 +37162,30 @@ (define-public rust-libgit2-sys-0.14
 library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-libgit2-sys-0.14
+  (package
+    (inherit rust-libgit2-sys-0.16)
+    (name "rust-libgit2-sys")
+    (version "0.14.2+1.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libgit2-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1926x5f84ykr8j2lsdmb0n0bj4jz173j5bm722cgwx8hnpv9agbz"))
+       (modules '((guix build utils)))
+       (snippet #~'(begin
+                     (delete-file-recursively "libgit2")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libssh2-sys" ,rust-libssh2-sys-0.2)
+                       ("rust-libz-sys" ,rust-libz-sys-1)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))))
+
 (define-public rust-libgit2-sys-0.13
   (package
     (inherit rust-libgit2-sys-0.14)
@@ -37176,24 +37195,20 @@ (define-public rust-libgit2-sys-0.13
      (origin
        (method url-fetch)
        (uri (crate-uri "libgit2-sys" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1fkdgfqdkd38hfsyw3znq629gp7wdknzslym5l0g29k9q83fmrai"))
+        (base32 "1fkdgfqdkd38hfsyw3znq629gp7wdknzslym5l0g29k9q83fmrai"))
        (modules '((guix build utils)))
-       (snippet
-        '(begin (delete-file-recursively "libgit2")))))
+       (snippet #~'(begin
+                     (delete-file-recursively "libgit2")))))
     (arguments
-     `(#:cargo-inputs
-       (("rust-cc" ,rust-cc-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-libssh2-sys" ,rust-libssh2-sys-0.2)
-        ("rust-libz-sys" ,rust-libz-sys-1)
-        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
-        ("rust-pkg-config" ,rust-pkg-config-0.3))))
-    (inputs
-     (list libgit2-1.4 openssl zlib))))
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libssh2-sys" ,rust-libssh2-sys-0.2)
+                       ("rust-libz-sys" ,rust-libz-sys-1)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))
+    (inputs (list libgit2-1.4 openssl zlib))))
 
 (define-public rust-libgit2-sys-0.12
   (package
@@ -37204,22 +37219,19 @@ (define-public rust-libgit2-sys-0.12
      (origin
        (method url-fetch)
        (uri (crate-uri "libgit2-sys" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "153l8nvz9p8vyd5840xi6fwblvhpn3c33jwdwsznyq4f4jcwiq8r"))
+        (base32 "153l8nvz9p8vyd5840xi6fwblvhpn3c33jwdwsznyq4f4jcwiq8r"))
        (modules '((guix build utils)))
-       (snippet
-        '(begin (delete-file-recursively "libgit2")))))
+       (snippet #~'(begin
+                     (delete-file-recursively "libgit2")))))
     (arguments
-     `(#:cargo-inputs
-       (("rust-cc" ,rust-cc-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-libssh2-sys" ,rust-libssh2-sys-0.2)
-        ("rust-libz-sys" ,rust-libz-sys-1)
-        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
-        ("rust-pkg-config" ,rust-pkg-config-0.3))))))
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libssh2-sys" ,rust-libssh2-sys-0.2)
+                       ("rust-libz-sys" ,rust-libz-sys-1)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))))
 
 (define-public rust-libgit2-sys-0.10
   (package
@@ -37232,20 +37244,18 @@ (define-public rust-libgit2-sys-0.10
        (uri (crate-uri "libgit2-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0l9fvki7qxsl97vgzqwlv75nl213a5vxw7b1jaik97ala356pv6r"))
+        (base32 "0l9fvki7qxsl97vgzqwlv75nl213a5vxw7b1jaik97ala356pv6r"))
        (modules '((guix build utils)))
-       (snippet
-        '(begin (delete-file-recursively "libgit2") #t))))
+       (snippet #~'(begin
+                     (delete-file-recursively "libgit2") #t))))
     (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-libz-sys" ,rust-libz-sys-1)
-        ("rust-libssh2-sys" ,rust-libssh2-sys-0.2)
-        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
-        ;; Build dependencies:
-        ("rust-cc" ,rust-cc-1)
-        ("rust-pkg-config" ,rust-pkg-config-0.3))))))
+     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-libz-sys" ,rust-libz-sys-1)
+                       ("rust-libssh2-sys" ,rust-libssh2-sys-0.2)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ;; Build dependencies:
+                       ("rust-cc" ,rust-cc-1)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))))
 
 (define-public rust-libgit2-sys-0.8
   (package
@@ -37253,21 +37263,20 @@ (define-public rust-libgit2-sys-0.8
     (name "rust-libgit2-sys")
     (version "0.8.2")
     (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "libgit2-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc"))
-        (modules '((guix build utils)))
-        (snippet
-         '(begin (delete-file-recursively "libgit2") #t))))))
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libgit2-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc"))
+       (modules '((guix build utils)))
+       (snippet #~'(begin
+                     (delete-file-recursively "libgit2") #t))))))
 
 (define-public rust-libgit2-sys-0.6
   (package
     (inherit rust-libgit2-sys-0.10)
-    (name "rust-libgit2-sys-6")
+    (name "rust-libgit2-sys")
     (version "0.6.19")
     (source
      (origin
@@ -37277,15 +37286,14 @@ (define-public rust-libgit2-sys-0.6
        (sha256
         (base32 "0myk79sxqj20bmj4ir3p81xnma9qnid5rrmlbkj5v68wgdpfdskf"))))
     (arguments
-     `(#:cargo-inputs
-       (("rust-cc" ,rust-cc-1)
-        ("rust-cmake" ,rust-cmake-0.1)
-        ("rust-curl-sys" ,rust-curl-sys-0.4)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-libssh2-sys" ,rust-libssh2-sys-0.2)
-        ("rust-libz-sys" ,rust-libz-sys-1)
-        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
-        ("rust-pkg-config" ,rust-pkg-config-0.3))))))
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-cmake" ,rust-cmake-0.1)
+                       ("rust-curl-sys" ,rust-curl-sys-0.4)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libssh2-sys" ,rust-libssh2-sys-0.2)
+                       ("rust-libz-sys" ,rust-libz-sys-1)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))))
 
 (define-public rust-libloading-0.7
   (package
-- 
2.34.1

[bug#66805] [PATCH 14/22] gnu: Add rust-git2-0.18.

[Jaeme Sifat via Guix-patches via]

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

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I2623e46c5da798c0793a7ddc48685964eb5d56e1
---
 gnu/packages/crates-io.scm | 50 +++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ab1641279c..95346b3764 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29165,8 +29165,43 @@ (define-public rust-git-version-macro-0.3
      "This is an internal macro crate for git-version.")
     (license license:bsd-2)))
 
+(define-public rust-git2-0.18
+  (package
+    (name "rust-git2")
+    (version "0.18.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "git2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kf0kvg3i7p1223zs2h9fz99ndm0l9kdx3hcw63g73dh5nlppygv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libgit2-sys" ,rust-libgit2-sys-0.16)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-openssl-probe" ,rust-openssl-probe-0.1)
+                       ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+                       ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs (("rust-structopt" ,rust-structopt-0.3)
+                                   ("rust-tempfile" ,rust-tempfile-3)
+                                   ("rust-time" ,rust-time-0.1))))
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("git" ,git-minimal))) ;for a single test
+    (inputs (list libgit2 libssh2 openssl zlib))
+    (home-page "https://github.com/rust-lang/git2-rs")
+    (synopsis "Rust bindings to libgit2")
+    (description
+     "This package provides bindings to libgit2 for interoperating with git
+repositories.  This library is both threadsafe and memory safe and allows both
+reading and writing git repositories.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-git2-0.16
   (package
+    (inherit rust-git2-0.18)
     (name "rust-git2")
     (version "0.16.1")
     (source
@@ -29177,7 +29212,6 @@ (define-public rust-git2-0.16
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1k1aavsfhk0i9jycc9gb61w2jwy8w9dgkd7zkz295wwm566gdxyc"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
@@ -29191,19 +29225,7 @@ (define-public rust-git2-0.16
        (("rust-paste" ,rust-paste-1)
         ("rust-structopt" ,rust-structopt-0.3)
         ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-time" ,rust-time-0.1))))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("git" ,git-minimal)))           ;for a single test
-    (inputs
-     (list libgit2 libssh2 openssl zlib))
-    (home-page "https://github.com/rust-lang/git2-rs")
-    (synopsis "Rust bindings to libgit2")
-    (description
-     "This package provides bindings to libgit2 for interoperating with git
-repositories.  This library is both threadsafe and memory safe and allows both
-reading and writing git repositories.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-time" ,rust-time-0.1))))))
 
 (define-public rust-git2-0.15
   (package
-- 
2.34.1

[bug#66805] [PATCH 15/22] gnu: Add rust-windows-metadata-0.51.

[Jaeme Sifat via Guix-patches via]

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

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I6354518d37f91d5ed6c79e504a59af890160d8d6
---
 gnu/packages/crates-io.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 95346b3764..af793cf147 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -83723,6 +83723,23 @@ (define-public rust-windows-macros-0.9
     (description "Macros for the windows crate")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-metadata-0.51
+  (package
+    (name "rust-windows-metadata")
+    (version "0.51.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-metadata" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03h0c6qs1yyl0z69p4k1hdq636j868qdxnri1dy47nprjvckacbm"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Windows metadata reader")
+    (description "Windows metadata reader")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-targets-0.48
   (package
     (name "rust-windows-targets")
-- 
2.34.1

[bug#66805] [PATCH 16/22] gnu: Add rust-windows-bindgen-0.51.

[Jaeme Sifat via Guix-patches via]

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

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: Ia87e9a9dfdd8ac2d8dc19365c40f04ff62980e57
---
 gnu/packages/crates-io.scm | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index af793cf147..10e45af42d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -83347,6 +83347,30 @@ (define-public rust-windows-aarch64-msvc-0.28
                (base32
                 "1hpk0n2z0jzzvwlvs98b75sa4q920953nqfc119rv19nwm0mlsaj"))))))
 
+(define-public rust-windows-bindgen-0.51
+  (package
+    (name "rust-windows-bindgen")
+    (version "0.51.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-bindgen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xfdq4q958qal5iks8xkaanf7w3akzfxc58dxvz7amhjg2vic7xw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-rayon" ,rust-rayon-1)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-windows-metadata" ,rust-windows-metadata-0.51))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Windows metadata compiler bindings")
+    (description
+     "This package provides the windows metadata compiler bindings.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-i686-gnu-0.48
   (package
     (name "rust-windows-i686-gnu")
@@ -83737,7 +83761,7 @@ (define-public rust-windows-metadata-0.51
     (build-system cargo-build-system)
     (home-page "https://github.com/microsoft/windows-rs")
     (synopsis "Windows metadata reader")
-    (description "Windows metadata reader")
+    (description "This package provides a Windows metadata reader.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-windows-targets-0.48
-- 
2.34.1

[bug#66805] [PATCH 17/22] gnu: Add rust-pure-rust-locales-0.7.

[Jaeme Sifat via Guix-patches via]

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

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: If0f2f4ba2cac2b5c8c3e35647bd60bba6d274bf1
---
 gnu/packages/crates-io.scm | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 10e45af42d..77764815b1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54214,8 +54214,30 @@ (define-public rust-pulse-0.5
     (description "This package provides a library for async wake signals.")
     (license license:asl2.0)))
 
+(define-public rust-pure-rust-locales-0.7
+  (package
+    (name "rust-pure-rust-locales")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pure-rust-locales" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cl46srhxzj0jlvfp73l8l9qw54qwa04zywaxdf73hidwqlsh0pd"))))
+    (build-system cargo-build-system)
+    (arguments `(#:cargo-test-flags `("--"
+                                      "--skip=checksum")))
+    (home-page "https://github.com/cecton/pure-rust-locales")
+    (synopsis "Pure Rust locales imported directly from the GNU C Library")
+    (description
+     "Pure Rust locales imported directly from the GNU C Library.
+@code{LC_COLLATE} and @code{LC_CTYPE} are not yet supported.")
+    (license license:expat)))
+
 (define-public rust-pure-rust-locales-0.5
   (package
+    (inherit rust-pure-rust-locales-0.7)
     (name "rust-pure-rust-locales")
     (version "0.5.3")
     (source
@@ -54231,13 +54253,8 @@ (define-public rust-pure-rust-locales-0.5
     (arguments
      `(#:cargo-inputs
        (("rust-itertools" ,rust-itertools-0.8)
-        ("rust-nom" ,rust-nom-5))))
-    (home-page "https://github.com/cecton/pure-rust-locales")
-    (synopsis "Pure Rust locales imported directly from the GNU C Library")
-    (description
-     "Pure Rust locales imported directly from the GNU C Library.
-@code{LC_COLLATE} and @code{LC_CTYPE} are not yet supported.")
-    (license license:expat)))
+        ("rust-nom" ,rust-nom-5))))))
+
 
 (define-public rust-pyo3-build-config-0.19
   (package
-- 
2.34.1

[bug#66805] [PATCH 18/22] gnu: Add rust-android-tzdata-0.1.

[Jaeme Sifat via Guix-patches via]

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

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I8355553a3c54f7dec57ab9acd444368326e202ab
---
 gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 77764815b1..42cd16c172 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3400,6 +3400,27 @@ (define-public rust-android-system-properties-0.1
      "This package provides a minimal Android system properties wrapper.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-android-tzdata-0.1
+  (package
+    (name "rust-android-tzdata")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "android-tzdata" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1w7ynjxrfs97xg3qlcdns4kgfpwcdv824g611fq32cag4cdr96g9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-development-inputs (("rust-zip" ,rust-zip-0.6))))
+    (home-page "https://github.com/RumovZ/android-tzdata")
+    (synopsis "Parser for the Android-specific tzdata file")
+    (description
+     "This package provides a parser for the Android-specific tzdata file.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-anes-0.1
   (package
     (name "rust-anes")
-- 
2.34.1

[bug#66805] [PATCH 19/22] gnu: rust-chrono-0.4: Update to 0.4.31.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-chrono-0.4): Update to 0.4.31.

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: Id794bda540ca2dd7d0775ee98941927a50c73a93
---
 gnu/packages/crates-io.scm | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 42cd16c172..e81aa21a60 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12299,7 +12299,7 @@ (define-public rust-charset-0.1
 (define-public rust-chrono-0.4
   (package
     (name "rust-chrono")
-    (version "0.4.24")
+    (version "0.4.31")
     (source
      (origin
        (method url-fetch)
@@ -12308,30 +12308,27 @@ (define-public rust-chrono-0.4
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0fv7idr8c7vdb0xi32w45a7pafnyzk7m0bknfggj5pva0qcmjg2f"))))
+         "0f6vg67pipm8cziad2yms6a639pssnvysk1m05dd9crymmdnhb3z"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-arbitrary" ,rust-arbitrary-1)
-        ("rust-criterion" ,rust-criterion-0.4)
+       (("rust-android-tzdata" ,rust-android-tzdata-0.1)
+        ("rust-arbitrary" ,rust-arbitrary-1)
         ("rust-iana-time-zone" ,rust-iana-time-zone-0.1)
         ("rust-js-sys" ,rust-js-sys-0.3)
-        ("rust-num-integer" ,rust-num-integer-0.1)
         ("rust-num-traits" ,rust-num-traits-0.2)
-        ("rust-pure-rust-locales" ,rust-pure-rust-locales-0.5)
+        ("rust-pure-rust-locales" ,rust-pure-rust-locales-0.7)
         ("rust-rkyv" ,rust-rkyv-0.7)
         ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
         ("rust-serde" ,rust-serde-1)
-        ("rust-time" ,rust-time-0.1)
         ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
-        ("rust-winapi" ,rust-winapi-0.3))
+        ("rust-windows-targets" ,rust-windows-targets-0.48))
        #:cargo-development-inputs
        (("rust-bincode" ,rust-bincode-1)
-        ("rust-doc-comment" ,rust-doc-comment-0.3)
-        ("rust-num-iter" ,rust-num-iter-0.1)
         ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
+        ("rust-windows-bindgen" ,rust-windows-bindgen-0.51))
        #:features '("unstable-locales")
        #:tests? #f))
     (home-page "https://github.com/chronotope/chrono")
-- 
2.34.1

[bug#66805] [PATCH 20/22] gnu: Add rust-ansiterm-0.12.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-ansiterm-0.12): New variable.

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I9f98081b498c4781258d1be3ed44875127a5075c
---
 gnu/packages/crates-graphics.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 22b77121e9..4bd1f5b387 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -136,6 +136,32 @@ (define-public rust-ansi-colours-1
 approximated by values supported by the terminal.")
     (license license:lgpl3+)))
 
+(define-public rust-ansiterm-0.12
+  (package
+    (name "rust-ansiterm")
+    (version "0.12.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ansiterm" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1k14pywvgd829swxzji0nchk4n6yvr9xz6lkwv96v8ax77sqgdaa"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-ansi-colours" ,rust-ansi-colours-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)
+                                   ("rust-regex" ,rust-regex-1)
+                                   ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/rustadopt/ansiterm-rs")
+    (synopsis "Library for ANSI terminal colours and styles (bold, underline)")
+    (description
+     "This package provides a library for ANSI terminal colours and
+styles (bold, underline).")
+    (license license:expat)))
+
 (define-public rust-ansi-term-0.12
   (package
     (name "rust-ansi-term")
-- 
2.34.1

[bug#66805] [PATCH 21/22] gnu: Add eza.

[Jaeme Sifat via Guix-patches via]

eza is the community-maintained successor fork to exa. Minimal changes had to
be made to adapt the exa package definition to eza.

* gnu/packages/rust-apps.scm (eza): New variable.

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I0069bbbc8de55a030a52ef98b0f8d9dd0fe07317
---
 gnu/packages/rust-apps.scm | 89 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index a06447143a..78ca22748f 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -463,6 +463,95 @@ (define-public exa
 also knows about symlinks, extended attributes, and Git.")
     (license license:expat)))
 
+(define-public eza
+  (package
+    (name "eza")
+    (version "0.15.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "eza" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "078gdp5kamqrl7rj5q9a979xn58izqqzfi8vz0bhdxiikpjdf5b8"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:cargo-inputs `(("rust-ansiterm" ,rust-ansiterm-0.12)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-git2" ,rust-git2-0.18)
+                       ("rust-glob" ,rust-glob-0.3)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-locale" ,rust-locale-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-natord" ,rust-natord-1)
+                       ("rust-num-cpus" ,rust-num-cpus-1)
+                       ("rust-number-prefix" ,rust-number-prefix-0.4)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("rust-phf" ,rust-phf-0.11)
+                       ("rust-proc-mounts" ,rust-proc-mounts-0.3)
+                       ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
+                       ("rust-terminal-size" ,rust-terminal-size-0.3)
+                       ("rust-timeago" ,rust-timeago-0.4)
+                       ("rust-unicode-width" ,rust-unicode-width-0.1)
+                       ("rust-uutils-term-grid" ,rust-uutils-term-grid-0.3)
+                       ("rust-uzers" ,rust-uzers-0.11)
+                       ("rust-windows-sys" ,rust-windows-sys-0.48)
+                       ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.5))
+      #:cargo-development-inputs `(("rust-criterion" ,rust-criterion-0.5)
+                                   ("rust-trycmd" ,rust-trycmd-0.14))
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'build 'build-manual
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       (when (assoc-ref inputs "pandoc")
+                         (map (lambda (page)
+                                (with-output-to-file page
+                                  (lambda _
+                                    (invoke "pandoc"
+                                            "--standalone"
+                                            "-f"
+                                            "markdown"
+                                            "-t"
+                                            "man"
+                                            (string-append "man/" page ".md")))))
+                              (list "eza.1" "eza_colors.5")))))
+                   (add-after 'install 'install-extras
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let* ((out (assoc-ref outputs "out"))
+                              (share (string-append out "/share"))
+                              (man1 (string-append share "/man/man1"))
+                              (man5 (string-append share "/man/man5")))
+                         (when (file-exists? "eza.1")
+                           (install-file "eza.1" man1))
+                         (when (file-exists? "eza_colors.5")
+                           (install-file "eza_colors.5" man5))
+                         (mkdir-p (string-append out "/etc/bash_completion.d"))
+                         (mkdir-p (string-append share
+                                                 "/fish/vendor_completions.d"))
+                         (mkdir-p (string-append share "/zsh/site-functions"))
+                         (copy-file "completions/bash/eza"
+                                    (string-append out
+                                     "/etc/bash_completion.d/eza"))
+                         (copy-file "completions/fish/eza.fish"
+                                    (string-append share
+                                     "/fish/vendor_completions.d/eza.fish"))
+                         (copy-file "completions/zsh/_eza"
+                                    (string-append share
+                                                   "/zsh/site-functions/_eza"))))))))
+    (native-inputs (list pandoc pkg-config))
+    (inputs (list zlib))
+    (home-page "https://github.com/eza-community/eza")
+    (synopsis "Modern replacement for ls")
+    (description
+     "@code{eza} is a modern replacement for the command-line
+program @code{ls}.  It uses colours to distinguish file types and
+metadata.  It also knows about symlinks, extended attributes, and Git.
+This package is the community maintained fork of @code{exa}.")
+    (license license:expat)))
+
 (define-public fd
   (package
     (name "fd")
-- 
2.34.1

bug#66805: [PATCH 21/22] gnu: Add eza.

[Efraim Flashner]

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

Thanks for the patches.  I've pushed them 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 --]

[bug#66805] [PATCH 22/22] gnu: Update copyright header.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-graphics.scm: Update copyright.
* gnu/packages/crates-io.scm: Update copyright.
* gnu/packages/rust-apps.scm: Update copyright.

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I0031ac757bfc2ff4a6dc588c48396d674f532148
---
 gnu/packages/crates-graphics.scm | 1 +
 gnu/packages/crates-io.scm       | 1 +
 gnu/packages/rust-apps.scm       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 4bd1f5b387..0294dce7be 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e81aa21a60..dc83ea93d1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2022 Paul Alesius <paul@unnservice.com>
 ;;; Copyright © 2023 Arnav Andrew Jose <arnav.jose@gmail.com>
 ;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
+;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 78ca22748f..c596769d4d 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2023 Arnav Andrew Jose <arnav.jose@gmail.com>
 ;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
+;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
-- 
2.34.1

[bug#66805] [PATCH vREVISION] gnu: eza: Fix arguments field.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/rust-apps.scm (eza): Fix arguments field.
[arguments]: Add #:install-source? #f

Change-Id: I832d169cc960f3fff918d7cd29ab6a8e0443deb3
---
 gnu/packages/rust-apps.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index c596769d4d..81da65b964 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -478,8 +478,8 @@ (define-public eza
     (build-system cargo-build-system)
     (arguments
      (list
+      #:install-source? #f
       #:cargo-inputs `(("rust-ansiterm" ,rust-ansiterm-0.12)
-                       ("rust-chrono" ,rust-chrono-0.4)
                        ("rust-chrono" ,rust-chrono-0.4)
                        ("rust-git2" ,rust-git2-0.18)
                        ("rust-glob" ,rust-glob-0.3)

base-commit: 642769707c05dc1dd5674d60cd3b55d77b35c9d9
prerequisite-patch-id: be01c0b412137d0fa947912f40c2ff746352c463
prerequisite-patch-id: ea59bac6946ec832bf2151c351d25c17e9be4299
prerequisite-patch-id: 0a61e5b9d9059c210f8934c5b3263fe63cbaace7
prerequisite-patch-id: 90e11e612180e73c283fec5bef39d1550b579fdf
prerequisite-patch-id: 2edd7e0e6883864e66ec3baaae2725eb749f0af5
prerequisite-patch-id: 00c38be5eb7884d188b231f703d24f0e94a7dd11
prerequisite-patch-id: 326b57b596cf4369f25c3e8f8dababeba8f3f6e6
prerequisite-patch-id: 47f718e935f9090eebc3cc61e8a97327480ea128
prerequisite-patch-id: a928352cb7fb90d77b2b0641a05aea76c8b6e777
prerequisite-patch-id: 4f525dcbb61c15a320cc55bc9d3adfd8cc0a2929
prerequisite-patch-id: 335fc813085b257ca929330961aff482f82f39cd
prerequisite-patch-id: 89f5c9b88401fa1802db9bec97cc6dae98a268e8
prerequisite-patch-id: 24ba249ab2a4c6d34d09f1b743dda3a3811f38f6
prerequisite-patch-id: fb9c783785acae05a99c030ee6881b0c4fc23db3
prerequisite-patch-id: 3466ea1b9d47b114be8f123509ed933fbda22f2a
prerequisite-patch-id: f9de041fc79feeeb35a24781d7e8f5318dc7b307
prerequisite-patch-id: fdb24ef9959a25f9413874c1bea40f3e5f34b9e6
prerequisite-patch-id: e35ef3f6d7c3859de5b38c22f651d14076df20cf
prerequisite-patch-id: bfa4b5facfa34270f72dda2a34656ad8862e6a87
prerequisite-patch-id: 4ea3f2d59d73b42ebb476c6011957fbcfee43c25
prerequisite-patch-id: 5681cb39dea9277db661ec7a287fe14e7e515c45
prerequisite-patch-id: aa8024e7a13f0e696a0b86757e05b3b200965330
-- 
2.34.1