[bug#66104] [PATCH] gnu: Add rust-crossterm-0.27

[bug#66104] [PATCH] gnu: Add rust-crossterm-0.27

[Andrew Jose]

changelog:
rust-crossterm 0.25 inherits from 0.27
rust-crossterm 0.23 inherits from 0.27
rust-crossterm 0.20 inherits from 0.27
---
 gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3c83563c45..78f58ec9ae 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16385,21 +16385,22 @@ (define-public rust-crossfont-0.3
         ("rust-servo-fontconfig" ,rust-servo-fontconfig-0.5)
         ("rust-winapi" ,rust-winapi-0.3))))))
 
-(define-public rust-crossterm-0.25
+(define-public rust-crossterm-0.27
   (package
     (name "rust-crossterm")
-    (version "0.25.0")
+    (version "0.27.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "crossterm" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "0rsbkkhdf61aipc06b7vpl4cw3wnxz0miizp0ms3a5rcpq7nqkp6"))))
+               (base32 "1pr413ki440xgddlmkrc4j1bfx1h8rpmll87zn8ykja1bm2gwxpl"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
+       (("rust-bitflags" ,rust-bitflags-2)
         ("rust-crossterm-winapi" ,rust-crossterm-winapi-0.9)
+        ("rust-filedescriptor" ,rust-filedescriptor-0.8)
         ("rust-futures-core" ,rust-futures-core-0.3)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-mio" ,rust-mio-0.8)
@@ -16413,6 +16414,7 @@ (define-public rust-crossterm-0.25
         ("rust-futures" ,rust-futures-0.3)
         ("rust-futures-timer" ,rust-futures-timer-3)
         ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serial-test" ,rust-serial-test-2)
         ("rust-tokio" ,rust-tokio-1))))
     (home-page "https://github.com/crossterm-rs/crossterm")
     (synopsis "Crossplatform terminal library for manipulating terminals")
@@ -16421,9 +16423,40 @@ (define-public rust-crossterm-0.25
 terminals.")
     (license license:expat)))
 
+(define-public rust-crossterm-0.25
+  (package
+    (inherit rust-crossterm-0.27)
+    (name "rust-crossterm")
+    (version "0.25.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "crossterm" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "0rsbkkhdf61aipc06b7vpl4cw3wnxz0miizp0ms3a5rcpq7nqkp6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-crossterm-winapi" ,rust-crossterm-winapi-0.9)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-mio" ,rust-mio-0.8)
+        ("rust-parking-lot" ,rust-parking-lot-0.12)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-signal-hook" ,rust-signal-hook-0.3)
+        ("rust-signal-hook-mio" ,rust-signal-hook-mio-0.2)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-futures-timer" ,rust-futures-timer-3)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-tokio" ,rust-tokio-1))))))
+
 (define-public rust-crossterm-0.23
   (package
-    (inherit rust-crossterm-0.25)
+    (inherit rust-crossterm-0.27)
     (name "rust-crossterm")
     (version "0.23.2")
     (source (origin
@@ -16454,7 +16487,7 @@ (define-public rust-crossterm-0.23
 
 (define-public rust-crossterm-0.20
   (package
-    (inherit rust-crossterm-0.25)
+    (inherit rust-crossterm-0.27)
     (name "rust-crossterm")
     (version "0.20.0")
     (source
-- 
2.34.1

[bug#66104] [PATCH] gnu: Add rust-crossterm-0.27

[Efraim Flashner]

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

Thank you for your patch!

Unfortunately it adds dependencies on rust-filedescriptor-0.8 and
rust-serial-test-2, so it can't go in to Guix unless these are also
packaged.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#66104: gnu: Add rust-crossterm-0.27

[Efraim Flashner]

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

All the patches are applied on the rust-team branch. Thanks!

On Mon, Oct 02, 2023 at 06:56:44PM +0530, Arnav Andrew Jose wrote:
> Oops! working on adding all the missing dependencies, then will mail a patch
> series here
> 
> On 02-10-2023 14:40, Efraim Flashner wrote:
> > Thank you for your patch!
> > 
> > Unfortunately it adds dependencies on rust-filedescriptor-0.8 and
> > rust-serial-test-2, so it can't go in to Guix unless these are also
> > packaged.
> > 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#66104] REVISION [PATCH 0/9] gnu: add rust-crossterm-0.27

[Andrew Jose]

This patch series corrects the previous patch under bug#66104.
It adds all the dependencies currently missing from guix that
rust-crossterm-0.27 needs, as well as upgrading some packages
to the latest cargo.lock versions that the guix naming scheme
does not include (example 0.4.9 -> 0.4.10 for rust-lock-api-0.4).

Andrew Jose (9):
  gnu: add rust-dashmap-5
  gnu: add rust-filedescriptor-0.8
  gnu: update rust-lock-api-0.4 to version 0.4.10
  gnu: rust-signal-hook-0.3 update to version 0.3.17
  gnu: rust-crossterm-winapi-0.9 update to version 0.9.1
  gnu: add rust-serial-test-derive-2
  gnu: rust-parking-lot-core-0.9 update to version 0.9.8
  gnu: add rust-serial-test-2
  gnu: Add rust-crossterm-0.27

 gnu/packages/crates-io.scm | 191 +++++++++++++++++++++++++++++++------
 1 file changed, 162 insertions(+), 29 deletions(-)

-- 
2.34.1

[bug#66104] [PATCH 1/9] gnu: add rust-dashmap-5

[Andrew Jose]

rust-dashmap-4: inherit from rust-dashmap-5
---
 gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3c83563c45..9f598aad01 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18264,8 +18264,38 @@ (define-public rust-darling-macro-0.9
         ("rust-quote" ,rust-quote-0.6)
         ("rust-syn" ,rust-syn-0.15))))))
 
+(define-public rust-dashmap-5
+  (package
+    (name "rust-dashmap")
+    (version "5.5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "dashmap" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0miqnlxi501vfbv6mw5jbmzgnj0wjrch3p4abvpd59s9v30lg1wp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-arbitrary" ,rust-arbitrary-1)
+	("rust-cfg-if" ,rust-cfg-if-1)
+	("rust-hashbrown" ,rust-hashbrown-0.14)
+	("rust-lock-api" ,rust-lock-api-0.4)
+	("rust-once-cell" ,rust-once-cell-1)
+	("rust-parking-lot-core" ,rust-parking-lot-core-0.9)
+	("rust-rayon" ,rust-rayon-1)
+	("rust-serde" ,rust-serde-1))))
+     (home-page "https://github.com/xacrimon/dashmap")
+     (synopsis "Blazing fast concurrent HashMap for Rust")
+     (description "This package implements a blazing fast concurrent HashMap
+for Rust.")
+     (license license:expat)))
+
 (define-public rust-dashmap-4
   (package
+    (inherit rust-dashmap-5)
     (name "rust-dashmap")
     (version "4.0.2")
     (source
-- 
2.34.1

[bug#66104] [PATCH 2/9] gnu: add rust-filedescriptor-0.8

[Andrew Jose]

---
 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 9f598aad01..b8e5cc8322 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24218,6 +24218,29 @@ (define-public rust-file-diff-1
     (description "An atomic utility for diffing files in testing.")
     (license license:bsd-3)))
 
+(define-public rust-filedescriptor-0.8
+  (package
+    (name "rust-filedescriptor")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "filedescriptor" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vplyh0cw35kzq7smmp2ablq0zsknk5rkvvrywqsqfrchmjxk6bi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+	("rust-thiserror" ,rust-thiserror-1)
+	("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/wez/wezterm")
+    (synopsis "More ergonomic wrappers around RawFd and RawHandle")
+    (description
+     "The purpose of this crate is to make it a bit more ergonomic for portable applications that need to work with the platform level @code{RawFd} and @code{RawHandle} types.  Rather than conditionally using @code{RawFd} and @code{RawHandle,} the @code{FileDescriptor} type can be used to manage ownership, duplicate, read and write.")
+    (license license:expat)))
+
 (define-public rust-filesize-0.2
   (package
     (name "rust-filesize")
-- 
2.34.1

[bug#66104] [PATCH 3/9] gnu: update rust-lock-api-0.4 to version 0.4.10

[Andrew Jose]

changelog
cargo-inputs: remove rust-autocfg-1
---
 gnu/packages/crates-io.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b8e5cc8322..0b83738ba8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36147,7 +36147,7 @@ (define-public rust-locale-config-0.3
 (define-public rust-lock-api-0.4
   (package
     (name "rust-lock-api")
-    (version "0.4.9")
+    (version "0.4.10")
     (source
      (origin
        (method url-fetch)
@@ -36155,12 +36155,11 @@ (define-public rust-lock-api-0.4
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1py41vk243hwk345nhkn5nw0bd4m03gzjmprdjqq6rg5dwv12l23"))))
+         "05nd9nzxqidg24d1k8y5vlc8lz9gscpskrikycib46qbl8brgk61"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-autocfg" ,rust-autocfg-1)
-        ("rust-owning-ref" ,rust-owning-ref-0.4)
+       (("rust-owning-ref" ,rust-owning-ref-0.4)
         ("rust-scopeguard" ,rust-scopeguard-1)
         ("rust-serde" ,rust-serde-1))))
     (home-page "https://github.com/Amanieu/parking_lot")
-- 
2.34.1

[bug#66104] [PATCH 4/9] gnu: rust-signal-hook-0.3 update to version 0.3.17

[Andrew Jose]

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0b83738ba8..313d164060 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61344,14 +61344,14 @@ (define-public rust-shlex-0.1
 (define-public rust-signal-hook-0.3
   (package
     (name "rust-signal-hook")
-    (version "0.3.15")
+    (version "0.3.17")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "signal-hook" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1fc2wvl8sp6l6kd5hh0csn9bl2yl4cqsj8vc0ygd08bd2zqnh9vk"))))
+        (base32 "0098nsah04spqf3n8niirmfym4wsdgjl57c78kmzijlq8xymh8c6"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.34.1

[bug#66104] [PATCH 5/9] gnu: rust-crossterm-winapi-0.9 update to version 0.9.1

[Andrew Jose]

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 313d164060..26665ae9c2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16507,13 +16507,14 @@ (define-public rust-crossterm-0.19
 (define-public rust-crossterm-winapi-0.9
   (package
     (name "rust-crossterm-winapi")
-    (version "0.9.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "crossterm-winapi" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "075z15gxm4rn5yywq46khbg29bf504ix0f06zq3hx8aa91db7q9a"))))
+    (version "0.9.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "crossterm_winapi" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0axbfb2ykbwbpf1hmxwpawwfs8wvmkcka5m561l7yp36ldi7rpdc"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.34.1

[bug#66104] [PATCH 6/9] gnu: add rust-serial-test-derive-2

[Andrew Jose]

---
 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 26665ae9c2..e64b70a8b8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60480,6 +60480,26 @@ (define-public rust-serial-test-0.1
      `(#:cargo-inputs
        (("rust-lazy-static" ,rust-lazy-static-1))))))
 
+(define-public rust-serial-test-derive-2
+  (package
+    (inherit rust-serial-test-derive-0.6)
+    (name "rust-serial-test-derive")
+    (version "2.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serial-test-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13zvd5ds76hhjn3z0axc05n15lzpxpz77jcykic8q5knhlbjklci"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+	("rust-quote" ,rust-quote-1)
+	("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.10))))))
+
 (define-public rust-serial-test-derive-0.6
   (package
     (name "rust-serial-test-derive")
-- 
2.34.1

[bug#66104] [PATCH 7/9] gnu: rust-parking-lot-core-0.9 update to version 0.9.8

[Andrew Jose]

changelog:
cargo-inputs: remove rust-windows-sys-0.45
              add rust-windows-targets-0.48
---
 gnu/packages/crates-io.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e64b70a8b8..c2d4273152 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45260,14 +45260,15 @@ (define-public rust-parking-lot-0.7
 (define-public rust-parking-lot-core-0.9
   (package
     (name "rust-parking-lot-core")
-    (version "0.9.7")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "parking_lot_core" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "08cm5gg3a4jmr683x9dgih8vj66yn772kjvc8y1m0flyz6wwnsch"))))
+    (version "0.9.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "parking_lot_core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0ixlak319bpzldq20yvyfqk0y1vi736zxbw101jvzjp7by30rw4k"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -45278,12 +45279,12 @@ (define-public rust-parking-lot-core-0.9
         ("rust-redox-syscall" ,rust-redox-syscall-0.2)
         ("rust-smallvec" ,rust-smallvec-1)
         ("rust-thread-id" ,rust-thread-id-4)
-        ("rust-windows-sys" ,rust-windows-sys-0.45))))
+        ("rust-windows-targets" ,rust-windows-targets-0.48))))
     (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:expat license:asl2.0))))
+    (license (list license:asl2.0 license:expat))))
 
 (define-public rust-parking-lot-core-0.8
   (package
-- 
2.34.1

[bug#66104] [PATCH 8/9] gnu: add rust-serial-test-2

[Andrew Jose]

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c2d4273152..17ed164217 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60418,6 +60418,32 @@ (define-public rust-serdect-0.2
 for data that potentially contains secrets (e.g. cryptographic keys).")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-serial-test-2
+  (package
+    (inherit rust-serial-test-0.6)
+    (name "rust-serial-test")
+    (version "2.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serial-test" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0b9v0csv9wxl1gcjq99plwimxbmhgr6kzbwqyb457qh3d22xsmhf"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-dashmap" ,rust-dashmap-5)
+	("rust-document-features" ,rust-document-features-0.2)
+	("rust-fslock" ,rust-fslock-0.2)
+	("rust-futures" ,rust-futures-0.3)
+	("rust-lazy-static" ,rust-lazy-static-1)
+	("rust-log" ,rust-log-0.4)
+	("rust-parking-lot" ,rust-parking-lot-0.12)
+	("rust-serial-test-derive" ,rust-serial-test-derive-2))
+       #:cargo-development-inputs
+       (("rust-itertools" ,rust-itertools-0.10)
+	("rust-tokio" ,rust-tokio-1))))))
+
 (define-public rust-serial-test-0.6
   (package
     (name "rust-serial-test")
-- 
2.34.1

[bug#66104] [PATCH 8/9] gnu: add rust-serial-test-2

[Christopher Baines]

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


Andrew Jose <arnav.jose@gmail.com> writes:

> ---
>  gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
>
> diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
> index c2d4273152..17ed164217 100644
> --- a/gnu/packages/crates-io.scm
> +++ b/gnu/packages/crates-io.scm
> @@ -60418,6 +60418,32 @@ (define-public rust-serdect-0.2
>  for data that potentially contains secrets (e.g. cryptographic keys).")
>      (license (list license:asl2.0 license:expat))))
>  
> +(define-public rust-serial-test-2
> +  (package
> +    (inherit rust-serial-test-0.6)

Looks like QA is failing to process this because rust-serial-test-0.6
isn't defined at this point. I think you need to move this package
definition down below rust-serial-test-0.6.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#66104] [PATCH 9/9] gnu: Add rust-crossterm-0.27

[Andrew Jose]

changelog:
rust-crossterm 0.25 inherits from 0.27
rust-crossterm 0.23 inherits from 0.27
rust-crossterm 0.20 inherits from 0.27
---
 gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 17ed164217..2d2c07a760 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16385,21 +16385,22 @@ (define-public rust-crossfont-0.3
         ("rust-servo-fontconfig" ,rust-servo-fontconfig-0.5)
         ("rust-winapi" ,rust-winapi-0.3))))))
 
-(define-public rust-crossterm-0.25
+(define-public rust-crossterm-0.27
   (package
     (name "rust-crossterm")
-    (version "0.25.0")
+    (version "0.27.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "crossterm" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "0rsbkkhdf61aipc06b7vpl4cw3wnxz0miizp0ms3a5rcpq7nqkp6"))))
+               (base32 "1pr413ki440xgddlmkrc4j1bfx1h8rpmll87zn8ykja1bm2gwxpl"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
+       (("rust-bitflags" ,rust-bitflags-2)
         ("rust-crossterm-winapi" ,rust-crossterm-winapi-0.9)
+        ("rust-filedescriptor" ,rust-filedescriptor-0.8)
         ("rust-futures-core" ,rust-futures-core-0.3)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-mio" ,rust-mio-0.8)
@@ -16413,6 +16414,7 @@ (define-public rust-crossterm-0.25
         ("rust-futures" ,rust-futures-0.3)
         ("rust-futures-timer" ,rust-futures-timer-3)
         ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serial-test" ,rust-serial-test-2)
         ("rust-tokio" ,rust-tokio-1))))
     (home-page "https://github.com/crossterm-rs/crossterm")
     (synopsis "Crossplatform terminal library for manipulating terminals")
@@ -16421,9 +16423,40 @@ (define-public rust-crossterm-0.25
 terminals.")
     (license license:expat)))
 
+(define-public rust-crossterm-0.25
+  (package
+    (inherit rust-crossterm-0.27)
+    (name "rust-crossterm")
+    (version "0.25.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "crossterm" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "0rsbkkhdf61aipc06b7vpl4cw3wnxz0miizp0ms3a5rcpq7nqkp6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-crossterm-winapi" ,rust-crossterm-winapi-0.9)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-mio" ,rust-mio-0.8)
+        ("rust-parking-lot" ,rust-parking-lot-0.12)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-signal-hook" ,rust-signal-hook-0.3)
+        ("rust-signal-hook-mio" ,rust-signal-hook-mio-0.2)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-futures-timer" ,rust-futures-timer-3)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-tokio" ,rust-tokio-1))))))
+
 (define-public rust-crossterm-0.23
   (package
-    (inherit rust-crossterm-0.25)
+    (inherit rust-crossterm-0.27)
     (name "rust-crossterm")
     (version "0.23.2")
     (source (origin
@@ -16454,7 +16487,7 @@ (define-public rust-crossterm-0.23
 
 (define-public rust-crossterm-0.20
   (package
-    (inherit rust-crossterm-0.25)
+    (inherit rust-crossterm-0.27)
     (name "rust-crossterm")
     (version "0.20.0")
     (source
-- 
2.34.1

[bug#66104] [PATCH vREVISION 8/9] gnu: add rust-serial-test-2

[Andrew Jose]

Amended to place package rust-serial-test-2 after rust-serial-test-0.6
---
 gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c2d4273152..e818acbaa6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60444,6 +60444,32 @@ (define-public rust-serial-test-0.6
      "This package allows for the creation of serialised Rust tests.")
     (license license:expat)))
 
+(define-public rust-serial-test-2
+  (package
+    (inherit rust-serial-test-0.6)
+    (name "rust-serial-test")
+    (version "2.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serial-test" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0b9v0csv9wxl1gcjq99plwimxbmhgr6kzbwqyb457qh3d22xsmhf"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-dashmap" ,rust-dashmap-5)
+	("rust-document-features" ,rust-document-features-0.2)
+	("rust-fslock" ,rust-fslock-0.2)
+	("rust-futures" ,rust-futures-0.3)
+	("rust-lazy-static" ,rust-lazy-static-1)
+	("rust-log" ,rust-log-0.4)
+	("rust-parking-lot" ,rust-parking-lot-0.12)
+	("rust-serial-test-derive" ,rust-serial-test-derive-2))
+       #:cargo-development-inputs
+       (("rust-itertools" ,rust-itertools-0.10)
+	("rust-tokio" ,rust-tokio-1))))))
+
 (define-public rust-serial-test-0.5
   (package
     (inherit rust-serial-test-0.6)
-- 
2.34.1

[bug#66104] [PATCH vREVISION 9/9] gnu: Add rust-crossterm-0.27

[Andrew Jose]

changelog:
rust-crossterm 0.25 inherits from 0.27
rust-crossterm 0.23 inherits from 0.27
rust-crossterm 0.20 inherits from 0.27
based on patch vREVISION 8/9
---
 gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e818acbaa6..500d2f8716 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16385,21 +16385,22 @@ (define-public rust-crossfont-0.3
         ("rust-servo-fontconfig" ,rust-servo-fontconfig-0.5)
         ("rust-winapi" ,rust-winapi-0.3))))))
 
-(define-public rust-crossterm-0.25
+(define-public rust-crossterm-0.27
   (package
     (name "rust-crossterm")
-    (version "0.25.0")
+    (version "0.27.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "crossterm" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "0rsbkkhdf61aipc06b7vpl4cw3wnxz0miizp0ms3a5rcpq7nqkp6"))))
+               (base32 "1pr413ki440xgddlmkrc4j1bfx1h8rpmll87zn8ykja1bm2gwxpl"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
+       (("rust-bitflags" ,rust-bitflags-2)
         ("rust-crossterm-winapi" ,rust-crossterm-winapi-0.9)
+        ("rust-filedescriptor" ,rust-filedescriptor-0.8)
         ("rust-futures-core" ,rust-futures-core-0.3)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-mio" ,rust-mio-0.8)
@@ -16413,6 +16414,7 @@ (define-public rust-crossterm-0.25
         ("rust-futures" ,rust-futures-0.3)
         ("rust-futures-timer" ,rust-futures-timer-3)
         ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serial-test" ,rust-serial-test-2)
         ("rust-tokio" ,rust-tokio-1))))
     (home-page "https://github.com/crossterm-rs/crossterm")
     (synopsis "Crossplatform terminal library for manipulating terminals")
@@ -16421,9 +16423,40 @@ (define-public rust-crossterm-0.25
 terminals.")
     (license license:expat)))
 
+(define-public rust-crossterm-0.25
+  (package
+    (inherit rust-crossterm-0.27)
+    (name "rust-crossterm")
+    (version "0.25.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "crossterm" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "0rsbkkhdf61aipc06b7vpl4cw3wnxz0miizp0ms3a5rcpq7nqkp6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-crossterm-winapi" ,rust-crossterm-winapi-0.9)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-mio" ,rust-mio-0.8)
+        ("rust-parking-lot" ,rust-parking-lot-0.12)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-signal-hook" ,rust-signal-hook-0.3)
+        ("rust-signal-hook-mio" ,rust-signal-hook-mio-0.2)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-futures-timer" ,rust-futures-timer-3)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-tokio" ,rust-tokio-1))))))
+
 (define-public rust-crossterm-0.23
   (package
-    (inherit rust-crossterm-0.25)
+    (inherit rust-crossterm-0.27)
     (name "rust-crossterm")
     (version "0.23.2")
     (source (origin
@@ -16454,7 +16487,7 @@ (define-public rust-crossterm-0.23
 
 (define-public rust-crossterm-0.20
   (package
-    (inherit rust-crossterm-0.25)
+    (inherit rust-crossterm-0.27)
     (name "rust-crossterm")
     (version "0.20.0")
     (source
-- 
2.34.1