[bug#57702] [PATCH 0/8] Update rust-clap-3 to 3.2.17

[bug#57702] [PATCH 0/8] Update rust-clap-3 to 3.2.17

[VesselWave via Guix-patches via]

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

This package is one of dependecies of Alacritty terminal. rust-clap should be updated to update Alacritty

Vessel Wave (8):
gnu: Add rust-unic-emoji-char-0.9.
gnu: rust-textwrap: Add 0.15.0.
gnu: rust-crossbeam-utils-0.8: Add development inputs.
gnu: rust-parking-lot-core: Inrerit from latest.
gnu: rust-once-cell-1: Update to 1.13.1.
gnu: Add rust-clap-lex-0.2.
gnu: rust-clap-derive-3: Update to 3.2.17.
gnu: rust-clap-3: Update to 3.2.17.

gnu/packages/crates-io.scm | 157 +++++++++++++++++++++++++++----------
1 file changed, 116 insertions(+), 41 deletions(-)

base-commit: b9e0aff9dcd727ddf106592dc92f3f9b0fb5eedf
--2.37.2

[-- Attachment #2: Type: text/html, Size: 1156 bytes --]

[bug#57702] [PATCH v2 1/8] gnu: Add rust-unic-emoji-char-0.9.

[VesselWave via Guix-patches via]

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

---
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 02f7bc7d4d..a82515f73e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -69234,6 +69234,29 @@ (define-public rust-unic-common-0.9
Internationalization Crates (UNIC) project.")
(license (list license:expat license:asl2.0))))

+(define-public rust-unic-emoji-char-0.9
+ (package
+ (name "rust-unic-emoji-char")
+ (version "0.9.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "unic-emoji-char" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0ka9fr7s6lv0z43r9xphg9injn35pfxf9g9q18ki0wl9d0g241qb"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-unic-property-char" ,rust-unic-char-property-0.9)
+ ("rust-unic-char-range" ,rust-unic-char-range-0.9)
+ ("rust-unic-ucd-version" ,rust-unic-ucd-version-0.9))))
+ (home-page "https://github.com/open-i18n/rust-unic/")
+ (synopsis "Emoji character properties for UNIC")
+ (description "This package provides emoji character properties and for
+the Unicode and Internationalization Crates (UNIC) project.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-unic-segment-0.9
(package
(name "rust-unic-segment")
--2.37.2

[-- Attachment #2: Type: text/html, Size: 3126 bytes --]

[bug#57702] [PATCH v2 2/8] gnu: rust-textwrap: Add 0.15.0.

[VesselWave via Guix-patches via]

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

---
gnu/packages/crates-io.scm | 50 +++++++++++++++++++++++++++++---------
1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a82515f73e..46cd5c7a85 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63836,8 +63836,45 @@ (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))
+ #:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.3)
+ ("rust-lipsum" ,rust-lipsum-0.8)
+ ("rust-termion" ,rust-termion-1)
+ ("rust-unic-emoji-char" ,rust-unic-emoji-char-0.9)
+ ("rust-version-sync" ,rust-version-sync-0.9))))
+ (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)))
+
(define-public rust-textwrap-0.12
(package
+ (inherit rust-textwrap-0.15)
(name "rust-textwrap")
(version "0.12.1")
(source
@@ -63855,20 +63892,11 @@ (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
- (inherit rust-textwrap-0.12)
+ (inherit rust-textwrap-0.15)
(name "rust-textwrap")
(version "0.11.0")
(source
--2.37.2

[-- Attachment #2: Type: text/html, Size: 6202 bytes --]

[bug#57702] [PATCH v2 3/8] gnu: rust-crossbeam-utils-0.8: Add development inputs.

[VesselWave via Guix-patches via]

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

---
gnu/packages/crates-io.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 46cd5c7a85..da9f249634 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14799,7 +14799,10 @@ (define-public rust-crossbeam-utils-0.8
`(#:cargo-inputs
(("rust-cfg-if" ,rust-cfg-if-1)
("rust-loom" ,rust-loom-0.5)
- ("rust-once-cell" ,rust-once-cell-1))))
+ ("rust-once-cell" ,rust-once-cell-1))
+ #:cargo-development-inputs
+ (("rust-rand" ,rust-rand-0.8)
+ ("rust-rustversion" ,rust-rustversion-1))))
(home-page
"https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils")
(synopsis "Utilities for concurrent programming")
--2.37.2

[-- Attachment #2: Type: text/html, Size: 1806 bytes --]

[bug#57702] [PATCH v2 4/8] gnu: rust-parking-lot-core: Inrerit from latest.

[VesselWave via Guix-patches via]

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

---
gnu/packages/crates-io.scm | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index da9f249634..9232143600 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41747,6 +41747,7 @@ (define-public rust-parking-lot-core-0.9

(define-public rust-parking-lot-core-0.8
(package
+ (inherit rust-parking-lot-core-0.9)
(name "rust-parking-lot-core")
(version "0.8.4")
(source
@@ -41764,7 +41765,6 @@ (define-public rust-parking-lot-core-0.8
;; that works well, really.
(substitute* "Cargo.toml"
(("0\\.3\\.60") "0.3.56"))))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-backtrace" ,rust-backtrace-0.3)
@@ -41775,16 +41775,11 @@ (define-public rust-parking-lot-core-0.8
("rust-redox-syscall" ,rust-redox-syscall-0.2)
("rust-smallvec" ,rust-smallvec-1)
("rust-thread-id" ,rust-thread-id-4)
- ("rust-winapi" ,rust-winapi-0.3))))
- (home-page "https://github.com/Amanieu/parking_lot")
- (synopsis "API for creating custom synchronization primitives")
- (description "This package provides an advanced API for creating custom
-synchronization primitives.")
- (license (list license:asl2.0 license:expat))))
+ ("rust-winapi" ,rust-winapi-0.3))))))

(define-public rust-parking-lot-core-0.7
(package
- (inherit rust-parking-lot-core-0.8)
+ (inherit rust-parking-lot-core-0.9)
(name "rust-parking-lot-core")
(version "0.7.2")
(source
@@ -41810,7 +41805,7 @@ (define-public rust-parking-lot-core-0.7

(define-public rust-parking-lot-core-0.6
(package
- (inherit rust-parking-lot-core-0.7)
+ (inherit rust-parking-lot-core-0.9)
(name "rust-parking-lot-core")
(version "0.6.2")
(source
--2.37.2

[-- Attachment #2: Type: text/html, Size: 3937 bytes --]

[bug#57702] [PATCH v2 5/8] gnu: rust-once-cell-1: Update to 1.13.1.

[VesselWave via Guix-patches via]

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

---
gnu/packages/crates-io.scm | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9232143600..198ab55444 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40167,20 +40167,19 @@ (define-public rust-onig-sys-69.2
(define-public rust-once-cell-1
(package
(name "rust-once-cell")
- (version "1.13.0")
+ (version "1.13.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "once_cell" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32
- "1qfqvgnwfzzwxd13ybvplzshaqwnjnna9ghcn0zgijaq0zixp9hq"))))
+ (base32 "0kjyjf8yhm1rv5af0f0g7y66mzdy1l1865mr9sw76jbb43d68j07"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-atomic-polyfill" ,rust-atomic-polyfill-0.1)
- ("rust-parking-lot-core" ,rust-parking-lot-core-0.9))
+ (("rust-atomic-polyfill" ,rust-atomic-polyfill-1)
+ ("rust-parking-lot" ,rust-parking-lot-core-0.9))
#:cargo-development-inputs
(("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
("rust-lazy-static" ,rust-lazy-static-1)
--2.37.2

[-- Attachment #2: Type: text/html, Size: 2627 bytes --]

[bug#57702] [PATCH v2 6/8] gnu: Add rust-clap-lex-0.2.

[VesselWave via Guix-patches via]

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

---
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 198ab55444..001f33aea8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11473,6 +11473,27 @@ (define-public rust-clang-sys-0.11
("rust-libc" ,rust-libc-0.2)
("rust-libloading" ,rust-libloading-0.3))))))

+(define-public rust-clap-lex-0.2
+ (package
+ (name "rust-clap-lex")
+ (version "0.2.4")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "clap_lex" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18"))))
+ (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 minimal, flexible command line parser")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-clap-derive-3
(package
(name "rust-clap-derive")
--2.37.2

[-- Attachment #2: Type: text/html, Size: 2907 bytes --]

[bug#57702] [PATCH v2 7/8] gnu: rust-clap-derive-3: Update to 3.2.17.

[VesselWave via Guix-patches via]

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

---
gnu/packages/crates-io.scm | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 001f33aea8..fca82be244 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11497,7 +11497,7 @@ (define-public rust-clap-lex-0.2
(define-public rust-clap-derive-3
(package
(name "rust-clap-derive")
- (version "3.0.0-beta.2")
+ (version "3.2.17")
(source
(origin
(method url-fetch)
@@ -11506,14 +11506,13 @@ (define-public rust-clap-derive-3
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "18cn82jhcha7m0nkpi1a03jx8k7aaq5kxfcxnsqpaa8ih5dp23rp"))))
+ "1ypf8r7cyfcgg29cgdp837sgvyd8mlq7g5pqx2hb86n029q7ym0k"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
- (("rust-heck" ,rust-heck-0.3)
- ("rust-proc-macro-error"
- ,rust-proc-macro-error-1)
+ (("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))))
--2.37.2

[-- Attachment #2: Type: text/html, Size: 2702 bytes --]

[bug#57702] [PATCH v2 8/8] gnu: rust-clap-3: Update to 3.2.17.

[VesselWave via Guix-patches via]

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

---
gnu/packages/crates-io.scm | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fca82be244..6cd29f6458 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28,6 +28,7 @@
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2022 Evgenii Lepikhin <e.lepikhin@corp.mail.ru>
;;; Copyright © 2022 Gabriel Arazas <foo.dogsquared@gmail.com>
+;;; Copyright © 2022 Vladyslav Vasko <vesselwave@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -11527,7 +11528,7 @@ (define-public rust-clap-derive-3
(define-public rust-clap-3
(package
(name "rust-clap")
- (version "3.0.0-beta.2")
+ (version "3.2.17")
(source
(origin
(method url-fetch)
@@ -11536,27 +11537,34 @@ (define-public rust-clap-3
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0hm1kivw6190rxbfqhdr4hqwlrijvwh90i3d9dyyw0d5k0chdlab"))))
+ "0jwm3hbq01cqm5ci1vj2655ky9nyvz19r31jncxk86ckink29rr9"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs
+ `(#:skip-build? #t
+ #: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-os-str-bytes" ,rust-os-str-bytes-2)
+ ("rust-once-cell" ,rust-once-cell-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.12)
- ("rust-unicode-width" ,rust-unicode-width-0.1)
- ("rust-vec-map" ,rust-vec-map-0.8)
+ ("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-lazy-static" ,rust-lazy-static-1)
+ (("rust-humantime" ,rust-humantime-2)
("rust-regex" ,rust-regex-1)
- ("rust-version-sync" ,rust-version-sync-0.8))))
+ ("rust-rustversion" ,rust-rustversion-1)
+ ("rust-shlex" ,rust-shlex-1)
+ ("rust-snapbox-0.2" ,rust-snapbox-0.2)
+ ("rust-static-assertions" ,rust-static-assertions-1)
+ ("rust-trybuild" ,rust-trybuild-1)
+ ("rust-trycmd" ,rust-trycmd-0.13))))
(home-page "https://clap.rs/")
(synopsis "Command Line Argument Parser")
(description
--2.37.2

[-- Attachment #2: Type: text/html, Size: 6071 bytes --]

[bug#57702] [PATCH v2 0/8] gnu: rust-clap-3: Update to 3.2.17.

[VesselWave via Guix-patches via]

This package is one of dependecies of Alacritty terminal. rust-clap should be updated to update Alacritty

Vessel Wave (8):
  gnu: Add rust-unic-emoji-char-0.9.
  gnu: rust-textwrap: Add 0.15.0.
  gnu: rust-crossbeam-utils-0.8: Add development inputs.
  gnu: rust-parking-lot-core: Inrerit from latest.
  gnu: rust-once-cell-1: Update to 1.13.1.
  gnu: Add rust-clap-lex-0.2.
  gnu: rust-clap-derive-3: Update to 3.2.17.
  gnu: rust-clap-3: Update to 3.2.17.

 gnu/packages/crates-io.scm | 158 +++++++++++++++++++++++++++----------
 1 file changed, 117 insertions(+), 41 deletions(-)


base-commit: b9e0aff9dcd727ddf106592dc92f3f9b0fb5eedf
--
2.37.2

[bug#57702] [PATCH 1/8] gnu: Add rust-unic-emoji-char-0.9.

[VesselWave via Guix-patches via]

---
 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 02f7bc7d4d..a82515f73e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -69234,6 +69234,29 @@ (define-public rust-unic-common-0.9
 Internationalization Crates (UNIC) project.")
     (license (list license:expat license:asl2.0))))

+(define-public rust-unic-emoji-char-0.9
+  (package
+    (name "rust-unic-emoji-char")
+    (version "0.9.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "unic-emoji-char" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ka9fr7s6lv0z43r9xphg9injn35pfxf9g9q18ki0wl9d0g241qb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-unic-property-char" ,rust-unic-char-property-0.9)
+                       ("rust-unic-char-range" ,rust-unic-char-range-0.9)
+                       ("rust-unic-ucd-version" ,rust-unic-ucd-version-0.9))))
+    (home-page "https://github.com/open-i18n/rust-unic/")
+    (synopsis "Emoji character properties for UNIC")
+    (description "This package provides emoji character properties and for
+the Unicode and Internationalization Crates (UNIC) project.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-unic-segment-0.9
   (package
     (name "rust-unic-segment")
--
2.37.2

[bug#57702] [PATCH v2 1/8] gnu: Add rust-unic-emoji-char-0.9.

[( via Guix-patches via]

Hi VesselWave,

On Fri Sep 9, 2022 at 5:03 PM BST, VesselWave via Guix-patches via wrote:
> +(define-public rust-unic-emoji-char-0.9
> + (package
> + (name "rust-unic-emoji-char")
> + (version "0.9.0")
> + (source (origin
> + (method url-fetch)
> + (uri (crate-uri "unic-emoji-char" version))
> + (file-name (string-append name "-" version ".tar.gz"))
> + (sha256
> + (base32
> + "0ka9fr7s6lv0z43r9xphg9injn35pfxf9g9q18ki0wl9d0g241qb"))))
> + (build-system cargo-build-system)
> + (arguments
> + `(#:skip-build? #t
> + #:cargo-inputs (("rust-unic-property-char" ,rust-unic-char-property-0.9)
> + ("rust-unic-char-range" ,rust-unic-char-range-0.9)
> + ("rust-unic-ucd-version" ,rust-unic-ucd-version-0.9))))
> + (home-page "https://github.com/open-i18n/rust-unic/")
> + (synopsis "Emoji character properties for UNIC")
> + (description "This package provides emoji character properties and for
> +the Unicode and Internationalization Crates (UNIC) project.")
> + (license (list license:expat license:asl2.0))))

That's some... interesting indentation you've got going on there :)
Could you please change this patchset to match the project standard
like this?

> +(define-public rust-unic-emoji-char-0.9
> +  (package
> +    (name "rust-unic-emoji-char")
> +    (version "0.9.0")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (crate-uri "unic-emoji-char" version))
> +              (file-name (string-append name "-" version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "0ka9fr7s6lv0z43r9xphg9injn35pfxf9g9q18ki0wl9d0g241qb"))))
> +    (build-system cargo-build-system)
> +    (arguments
> +     (list #:skip-build? #t
         ^^^^ note change of `(...) to (list ...), which is now the standard
> +           #:cargo-inputs `(("rust-unic-property-char" ,rust-unic-char-property-0.9)
                             ^ note the quoting of cargo-inputs, due to the change
                             ^ to (list ...)
> +                            ("rust-unic-char-range" ,rust-unic-char-range-0.9)
> +                            ("rust-unic-ucd-version" ,rust-unic-ucd-version-0.9))))
> +    (home-page "https://github.com/open-i18n/rust-unic")
> +    (synopsis "Emoji character properties for UNIC")
> +    (description
> +     "This package provides emoji character properties and for
> +the Unicode and Internationalization Crates (UNIC) project.")
> +    (license (list license:expat license:asl2.0))))

    -- (

[bug#57702] [PATCH v2 1/8] gnu: Add rust-unic-emoji-char-0.9.

[( via Guix-patches via]

Hmm, now that I look closer, it appears to be affecting even packages that
existed previously, so maybe it's your email client hijacking the formatting?

    -- (

[bug#57702] [PATCH 1/8] gnu: Add rust-unic-emoji-char-0.9.

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 1588 bytes --]



On 09-09-2022 20:05, VesselWave via Guix-patches via wrote:
> 
> ---
>   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 02f7bc7d4d..a82515f73e 100644
> --- a/gnu/packages/crates-io.scm
> +++ b/gnu/packages/crates-io.scm
> @@ -69234,6 +69234,29 @@ (define-public rust-unic-common-0.9
>   Internationalization Crates (UNIC) project.")
>       (license (list license:expat license:asl2.0))))
> 
> +(define-public rust-unic-emoji-char-0.9
> +  (package
> +    (name "rust-unic-emoji-char")
> +    (version "0.9.0")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (crate-uri "unic-emoji-char" version))
> +              (file-name (string-append name "-" version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "0ka9fr7s6lv0z43r9xphg9injn35pfxf9g9q18ki0wl9d0g241qb"))))

This contains various binaries (i.e., non-source, I don't mean it in the 
executable sense), see the .rsv files in 
<https://github.com/open-i18n/rust-unic/tree/master/unic/emoji/char/tables>

> // WARNING: Auto-generated by the `unic-gen` crate.
> // WARNING: DO NOT EDIT MANUALLY!


they need to be built from source instead, presumably with this 
`unic-gen`.  To make sure the binaries aren't used, they can be removed 
in the origin, with snippet ('delete-file-recursively' can be useful). 
A post-unpack phase can be useful for regenerating these binaries.

Greetings,
Maxime.

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#57702] [PATCH 2/8] gnu: rust-textwrap: Add 0.15.0.

[VesselWave via Guix-patches via]

All v2 was sent via 'Rich text' and have broken indentation. New are sent via plain text.

---
 gnu/packages/crates-io.scm | 50 +++++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a82515f73e..46cd5c7a85 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63836,8 +63836,45 @@ (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))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-lipsum" ,rust-lipsum-0.8)
+        ("rust-termion" ,rust-termion-1)
+        ("rust-unic-emoji-char" ,rust-unic-emoji-char-0.9)
+        ("rust-version-sync" ,rust-version-sync-0.9))))
+    (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)))
+
 (define-public rust-textwrap-0.12
   (package
+    (inherit rust-textwrap-0.15)
     (name "rust-textwrap")
     (version "0.12.1")
     (source
@@ -63855,20 +63892,11 @@ (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
-    (inherit rust-textwrap-0.12)
+    (inherit rust-textwrap-0.15)
     (name "rust-textwrap")
     (version "0.11.0")
     (source
--
2.37.2

[bug#57702] [PATCH 3/8] gnu: rust-crossbeam-utils-0.8: Add development inputs.

[VesselWave via Guix-patches via]

---
 gnu/packages/crates-io.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 46cd5c7a85..da9f249634 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14799,7 +14799,10 @@ (define-public rust-crossbeam-utils-0.8
      `(#:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-loom" ,rust-loom-0.5)
-        ("rust-once-cell" ,rust-once-cell-1))))
+        ("rust-once-cell" ,rust-once-cell-1))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.8)
+        ("rust-rustversion" ,rust-rustversion-1))))
     (home-page
      "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils")
     (synopsis "Utilities for concurrent programming")
--
2.37.2

[bug#57702] [PATCH 4/8] gnu: rust-parking-lot-core: Inrerit from latest.

[VesselWave via Guix-patches via]

---
 gnu/packages/crates-io.scm | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index da9f249634..9232143600 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41747,6 +41747,7 @@ (define-public rust-parking-lot-core-0.9

 (define-public rust-parking-lot-core-0.8
   (package
+    (inherit rust-parking-lot-core-0.9)
     (name "rust-parking-lot-core")
     (version "0.8.4")
     (source
@@ -41764,7 +41765,6 @@ (define-public rust-parking-lot-core-0.8
            ;; that works well, really.
            (substitute* "Cargo.toml"
              (("0\\.3\\.60") "0.3.56"))))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-backtrace" ,rust-backtrace-0.3)
@@ -41775,16 +41775,11 @@ (define-public rust-parking-lot-core-0.8
         ("rust-redox-syscall" ,rust-redox-syscall-0.2)
         ("rust-smallvec" ,rust-smallvec-1)
         ("rust-thread-id" ,rust-thread-id-4)
-        ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/Amanieu/parking_lot")
-    (synopsis "API for creating custom synchronization primitives")
-    (description "This package provides an advanced API for creating custom
-synchronization primitives.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-winapi" ,rust-winapi-0.3))))))

 (define-public rust-parking-lot-core-0.7
   (package
-    (inherit rust-parking-lot-core-0.8)
+    (inherit rust-parking-lot-core-0.9)
     (name "rust-parking-lot-core")
     (version "0.7.2")
     (source
@@ -41810,7 +41805,7 @@ (define-public rust-parking-lot-core-0.7

 (define-public rust-parking-lot-core-0.6
   (package
-    (inherit rust-parking-lot-core-0.7)
+    (inherit rust-parking-lot-core-0.9)
     (name "rust-parking-lot-core")
     (version "0.6.2")
     (source
--
2.37.2

[bug#57702] [PATCH 5/8] gnu: rust-once-cell-1: Update to 1.13.1.

[VesselWave via Guix-patches via]

---
 gnu/packages/crates-io.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9232143600..198ab55444 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40167,20 +40167,19 @@ (define-public rust-onig-sys-69.2
 (define-public rust-once-cell-1
   (package
     (name "rust-once-cell")
-    (version "1.13.0")
+    (version "1.13.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "once_cell" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1qfqvgnwfzzwxd13ybvplzshaqwnjnna9ghcn0zgijaq0zixp9hq"))))
+        (base32 "0kjyjf8yhm1rv5af0f0g7y66mzdy1l1865mr9sw76jbb43d68j07"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-atomic-polyfill" ,rust-atomic-polyfill-0.1)
-        ("rust-parking-lot-core" ,rust-parking-lot-core-0.9))
+       (("rust-atomic-polyfill" ,rust-atomic-polyfill-1)
+        ("rust-parking-lot" ,rust-parking-lot-core-0.9))
        #:cargo-development-inputs
        (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
         ("rust-lazy-static" ,rust-lazy-static-1)
--
2.37.2

[bug#57702] [PATCH 6/8] gnu: Add rust-clap-lex-0.2.

[VesselWave via Guix-patches via]

---
 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 198ab55444..001f33aea8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11473,6 +11473,27 @@ (define-public rust-clang-sys-0.11
         ("rust-libc" ,rust-libc-0.2)
         ("rust-libloading" ,rust-libloading-0.3))))))

+(define-public rust-clap-lex-0.2
+  (package
+    (name "rust-clap-lex")
+    (version "0.2.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "clap_lex" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18"))))
+    (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 minimal, flexible command line parser")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-clap-derive-3
   (package
     (name "rust-clap-derive")
--
2.37.2

[bug#57702] [PATCH 7/8] gnu: rust-clap-derive-3: Update to 3.2.17.

[VesselWave via Guix-patches via]

---
 gnu/packages/crates-io.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 001f33aea8..fca82be244 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11497,7 +11497,7 @@ (define-public rust-clap-lex-0.2
 (define-public rust-clap-derive-3
   (package
     (name "rust-clap-derive")
-    (version "3.0.0-beta.2")
+    (version "3.2.17")
     (source
      (origin
        (method url-fetch)
@@ -11506,14 +11506,13 @@ (define-public rust-clap-derive-3
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "18cn82jhcha7m0nkpi1a03jx8k7aaq5kxfcxnsqpaa8ih5dp23rp"))))
+         "1ypf8r7cyfcgg29cgdp837sgvyd8mlq7g5pqx2hb86n029q7ym0k"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-heck" ,rust-heck-0.3)
-        ("rust-proc-macro-error"
-         ,rust-proc-macro-error-1)
+       (("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))))
--
2.37.2

[bug#57702] [PATCH 8/8] gnu: rust-clap-3: Update to 3.2.17.

[VesselWave via Guix-patches via]

---
 gnu/packages/crates-io.scm | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fca82be244..6cd29f6458 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28,6 +28,7 @@
 ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2022 Evgenii Lepikhin <e.lepikhin@corp.mail.ru>
 ;;; Copyright © 2022 Gabriel Arazas <foo.dogsquared@gmail.com>
+;;; Copyright © 2022 Vladyslav Vasko <vesselwave@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -11527,7 +11528,7 @@ (define-public rust-clap-derive-3
 (define-public rust-clap-3
   (package
     (name "rust-clap")
-    (version "3.0.0-beta.2")
+    (version "3.2.17")
     (source
      (origin
        (method url-fetch)
@@ -11536,27 +11537,34 @@ (define-public rust-clap-3
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0hm1kivw6190rxbfqhdr4hqwlrijvwh90i3d9dyyw0d5k0chdlab"))))
+         "0jwm3hbq01cqm5ci1vj2655ky9nyvz19r31jncxk86ckink29rr9"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #: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-os-str-bytes" ,rust-os-str-bytes-2)
+        ("rust-once-cell" ,rust-once-cell-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.12)
-        ("rust-unicode-width" ,rust-unicode-width-0.1)
-        ("rust-vec-map" ,rust-vec-map-0.8)
+        ("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-lazy-static" ,rust-lazy-static-1)
+       (("rust-humantime" ,rust-humantime-2)
         ("rust-regex" ,rust-regex-1)
-        ("rust-version-sync" ,rust-version-sync-0.8))))
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-shlex" ,rust-shlex-1)
+        ("rust-snapbox-0.2" ,rust-snapbox-0.2)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-trycmd" ,rust-trycmd-0.13))))
     (home-page "https://clap.rs/")
     (synopsis "Command Line Argument Parser")
     (description
--
2.37.2

[bug#57702] [PATCH 1/8] gnu: Add rust-nic-emoji-char-0.9.

[VesselWave via Guix-patches via]

[PATCH v3 1/8] gnu: Add rust-nic-emoji-char-0.9.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 02f7bc7d4d..a130651c0b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -69234,6 +69234,30 @@ (define-public rust-unic-common-0.9
 Internationalization Crates (UNIC) project.")
     (license (list license:expat license:asl2.0))))

+(define-public rust-unic-emoji-char-0.9
+  (package
+    (name "rust-unic-emoji-char")
+    (version "0.9.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "unic-emoji-char" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ka9fr7s6lv0z43r9xphg9injn35pfxf9g9q18ki0wl9d0g241qb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-unic-property-char" ,rust-unic-char-property-0.9)
+                       ("rust-unic-char-range" ,rust-unic-char-range-0.9)
+                       ("rust-unic-ucd-version" ,rust-unic-ucd-version-0.9))))
+    (home-page "https://github.com/open-i18n/rust-unic/")
+    (synopsis "Emoji character properties for UNIC")
+    (description
+     "This package provides emoji character properties and for
+the Unicode and Internationalization Crates (UNIC) project.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-unic-segment-0.9
   (package
     (name "rust-unic-segment")
--
2.37.2

[bug#57702] [PATCH v4 1/8] gnu: Add rust-nic-emoji-char-0.9.

[VesselWave via Guix-patches via]

Sorry previous v3 was't different. Now it deletes tables directory. I hope it's enough
[PATCH 1/8] gnu: Add rust-unic-emoji-char-0.9.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 02f7bc7d4d..a130651c0b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -69234,6 +69234,32 @@ (define-public rust-unic-common-0.9
 Internationalization Crates (UNIC) project.")
     (license (list license:expat license:asl2.0))))

+(define-public rust-unic-emoji-char-0.9
+  (package
+    (name "rust-unic-emoji-char")
+    (version "0.9.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "unic-emoji-char" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ka9fr7s6lv0z43r9xphg9injn35pfxf9g9q18ki0wl9d0g241qb"))
+              (modules '((guix build utils)))
+              (snippet '(begin
+                          (delete-file-recursively "tables") #t))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-unic-char-range" ,rust-unic-char-range-0.9)
+                       ("rust-unic-property-char" ,rust-unic-char-property-0.9)
+                       ("rust-unic-ucd-version" ,rust-unic-ucd-version-0.9))))
+    (home-page "https://github.com/open-i18n/rust-unic/")
+    (synopsis "Emoji character properties for UNIC")
+    (description "This package provides emoji character properties and for
+the Unicode and Internationalization Crates (UNIC) project.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-unic-segment-0.9
   (package
     (name "rust-unic-segment")
--
2.37.2

[bug#57702] [PATCH v4 1/8] gnu: Add rust-nic-emoji-char-0.9.

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 1082 bytes --]



On 10-09-2022 11:38, VesselWave via Guix-patches via wrote:
> Sorry previous v3 was't different. Now it deletes tables directory. I hope it's enough
> [PATCH 1/8] gnu: Add rust-unic-emoji-char-0.9.

I've looked at the source code, and it seems to use the tables, without 
regenerating them.  As such, 'rust-unic-emoji-char' cannot be built 
(except for the #:skip-build? #true).  IIUC, the only reason that having 
this rust-unic-emoji-char be a dependency of rust-textwrap works, is 
that it is a test-only (optional!) input and it has #:skip-build? #true.

My proposal then is to:

   * for now, not package rust-unic-emoji-char
     (as it appears to be non-functional)
   * comment-out the rust-unic-emoji-char from the
     #:cargo-development-inputs
   * if this causes build failures because of Cargo not finding the
     source code of rust-unic-emoji-char, remove the input from
     rust-textwrap's Cargo.toml.

> +                          (delete-file-recursively "tables") #t))))

Returning #t isn't necessary anymore.

Greetings,
Maxime.

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#57702] [PATCH 1/8] gnu: rust-termion: Update to 1.5.6.

[VesselWave via Guix-patches via]

Termion is an another dependency to textwrap. Maybe I should also relax version requirement of termion for textwrap from ^1.5.6 to ^1.5
---
 gnu/packages/crates-io.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 02f7bc7d4d..8a91ee3adc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63613,15 +63613,15 @@ (define-public rust-terminfo-0.6
 (define-public rust-termion-1
   (package
     (name "rust-termion")
-    (version "1.5.5")
+    (version "1.5.6")
     (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "termion" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "01f9787d5nx445bqbj644v38bn0hl2swwjy9baz0dnbqi6fyqb62"))))
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "termion" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0zk023f0zkws358ll399cawvwdnd0wg8wad4g61kz766xbi8aw87"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; Tests want a terminal.
--
2.37.2

[bug#57702] [PATCH 0/8] Update rust-clap-3 to 3.2.17

[VesselWave via Guix-patches via]

Vessel Wave (8):
  gnu: rust-termion-1: Update to 1.5.6.
  gnu: rust-textwrap: Add 0.15.0.
  gnu: rust-crossbeam-utils-0.8: Add development inputs.
  gnu: rust-parking-lot-core: Inrerit from latest.
  gnu: rust-once-cell-1: Update to 1.13.1.
  gnu: Add rust-clap-lex-0.2.
  gnu: rust-clap-derive-3: Update to 3.2.17.
  gnu: rust-clap-3: Update to 3.2.17.

 gnu/packages/crates-io.scm | 156 +++++++++++++++++++++++++------------
 1 file changed, 107 insertions(+), 49 deletions(-)


base-commit: b9e0aff9dcd727ddf106592dc92f3f9b0fb5eedf
--
2.37.2

[bug#57702] [PATCH 1/8] gnu: rust-termion-1: Update to 1.5.6.

[VesselWave via Guix-patches via]

Termion is another dependency to textwrap. Maybe I should also relax version requirement of termion for textwrap from ^1.5.6 to ^1.5. I changed commit message
---
 gnu/packages/crates-io.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 02f7bc7d4d..8a91ee3adc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63613,15 +63613,15 @@ (define-public rust-terminfo-0.6
 (define-public rust-termion-1
   (package
     (name "rust-termion")
-    (version "1.5.5")
+    (version "1.5.6")
     (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "termion" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "01f9787d5nx445bqbj644v38bn0hl2swwjy9baz0dnbqi6fyqb62"))))
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "termion" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0zk023f0zkws358ll399cawvwdnd0wg8wad4g61kz766xbi8aw87"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; Tests want a terminal.
--
2.37.2

[bug#57702] [PATCH 2/8] gnu: rust-textwrap: Add 0.15.0.

[VesselWave via Guix-patches via]

So I removed skip-build but added tests #f. Maybe you know a better way to remove unic-emoji-char from Cargo.toml?
---
 gnu/packages/crates-io.scm | 57 ++++++++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8a91ee3adc..707105dec3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63836,8 +63836,52 @@ (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"))
+              (modules '((guix build utils)))
+              (snippet
+               '(substitute* "Cargo.toml"
+                  ;; rust-unic-emoji-char contains binaries (non-source)
+                  ;; and is an optional dependency so it's deleted
+                  (("\\[dev-dependencies.unic-emoji-char\\]") "")
+                  (("version = \"0.9.0\"") "")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #: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))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-lipsum" ,rust-lipsum-0.8)
+        ("rust-termion" ,rust-termion-1)
+        ; ("rust-unic-emoji-char" ,rust-unic-emoji-char-0.9)
+        ("rust-version-sync" ,rust-version-sync-0.9))))
+    (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)))
+
 (define-public rust-textwrap-0.12
   (package
+    (inherit rust-textwrap-0.15)
     (name "rust-textwrap")
     (version "0.12.1")
     (source
@@ -63855,20 +63899,11 @@ (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
-    (inherit rust-textwrap-0.12)
+    (inherit rust-textwrap-0.15)
     (name "rust-textwrap")
     (version "0.11.0")
     (source
--
2.37.2

[bug#57702] [PATCH 3/8] gnu: rust-crossbeam-utils-0.8: Add development inputs.

[VesselWave via Guix-patches via]

---
 gnu/packages/crates-io.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 707105dec3..228af9d07a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14799,7 +14799,10 @@ (define-public rust-crossbeam-utils-0.8
      `(#:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-loom" ,rust-loom-0.5)
-        ("rust-once-cell" ,rust-once-cell-1))))
+        ("rust-once-cell" ,rust-once-cell-1))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.8)
+        ("rust-rustversion" ,rust-rustversion-1))))
     (home-page
      "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils")
     (synopsis "Utilities for concurrent programming")
--
2.37.2

[bug#57702] [PATCH 4/8] gnu: rust-parking-lot-core: Inrerit from latest.

[VesselWave via Guix-patches via]

---
 gnu/packages/crates-io.scm | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 228af9d07a..3d31a79ce3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41747,6 +41747,7 @@ (define-public rust-parking-lot-core-0.9

 (define-public rust-parking-lot-core-0.8
   (package
+    (inherit rust-parking-lot-core-0.9)
     (name "rust-parking-lot-core")
     (version "0.8.4")
     (source
@@ -41764,7 +41765,6 @@ (define-public rust-parking-lot-core-0.8
            ;; that works well, really.
            (substitute* "Cargo.toml"
              (("0\\.3\\.60") "0.3.56"))))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-backtrace" ,rust-backtrace-0.3)
@@ -41775,16 +41775,11 @@ (define-public rust-parking-lot-core-0.8
         ("rust-redox-syscall" ,rust-redox-syscall-0.2)
         ("rust-smallvec" ,rust-smallvec-1)
         ("rust-thread-id" ,rust-thread-id-4)
-        ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/Amanieu/parking_lot")
-    (synopsis "API for creating custom synchronization primitives")
-    (description "This package provides an advanced API for creating custom
-synchronization primitives.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-winapi" ,rust-winapi-0.3))))))

 (define-public rust-parking-lot-core-0.7
   (package
-    (inherit rust-parking-lot-core-0.8)
+    (inherit rust-parking-lot-core-0.9)
     (name "rust-parking-lot-core")
     (version "0.7.2")
     (source
@@ -41810,7 +41805,7 @@ (define-public rust-parking-lot-core-0.7

 (define-public rust-parking-lot-core-0.6
   (package
-    (inherit rust-parking-lot-core-0.7)
+    (inherit rust-parking-lot-core-0.9)
     (name "rust-parking-lot-core")
     (version "0.6.2")
     (source
--
2.37.2

[bug#57702] [PATCH 5/8] gnu: rust-once-cell-1: Update to 1.13.1.

[VesselWave via Guix-patches via]

---
 gnu/packages/crates-io.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3d31a79ce3..b7ce1dd7bf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40167,20 +40167,19 @@ (define-public rust-onig-sys-69.2
 (define-public rust-once-cell-1
   (package
     (name "rust-once-cell")
-    (version "1.13.0")
+    (version "1.13.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "once_cell" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1qfqvgnwfzzwxd13ybvplzshaqwnjnna9ghcn0zgijaq0zixp9hq"))))
+        (base32 "0kjyjf8yhm1rv5af0f0g7y66mzdy1l1865mr9sw76jbb43d68j07"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-atomic-polyfill" ,rust-atomic-polyfill-0.1)
-        ("rust-parking-lot-core" ,rust-parking-lot-core-0.9))
+       (("rust-atomic-polyfill" ,rust-atomic-polyfill-1)
+        ("rust-parking-lot" ,rust-parking-lot-core-0.9))
        #:cargo-development-inputs
        (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
         ("rust-lazy-static" ,rust-lazy-static-1)
--
2.37.2

[bug#57702] [PATCH 6/8] gnu: Add rust-clap-lex-0.2.

[VesselWave via Guix-patches via]

---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b7ce1dd7bf..b76fe52d2f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11473,6 +11473,26 @@ (define-public rust-clang-sys-0.11
         ("rust-libc" ,rust-libc-0.2)
         ("rust-libloading" ,rust-libloading-0.3))))))

+(define-public rust-clap-lex-0.2
+  (package
+    (name "rust-clap-lex")
+    (version "0.2.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "clap_lex" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18"))))
+    (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 minimal, flexible command line parser")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-clap-derive-3
   (package
     (name "rust-clap-derive")
--
2.37.2

[bug#57702] [PATCH 7/8] gnu: rust-clap-derive-3: Update to 3.2.17.

[VesselWave via Guix-patches via]

---
 gnu/packages/crates-io.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b76fe52d2f..0d42f50dc5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11496,7 +11496,7 @@ (define-public rust-clap-lex-0.2
 (define-public rust-clap-derive-3
   (package
     (name "rust-clap-derive")
-    (version "3.0.0-beta.2")
+    (version "3.2.17")
     (source
      (origin
        (method url-fetch)
@@ -11505,14 +11505,13 @@ (define-public rust-clap-derive-3
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "18cn82jhcha7m0nkpi1a03jx8k7aaq5kxfcxnsqpaa8ih5dp23rp"))))
+         "1ypf8r7cyfcgg29cgdp837sgvyd8mlq7g5pqx2hb86n029q7ym0k"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-heck" ,rust-heck-0.3)
-        ("rust-proc-macro-error"
-         ,rust-proc-macro-error-1)
+       (("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))))
--
2.37.2

[bug#57702] [PATCH 8/8] gnu: rust-clap-3: Update to 3.2.17.

[VesselWave via Guix-patches via]

---
 gnu/packages/crates-io.scm | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0d42f50dc5..dac60e9f63 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11526,7 +11526,7 @@ (define-public rust-clap-derive-3
 (define-public rust-clap-3
   (package
     (name "rust-clap")
-    (version "3.0.0-beta.2")
+    (version "3.2.17")
     (source
      (origin
        (method url-fetch)
@@ -11535,27 +11535,34 @@ (define-public rust-clap-3
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0hm1kivw6190rxbfqhdr4hqwlrijvwh90i3d9dyyw0d5k0chdlab"))))
+         "0jwm3hbq01cqm5ci1vj2655ky9nyvz19r31jncxk86ckink29rr9"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #: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-os-str-bytes" ,rust-os-str-bytes-2)
+        ("rust-once-cell" ,rust-once-cell-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.12)
-        ("rust-unicode-width" ,rust-unicode-width-0.1)
-        ("rust-vec-map" ,rust-vec-map-0.8)
+        ("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-lazy-static" ,rust-lazy-static-1)
+       (("rust-humantime" ,rust-humantime-2)
         ("rust-regex" ,rust-regex-1)
-        ("rust-version-sync" ,rust-version-sync-0.8))))
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-shlex" ,rust-shlex-1)
+        ("rust-snapbox-0.2" ,rust-snapbox-0.2)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-trycmd" ,rust-trycmd-0.13))))
     (home-page "https://clap.rs/")
     (synopsis "Command Line Argument Parser")
     (description
--
2.37.2

[bug#57702] [PATCH 0/8] Update rust-clap-3 to 3.2.17

[John Kehayias via Guix-patches via]

Hi everyone,

Just dropping a note that many of these packages are required for the IceCat update that Mark has on the gnuzilla-updates branch. There, some version of the needed packages for newer rust (which is on staging already) and rust-cbindgen exist, which overlaps with the packages in this patch series. I also had contributed similar patches to another channel for building the latest of Firefox, which Mark used (along with other's work) for the IceCat update.

Anyway, just wanted to chime in so that this can be coordinated and avoid duplicated work. I only looked at this patch series quickly before, but I think many of the duplicate patches needed for cbindgen were similar across the different versions and should be straightforward to migrate to their proper package home outside of gnuzilla. Last I heard staging being merged to master was imminent, which will give us the newer rust compilers as well.

Let me know if there is something I can do to help.

John