[bug#56037] [PATCH] gnu: Update hexyl to 0.10

[bug#56037] [PATCH] gnu: Update hexyl to 0.10

[Gabriel Arazas]

This patchset is just a step towards updating (and adding) some of the 
Rust apps (at least that I'm interested to update). Particularly, the 
update of rust-clap-3 to a stable version. There is only 2 apps that 
require them though the other one (zoxide) requires the specific beta 
version. I don't know whether to let that package fail so I made the 
beta version as a separate package for now until it will be updated for 
another time.

Confirmed to build on x86_64-linux. Binaries for other architectures are 
yet to be built, my laptop is not powerful enough to wait to build Rust.

[bug#56037] [PATCH 01/14] gnu: Add rust-kstring-2.

[Gabriel Arazas]

* gnu/packages/crates-io.scm (rust-kstring-2): New variable.
(rust-kstring-1): Inherit and adjust.
---
 gnu/packages/crates-io.scm | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 452a22f0f2..c037071ab0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30500,8 +30500,32 @@ (define-public rust-kqueue-1
     (description "This package provides a kqueue interface for BSDs.")
     (license license:expat)))
 
+(define-public rust-kstring-2
+  (package
+    (name "rust-kstring")
+    (version "2.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "kstring" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0isp7kmk4q0qxpcd877q77ykgb3ryfbmj18djmnwv8c210sncc7c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-document-features" ,rust-document-features-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-static-assertions" ,rust-static-assertions-1))))
+    (home-page "https://github.com/cobalt-org/kstring")
+    (synopsis "Key String: optimized for map keys")
+    (description "Key String provides a Rust package optimized for map keys.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-kstring-1
   (package
+    (inherit rust-kstring-2)
     (name "rust-kstring")
     (version "1.1.0")
     (source
@@ -30520,11 +30544,7 @@ (define-public rust-kstring-1
         ("rust-static-assertions" ,rust-static-assertions-1))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-proptest" ,rust-proptest-1))))
-    (home-page "https://github.com/cobalt-org/kstring")
-    (synopsis "String optimized for map keys")
-    (description "Key String provides a Rust package optimized for map keys.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-proptest" ,rust-proptest-1))))))
 
 (define-public rust-kv-log-macro-1
   (package

base-commit: 6fc33d91ba6b07beae8a9a38a5b768511bb79ced
-- 
2.36.1

[bug#56037] [PATCH 02/14] gnu: Add rust-toml-edit-0.14.

[Gabriel Arazas]

* gnu/packages/crates-io.scm (rust-toml-edit-0.14): New variable.
(rust-toml-edit-0.3): Inherit and adjust.
---
 gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c037071ab0..88339619ca 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65201,17 +65201,17 @@ (define-public rust-toml-0.2
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-toml-edit-0.3
+(define-public rust-toml-edit-0.14
   (package
     (name "rust-toml-edit")
-    (version "0.3.1")
+    (version "0.14.4")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "toml_edit" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0fbpkhla57k9qbpbxh72wxc7hhj7yscq4r0hnmyyygp92r3q6c0x"))))
+                "07xmklks4ldf8r9ban47zvq2s0csq43ja0dcjs43yi7j8ip2axjk"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -65219,14 +65219,36 @@ (define-public rust-toml-edit-0.3
        (("rust-combine" ,rust-combine-4)
         ("rust-indexmap" ,rust-indexmap-1)
         ("rust-itertools" ,rust-itertools-0.10)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-vec1" ,rust-vec1-1))))
+        ("rust-kstring" ,rust-kstring-2)
+        ("rust-serde" ,rust-serde-1))))
     (home-page "https://github.com/ordian/toml_edit")
     (synopsis "Yet another format-preserving TOML parser")
     (description "This package provides yet another format-preserving TOML
 parser.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-toml-edit-0.3
+  (package
+    (inherit rust-toml-edit-0.14)
+    (name "rust-toml-edit")
+    (version "0.3.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "toml_edit" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0fbpkhla57k9qbpbxh72wxc7hhj7yscq4r0hnmyyygp92r3q6c0x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-combine" ,rust-combine-4)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-itertools" ,rust-itertools-0.10)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-vec1" ,rust-vec1-1))))))
+
 (define-public rust-tonic-0.6
   (package
     (name "rust-tonic")
-- 
2.36.1

[bug#56037] [PATCH 03/14] gnu: Add rust-similar-2.

[Gabriel Arazas]

* gnu/packages/crates-io.scm (rust-similar-2): New variable.
(rust-similar-1): Inherit and adjust.
---
 gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 88339619ca..8278bef7a6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -56363,8 +56363,31 @@ (define-public rust-simdutf8-0.1
 extensions.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-similar-2
+  (package
+    (name "rust-similar")
+    (version "2.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "similar" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1lw33na01r35h09s47jqhjgz3m29wapl20f6ybsla5d1cfgrf91f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bstr" ,rust-bstr-0.2) ("rust-serde" ,rust-serde-1)
+        ("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))
+    (home-page "https://github.com/mitsuhiko/similar")
+    (synopsis "A diff library for Rust")
+    (description "This package provides a diff library for Rust.")
+    (license license:asl2.0)))
+
 (define-public rust-similar-1
   (package
+    (inherit rust-similar-2)
     (name "rust-similar")
     (version "1.3.0")
     (source
@@ -56379,12 +56402,7 @@ (define-public rust-similar-1
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-bstr" ,rust-bstr-0.2)
-        ("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))
-    (home-page
-     "https://github.com/mitsuhiko/similar")
-    (synopsis "Diff library for Rust")
-    (description "This package provides a diff library for Rust.")
-    (license license:asl2.0)))
+        ("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))))
 
 (define-public rust-simplelog-0.11
   (package
-- 
2.36.1

[bug#56037] [PATCH 04/14] gnu: Add rust-snapbox-macros-0.2.

[Gabriel Arazas]

* gnu/packages/crates-io.scm (rust-snapbox-macros-0.2): New variable.
---
 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 8278bef7a6..aacbcfccf7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57548,6 +57548,28 @@ (define-public rust-snap-0.2
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-snappy-cpp" ,rust-snappy-cpp-0.1))))))
 
+(define-public rust-snapbox-macros-0.2
+  (package
+    (name "rust-snapbox-macros")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "snapbox-macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0c79lnjcs9yp62y665swv5y5y6088qc256bfr3s7xcnb0izfl7f0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://github.com/assert-rs/trycmd/tree/main/crates/snapbox")
+    (synopsis "Snapshot testing toolbox")
+    (description
+     "This package provides a snapshot-testing toolbox that
+captures from a variety of functions including from CLI stdout/stderr,
+function return values, and filesystem changes.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-snappy-cpp-0.1
   (package
     (name "rust-snappy-cpp")
-- 
2.36.1

[bug#56037] [PATCH 05/14] gnu: Add rust-snapbox-0.2.

[Gabriel Arazas]

* gnu/packages/crates-io.scm (rust-snapbox-0.2): New variable.
---
 gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index aacbcfccf7..f878fb83aa 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57548,6 +57548,44 @@ (define-public rust-snap-0.2
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-snappy-cpp" ,rust-snappy-cpp-0.1))))))
 
+(define-public rust-snapbox-0.2
+  (package
+    (name "rust-snapbox")
+    (version "0.2.10")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "snapbox" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "14zxmsi4k9a9vgp9vs1q62ff1k57p26rwp5xs6f9bdijl9fisykn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-backtrace" ,rust-backtrace-0.3) ("rust-concolor" ,rust-concolor-0.0.8)
+        ("rust-content-inspector" ,rust-content-inspector-0.2)
+        ("rust-document-features" ,rust-document-features-0.2)
+        ("rust-dunce" ,rust-dunce-1)
+        ("rust-filetime" ,rust-filetime-0.2)
+        ("rust-ignore" ,rust-ignore-0.4)
+        ("rust-libtest-mimic" ,rust-libtest-mimic-0.3)
+        ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3)
+        ("rust-os-pipe" ,rust-os-pipe-1)
+        ("rust-similar" ,rust-similar-2)
+        ("rust-snapbox-macros" ,rust-snapbox-macros-0.2)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-wait-timeout" ,rust-wait-timeout-0.2)
+        ("rust-walkdir" ,rust-walkdir-2)
+        ("rust-yansi" ,rust-yansi-0.5))))
+    (home-page "https://github.com/assert-rs/trycmd/tree/main/crates/snapbox")
+    (synopsis "Snapshot testing toolbox")
+    (description
+     "This package provides a snapshot-testing toolbox that
+captures from a variety of functions including from CLI stdout/stderr,
+function return values, and filesystem changes.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-snapbox-macros-0.2
   (package
     (name "rust-snapbox-macros")
-- 
2.36.1

[bug#56037] [PATCH 06/14] gnu: Add rust-libtest-mimic-0.3.

[Gabriel Arazas]

* gnu/packages/crates-io.scm (rust-libtest-mimic-0.3): New variable.
---
 gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f878fb83aa..7585568493 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31928,6 +31928,34 @@ (define-public rust-libsqlite3-sys-0.15
         ("rust-pkg-config" ,rust-pkg-config-0.3)
         ("rust-vcpkg" ,rust-vcpkg-0.2))))))
 
+(define-public rust-libtest-mimic-0.3
+  (package
+    (name "rust-libtest-mimic")
+    (version "0.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "libtest-mimic" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1bp2jllwpciljr14g6s9bk4835g46kszgrjwi66vxxsk3ynbi9q8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4) ("rust-rayon" ,rust-rayon-1)
+        ("rust-structopt" ,rust-structopt-0.3)
+        ("rust-termcolor" ,rust-termcolor-1))))
+    (home-page "https://github.com/LukasKalbertodt/libtest-mimic")
+    (synopsis
+     "Write your own test harness that looks and behaves like the built-in
+test harness used by @code{rustc --test}")
+    (description
+     "This package provides a small testing framework for command-line
+applications while behaving like the output results from @code{rustc --test},
+letting you focus on actual testing.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-libxml-0.3
   (package
     (name "rust-libxml")
-- 
2.36.1

[bug#56037] [PATCH 07/14] gnu: Add rust-textwrap-0.15.

[Gabriel Arazas]

* gnu/packages/crates-io.scm (rust-textwrap-0.15): New variable.
(rust-textwrap-0.12): Inherit and adjust.
---
 gnu/packages/crates-io.scm | 42 +++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7585568493..7226c46c87 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62461,8 +62461,39 @@ (define-public rust-text-size-1
     (description "This package provides a newtypes for text offsets")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-textwrap-0.15
+  (package
+    (name "rust-textwrap")
+    (version "0.15.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "textwrap" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1yw513k61lfiwgqrfvsjw1a5wpvm0azhpjr2kr0jhnq9c56is55i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-hyphenation" ,rust-hyphenation-0.8)
+        ("rust-smawk" ,rust-smawk-0.3)
+        ("rust-terminal-size" ,rust-terminal-size-0.1)
+        ("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1)
+        ("rust-unicode-width" ,rust-unicode-width-0.1))))
+    (home-page "https://github.com/mgeisler/textwrap")
+    (synopsis
+     "Powerful library for word wrapping, indenting, and dedenting strings")
+    (description
+     "Textwrap is a small library for word wrapping, indenting, and dedenting
+strings.  You can use it to format strings (such as help and error messages)
+for display in commandline applications.  It is designed to be efficient and
+handle Unicode characters correctly.")
+    (license license:expat)))
+
 (define-public rust-textwrap-0.12
   (package
+    (inherit rust-textwrap-0.15)
     (name "rust-textwrap")
     (version "0.12.1")
     (source
@@ -62480,16 +62511,7 @@ (define-public rust-textwrap-0.12
        #:cargo-inputs
        (("rust-hyphenation" ,rust-hyphenation-0.8)
         ("rust-terminal-size" ,rust-terminal-size-0.1)
-        ("rust-unicode-width" ,rust-unicode-width-0.1))))
-    (home-page
-     "https://github.com/mgeisler/textwrap")
-    (synopsis "Library for word wrapping, indenting, and dedenting strings")
-    (description
-     "Textwrap is a small library for word wrapping, indenting, and dedenting
-strings.  You can use it to format strings (such as help and error messages)
-for display in commandline applications.  It is designed to be efficient and
-handle Unicode characters correctly.")
-    (license license:expat)))
+        ("rust-unicode-width" ,rust-unicode-width-0.1))))))
 
 (define-public rust-textwrap-0.11
   (package
-- 
2.36.1

[bug#56037] [PATCH 08/14] gnu: Add rust-trycmd-0.13.

[Gabriel Arazas]

* gnu/packages/crates-io.scm (rust-trycmd-0.13): New variable.
---
 gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7226c46c87..5404e63aec 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66966,6 +66966,37 @@ (define-public rust-trust-dns-rustls-0.6
        (("rust-openssl" ,rust-openssl-0.10)
         ("rust-tokio" ,rust-tokio-0.1))))))
 
+(define-public rust-trycmd-0.13
+  (package
+    (name "rust-trycmd")
+    (version "0.13.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "trycmd" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "04wzh907rkxac5kxlai0s630qh9z122w2m1s2x14d46c4r8iid7z"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-escargot" ,rust-escargot-0.5) ("rust-glob" ,rust-glob-0.3)
+        ("rust-humantime" ,rust-humantime-2)
+        ("rust-humantime-serde" ,rust-humantime-serde-1)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-schemars" ,rust-schemars-0.8)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-shlex" ,rust-shlex-1)
+        ("rust-snapbox" ,rust-snapbox-0.2)
+        ("rust-toml-edit" ,rust-toml-edit-0.14))))
+    (home-page "https://github.com/assert-rs/trycmd")
+    (synopsis "Snapshot testing for a herd of CLI tests")
+    (description
+     "This package provides a framework for testing CLI applications.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-try-from-0.3
   (package
     (name "rust-try-from")
-- 
2.36.1

[bug#56037] [PATCH 09/14] gnu: Add rust-const-format-proc-macros-0.2.

[Gabriel Arazas]

* gnu/packages/crates-io.scm (rust-const-format-proc-macros-0.2): New variable.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5404e63aec..bd8383084e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12766,6 +12766,31 @@ (define-public rust-const-fn-0.4
 const functions with conditional compilations.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-const-format-proc-macros-0.2
+  (package
+    (name "rust-const-format-proc-macros")
+    (version "0.2.22")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "const_format_proc_macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0bdqnac7qfnn2gayxazvb148nczdxn37djyyly6s8y18jxfns6gg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1)
+        ("rust-unicode-xid" ,rust-unicode-xid-0.2))))
+    (home-page "https://github.com/rodrimati1992/const_format_crates/")
+    (synopsis "Implementation detail of the `const_format` crate")
+    (description
+     "This package contains implementation detail for @code{const_format}
+crate.")
+    (license license:zlib)))
+
 (define-public rust-const-oid-0.6
   (package
     (name "rust-const-oid")
-- 
2.36.1

[bug#56037] [PATCH 10/14] gnu: Add rust-const-format-0.2.

[Gabriel Arazas]

* gnu/packages/crates-io.scm (rust-const-format-0.2): New variable.
---
 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 bd8383084e..141d6146f2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12766,6 +12766,29 @@ (define-public rust-const-fn-0.4
 const functions with conditional compilations.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-const-format-0.2
+  (package
+    (name "rust-const-format")
+    (version "0.2.24")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "const_format" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "179p8ifww66rqivrzsbmwpryb183b4hh7f0wwhgflgx2lrpk38g6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-const-format-proc-macros" ,rust-const-format-proc-macros-0.2))
+       #:cargo-development-inputs
+       (("rust-arrayvec" ,rust-arrayvec-0.5) ("rust-fastrand" ,rust-fastrand-1))))
+    (home-page "https://github.com/rodrimati1992/const_format_crates/")
+    (synopsis "Compile-time string formatting")
+    (description
+     "This package provides types and macros for formatting strings at
+compile-time.")
+    (license license:zlib)))
+
 (define-public rust-const-format-proc-macros-0.2
   (package
     (name "rust-const-format-proc-macros")
-- 
2.36.1

[bug#56037] [PATCH 11/14] gnu: Add rust-clap-lex-0.2.

[Gabriel Arazas]

* gnu/packages/crates-io.scm (rust-clap-lex-0.2): New variable.
---
 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 141d6146f2..83222059fd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11290,6 +11290,29 @@ (define-public rust-clap-2
         ("rust-version-sync" ,rust-version-sync-0.8))))
     (license license:expat)))
 
+(define-public rust-clap-lex-0.2
+  (package
+    (name "rust-clap-lex")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "clap_lex" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "04wjgd1d3rxsng70rczfzhc7lj87hmwzznhs1dp5xb9d27qkaz53"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-os-str-bytes" ,rust-os-str-bytes-6))))
+    (home-page "https://github.com/clap-rs/clap/tree/master/clap_lex")
+    (synopsis "Minimal, flexible command line parser")
+    (description
+     "This package provides a command line parser that will parse arguments
+into a steam of tokens.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-clearscreen-1
   (package
     (name "rust-clearscreen")
-- 
2.36.1

[bug#56037] [PATCH 12/14] gnu: rust-clap-derive-3: Update to 3.1.18.

[Gabriel Arazas]

* gnu/packages/crates-io.scm (rust-clap-derive-3): Update to 3.1.18.
(rust-clap-derive-3-beta): New variable and inherit above.
---
 gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 83222059fd..3d18a478dd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11190,6 +11190,34 @@ (define-public rust-clang-sys-0.11
 
 (define-public rust-clap-derive-3
   (package
+    (name "rust-clap-derive")
+    (version "3.1.18")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "clap_derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0g53w6qkqcc122bqh51jzfg51147il643idvq1czxkr2x5306ci5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-heck" ,rust-heck-0.4) ("rust-proc-macro-error" ,rust-proc-macro-error-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/clap-rs/clap/tree/master/clap_derive")
+    (synopsis
+     "Parse command line argument by defining a struct, derive crate.")
+    (description
+     "This package provides a parse command line argument by defining a struct,
+derive crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-clap-derive-3-beta
+  (package
+    (inherit rust-clap-derive-3)
     (name "rust-clap-derive")
     (version "3.0.0-beta.2")
     (source
@@ -11210,14 +11238,7 @@ (define-public rust-clap-derive-3
          ,rust-proc-macro-error-1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://clap.rs/")
-    (synopsis
-     "Parse command line argument by defining a struct, derive crate")
-    (description
-     "This package provides a parse command line argument by defining a struct,
-derive crate.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-clap-3
   (package
-- 
2.36.1

[bug#56037] [PATCH 12/14] gnu: rust-clap-derive-3: Update to 3.1.18.

[Maxime Devos]

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

Gabriel Arazas schreef op vr 17-06-2022 om 19:59 [+0800]:
> +                "0g53w6qkqcc122bqh51jzfg51147il643idvq1czxkr2x5306ci5"))))

FWIW, this hash matched what I've got in antioxidant.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#56037] [PATCH 13/14] gnu: rust-clap-3: Update to 3.1.18.

[Gabriel Arazas]

* gnu/packages/crates-io.scm (rust-clap-3): Update to 3.1.18.
(rust-clap-3-beta): New variable and inherit above.
(zoxide): Replace rust-clap-3 with rust-clap-3-beta.
---
 gnu/packages/crates-io.scm | 55 ++++++++++++++++++++++++++++++++------
 gnu/packages/rust-apps.scm |  2 +-
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3d18a478dd..74f9bc8f81 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11242,6 +11242,51 @@ (define-public rust-clap-derive-3-beta
 
 (define-public rust-clap-3
   (package
+    (name "rust-clap")
+    (version "3.1.18")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "clap" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "02s4hk9hrmm2s1j7dkbwpyd75mfzx3p8ks2chmp4ccybv95xznyj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-backtrace" ,rust-backtrace-0.3)
+                       ("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-clap-derive" ,rust-clap-derive-3)
+                       ("rust-clap-lex" ,rust-clap-lex-0.2)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-strsim" ,rust-strsim-0.10)
+                       ("rust-termcolor" ,rust-termcolor-1)
+                       ("rust-terminal-size" ,rust-terminal-size-0.1)
+                       ("rust-textwrap" ,rust-textwrap-0.15)
+                       ("rust-unicase" ,rust-unicase-2)
+                       ("rust-yaml-rust" ,rust-yaml-rust-0.4))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3) ("rust-humantime" ,rust-humantime-2)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-shlex" ,rust-shlex-1)
+        ("rust-snapbox" ,rust-snapbox-0.2)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-trycmd" ,rust-trycmd-0.13))))
+    (home-page "https://github.com/clap-rs/clap")
+    (synopsis
+     "A simple to use, efficient, and full-featured Command Line Argument
+Parser")
+    (description
+     "This package provides a simple to use, efficient, and full-featured
+Command Line Argument Parser.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-clap-3-beta
+  (package
+    (inherit rust-clap-3)
     (name "rust-clap")
     (version "3.0.0-beta.2")
     (source
@@ -11258,7 +11303,7 @@ (define-public rust-clap-3
      `(#:cargo-inputs
        (("rust-atty" ,rust-atty-0.2)
         ("rust-bitflags" ,rust-bitflags-1)
-        ("rust-clap-derive" ,rust-clap-derive-3)
+        ("rust-clap-derive" ,rust-clap-derive-3-beta)
         ("rust-indexmap" ,rust-indexmap-1)
         ("rust-os-str-bytes" ,rust-os-str-bytes-2)
         ("rust-strsim" ,rust-strsim-0.10)
@@ -11272,13 +11317,7 @@ (define-public rust-clap-3
        (("rust-criterion" ,rust-criterion-0.3)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-regex" ,rust-regex-1)
-        ("rust-version-sync" ,rust-version-sync-0.8))))
-    (home-page "https://clap.rs/")
-    (synopsis "Command Line Argument Parser")
-    (description
-     "This package provides a simple to use, efficient, and full-featured
-Command Line Argument Parser.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-version-sync" ,rust-version-sync-0.8))))))
 
 (define-public rust-clap-2
   (package
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 6d97e289c2..d60fd1996e 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1771,7 +1771,7 @@ (define-public zoxide
        (("rust-anyhow" ,rust-anyhow-1)
         ("rust-askama" ,rust-askama-0.10)
         ("rust-bincode" ,rust-bincode-1)
-        ("rust-clap" ,rust-clap-3)
+        ("rust-clap" ,rust-clap-3-beta)
         ("rust-dirs-next" ,rust-dirs-next-2)
         ("rust-dunce" ,rust-dunce-1)
         ("rust-glob" ,rust-glob-0.3)
-- 
2.36.1

[bug#56037] [PATCH 14/14] gnu: hexyl: Update to 0.10.0.

[Gabriel Arazas]

* gnu/packages/rust-apps.scm (hexyl): Update to 0.10.0.
---
 gnu/packages/rust-apps.scm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index d60fd1996e..f353924898 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -527,7 +527,7 @@ (define-public fd
 (define-public hexyl
   (package
     (name "hexyl")
-    (version "0.8.0")
+    (version "0.10.0")
     (source
       (origin
         (method url-fetch)
@@ -536,14 +536,20 @@ (define-public hexyl
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0sipag77196467idbznbk5q5lwhqz85zw7y1pwg9b27jxqyk04rp"))))
+          "1pwdy5amrfgnzf3wfd3sdabvvd92vv99hl3n36bk4gzqspvj3z61"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-ansi-term" ,rust-ansi-term-0.12)
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-const-format" ,rust-const-format-0.2)
+        ("rust-ansi-term" ,rust-ansi-term-0.12)
         ("rust-atty" ,rust-atty-0.2)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-libc" ,rust-libc-0.2))))
+        ("rust-clap" ,rust-clap-3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-assert-cmd" ,rust-assert-cmd-2)
+        ("rust-predicates" ,rust-predicates-2))))
     (home-page "https://github.com/sharkdp/hexyl")
     (synopsis "Command-line hex viewer")
     (description
-- 
2.36.1

[bug#56037] [PATCH] gnu: Update hexyl to 0.10

[Maxime Devos]

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

Gabriel Arazas schreef op vr 17-06-2022 om 19:55 [+0800]:
> Confirmed to build on x86_64-linux. Binaries for other architectures are 
> yet to be built, my laptop is not powerful enough to wait to build Rust.

Rust on Guix does not support other architectures yet.
Also, I've been changing how rust crates work in antioxidant[0]
(not yet merged in Guix, not all build failures have been fixed yet).
Antioxidant makes Rust packaging simpler and faster, so maybe you could
give it a try.

To fix some of the resulting build failures, some crates have been
updated there (e.g., rust-clap, rust-clap-derive), so if you are
interested and don't mind the extra time required until it's ready for
merging back into Guix, maybe you could give [0] a try to reduce
duplicated effort a little?

[0] https://notabug.org/maximed/cargoless-rust-experiments/

Greetings,
Maxime

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#56037] [PATCH] gnu: Update hexyl to 0.10

[Maxime Devos]

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

Maxime Devos schreef op vr 17-06-2022 om 19:11 [+0200]:
> Gabriel Arazas schreef op vr 17-06-2022 om 19:55 [+0800]:
> > Confirmed to build on x86_64-linux. Binaries for other architectures are 
> > yet to be built, my laptop is not powerful enough to wait to build Rust.
> 
> Rust on Guix does not support other architectures yet.
> Also, I've been changing how rust crates work in antioxidant[0]
> (not yet merged in Guix, not all build failures have been fixed yet).
> Antioxidant makes Rust packaging simpler and faster, so maybe you could
> give it a try.
> 
> To fix some of the resulting build failures, some crates have been
> updated there (e.g., rust-clap, rust-clap-derive), so if you are
> interested and don't mind the extra time required until it's ready for
> merging back into Guix, maybe you could give [0] a try to reduce
> duplicated effort a little?

TBC, you don't have to, just using the system currently in place in
Guix is fine!

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#56037] [PATCH] gnu: Update hexyl to 0.10

[Gabriel Arazas]

Nice! Any efforts to make Rust packaging effort is appreciated. I'll 
report back on this thread on using this build system.

On 6/18/22 01:11, Maxime Devos wrote:
> Also, I've been changing how rust crates work in antioxidant[0]
> (not yet merged in Guix, not all build failures have been fixed yet).
> Antioxidant makes Rust packaging simpler and faster, so maybe you could
> give it a try.
> 
> To fix some of the resulting build failures, some crates have been
> updated there (e.g., rust-clap, rust-clap-derive), so if you are
> interested and don't mind the extra time required until it's ready for
> merging back into Guix, maybe you could give [0] a try to reduce
> duplicated effort a little?

[bug#56037] [PATCH] gnu: Update hexyl to 0.10

[Maxime Devos]

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

Gabriel Arazas schreef op ma 20-06-2022 om 18:33 [+0800]:
> Nice! Any efforts to make Rust packaging effort is appreciated. I'll 
> report back on this thread on using this build system.

To be clear antioxidant is rather new and the codebase is currently
focused more on automatically rewriting cargo package definitions to
antioxidant package definitions than directly helping with writing
package definitions (new rust+guix documentation needs to be written,
the importer needs to be modified, etc.), so I wouldn't recommmend it
if you're new to Scheme and Guix (I don't know if that's the case or
not).

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#56037] [PATCH] gnu: Update hexyl to 0.10

[antlers]

Hi! Thanks for putting these together. I've been able to use them
while packaging another program for personal use, and while they're
working great, we might have a few things to polish before they're
clean enough to merge; in particular, I noticed some low hanging
warnings when running `guix lint`.

The package list as I collected it goes like so:
```
make; ./pre-inst-env guix lint \
    hexyl rust-clap rust-clap-derive rust-clap-lex rust-const-format \
    rust-const-format-proc-macros rust-trycmd rust-textwrap rust-libtest-mimic \
    rust-snapbox rust-snapbox-macros rust-similar rust-toml-edit rust-kstring
```

If you've got time to take a look, I'd love to see these patches flow
upstream, and if you don't, I could probably make time to give it a go
myself within the next ~two weeks-- if you wouldn't mind c:
Disclaimer being that I'm very new to Guix myself, and have no
experience with Rust at all-- but figure that shouldn't impede
polishing minor update patches.