[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