[bug#68754] [PATCH 0/4 rust-team] Add cargo-machete and dependencies.

[bug#68754] [PATCH 0/4 rust-team] Add cargo-machete and dependencies.

[Herman Rimm via Guix-patches via]

Hi,

cargo-udeps can also be used to find unused Cargo dependencies, but it
requires rust nightly to run.

Cheers,
Herman

Herman Rimm (4):
  gnu: rust-argh: Update to 0.1.12.
  gnu: Add rust-cargo-toml-0.16.
  gnu: Add rust-pretty-env-logger-0.5.
  gnu: Add cargo-machete.

 gnu/packages/crates-io.scm | 119 ++++++++++++++++++++++++-------------
 gnu/packages/rust-apps.scm |  30 ++++++++++
 2 files changed, 109 insertions(+), 40 deletions(-)


base-commit: 049e5e43058e04fd4c6152938a31911f939df7ab
-- 
2.41.0

[bug#68754] [PATCH 1/4] gnu: rust-argh: Update to 0.1.12.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-argh, rust-argh-derive,
  rust-argh-shared): Update to 0.1.12.

Change-Id: I797eaf71d8654ea3b31c679675023d5ee45f6331
---
 gnu/packages/crates-io.scm | 67 +++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c910c00260..c05f3457ba 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39,6 +39,7 @@
 ;;; Copyright © 2023, 2024 VÖRÖSKŐI András <voroskoi@gmail.com>
 ;;; Copyright © 2023 Daniel Ziltener <dziltener@lyrion.ch>
 ;;; Copyright © 2023, 2024 Troy Figiel <troy@troyfigiel.com>
+;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2182,16 +2183,18 @@ (define-public rust-argfile-0.1
 (define-public rust-argh-shared-0.1
   (package
     (name "rust-argh-shared")
-    (version "0.1.6")
+    (version "0.1.12")
     (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "argh_shared" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "0crzkzr4mq9gyys3m0idgsfwwrwd4dk70scp7rspvb2fmgd01piq"))))
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "argh_shared" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cbmf3n5fd7ha014m303f4bmsmj0v84an4a1rh77d9dx868z74sn"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-serde" ,rust-serde-1))))
     (home-page "https://github.com/google/argh")
     (synopsis "Derive-based argument parsing optimized for code size")
     (description "Derive-based argument parsing optimized for code size")
@@ -2200,24 +2203,21 @@ (define-public rust-argh-shared-0.1
 (define-public rust-argh-derive-0.1
   (package
     (name "rust-argh-derive")
-    (version "0.1.6")
+    (version "0.1.12")
     (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "argh_derive" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "13qz9i9frdjl1v9aqw5b2cs7wn3h34x2xkpsi9wcl1hcpjd23ba8"))))
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "argh_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ynq2f2f05ybhmvg5y4m1kdfihw4jsq3bnq6gp32yykbvzp0mpsn"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:skip-build?
-        #t
-        #:cargo-inputs
-        (("rust-argh-shared" ,rust-argh-shared-0.1)
-         ("rust-heck" ,rust-heck-0.3)
-         ("rust-proc-macro2" ,rust-proc-macro2-1)
-         ("rust-quote" ,rust-quote-1)
-         ("rust-syn" ,rust-syn-1))))
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-argh-shared" ,rust-argh-shared-0.1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
     (home-page "https://github.com/google/argh")
     (synopsis "Derive-based argument parsing optimized for code size")
     (description "Derive-based argument parsing optimized for code size")
@@ -2226,19 +2226,20 @@ (define-public rust-argh-derive-0.1
 (define-public rust-argh-0.1
   (package
     (name "rust-argh")
-    (version "0.1.6")
+    (version "0.1.12")
     (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "argh" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "1gy9y69d38q7f5147kj823swgggc3m30x7z2z1lrjpwpsxncf8zh"))))
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "argh" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06fjmac07knqw7vahra9rkbfrrsv31yrqhf7wi623xvzjq3bmxbs"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-argh-derive" ,rust-argh-derive-0.1)
-         ("rust-argh-shared" ,rust-argh-shared-0.1))))
+     `(#:cargo-inputs (("rust-argh-derive" ,rust-argh-derive-0.1)
+                       ("rust-argh-shared" ,rust-argh-shared-0.1))
+       #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1)
+                                   ("rust-trybuild" ,rust-trybuild-1))))
     (home-page "https://github.com/google/argh")
     (synopsis "Derive-based argument parser optimized for code size")
     (description "Derive-based argument parser optimized for code size")
-- 
2.41.0

[bug#68754] [PATCH 2/4] gnu: Add rust-cargo-toml-0.16.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-cargo-toml-0.16): New variable.

Change-Id: I8f98d72d84b18f74a75107ca51c473eb633362df
---
 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 c05f3457ba..5acd32748f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9264,6 +9264,27 @@ (define-public rust-cargo-platform-0.1
 supported by Cargo.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-cargo-toml-0.16
+  (package
+    (name "rust-cargo-toml")
+    (version "0.16.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cargo_toml" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1lxgiwha2kqbk60iq5cvczbnd5xrqa4cj7bqk6k8wf64qsdn5yg3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1)
+                       ("rust-toml" ,rust-toml-0.8))))
+    (home-page "https://lib.rs/cargo_toml")
+    (synopsis "`Cargo.toml` struct definitions for parsing with Serde")
+    (description "This package provides `Cargo.toml` struct definitions for
+parsing with Serde.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-cargo-util-0.2
   (package
     (name "rust-cargo-util")
-- 
2.41.0

[bug#68754] [PATCH 3/4] gnu: Add rust-pretty-env-logger-0.5.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pretty-env-logger-0.5): New variable.
(rust-pretty-env-logger-0.4): Inherit from rust-pretty-env-logger-0.5.

Change-Id: Iab291c7f772bae0b5f86ef034162c7af03441834
---
 gnu/packages/crates-io.scm | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5acd32748f..733de28979 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46889,8 +46889,29 @@ (define-public rust-pretty-assertions-0.4
        (("rust-ansi-term" ,rust-ansi-term-0.9)
         ("rust-difference" ,rust-difference-1))))))
 
+(define-public rust-pretty-env-logger-0.5
+  (package
+    (name "rust-pretty-env-logger")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pretty_env_logger" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "076w9dnvcpx6d3mdbkqad8nwnsynb7c8haxmscyrz7g3vga28mw6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-env-logger" ,rust-env-logger-0.10)
+                       ("rust-log" ,rust-log-0.4))))
+    (home-page "https://github.com/seanmonstar/pretty-env-logger")
+    (synopsis "Visually pretty env_logger")
+    (description "This package provides a visually pretty env_logger.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-pretty-env-logger-0.4
   (package
+    (inherit rust-pretty-env-logger-0.5)
     (name "rust-pretty-env-logger")
     (version "0.4.0")
     (source
@@ -46902,15 +46923,11 @@ (define-public rust-pretty-env-logger-0.4
         (sha256
          (base32
           "17gva1rlf9fhgr0jr19kv39f8bir3f4pa4jz02qbhl9qanwkcvcj"))))
-    (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #:cargo-inputs
        (("rust-env-logger" ,rust-env-logger-0.7)
-        ("rust-log" ,rust-log-0.4))))
-    (home-page "https://github.com/seanmonstar/pretty-env-logger")
-    (synopsis "Visually pretty env_logger")
-    (description "This package provides a visually pretty env_logger.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-log" ,rust-log-0.4))))))
 
 (define-public rust-pretty-env-logger-0.3
   (package
-- 
2.41.0

[bug#68754] [PATCH 4/4] gnu: Add cargo-machete.

[Herman Rimm via Guix-patches via]

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

Change-Id: Ic73bbb347a976d008d383557669e696e6fe3bdfa
---
 gnu/packages/rust-apps.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 88d27cede7..5b8a4b7be2 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -310,6 +310,36 @@ (define-public bat
 paging.")
     (license (list license:expat license:asl2.0))))
 
+(define-public cargo-machete
+  (package
+    (name "cargo-machete")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri name version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0lbymfxgcizmj1c1ydpzinjbjhc7c9j0wb5y1xq33j80s5hzayaz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;Error: No such file or directory (os error 2)
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-argh" ,rust-argh-0.1)
+                       ("rust-cargo-metadata" ,rust-cargo-metadata-0.18)
+                       ("rust-cargo-toml" ,rust-cargo-toml-0.16)
+                       ("rust-grep" ,rust-grep-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.5)
+                       ("rust-rayon" ,rust-rayon-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-toml-edit" ,rust-toml-edit-0.20)
+                       ("rust-walkdir" ,rust-walkdir-2))))
+    (home-page "https://github.com/est31/cargo-udeps")
+    (synopsis "Find unused dependencies in Cargo.toml")
+    (description "@code{cargo-machete} finds unused dependencies in Cargo.toml.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public diffr
   (package
     (name "diffr")
-- 
2.41.0

bug#68754: [PATCH 0/4 rust-team] Add cargo-machete and dependencies.

[Efraim Flashner]

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

Thanks. Patches pushed to the rust-team branch.

On Sat, Jan 27, 2024 at 09:39:40AM +0100, Herman Rimm wrote:
> Hi,
> 
> cargo-udeps can also be used to find unused Cargo dependencies, but it
> requires rust nightly to run.
> 
> Cheers,
> Herman
> 
> Herman Rimm (4):
>   gnu: rust-argh: Update to 0.1.12.
>   gnu: Add rust-cargo-toml-0.16.
>   gnu: Add rust-pretty-env-logger-0.5.
>   gnu: Add cargo-machete.
> 
>  gnu/packages/crates-io.scm | 119 ++++++++++++++++++++++++-------------
>  gnu/packages/rust-apps.scm |  30 ++++++++++
>  2 files changed, 109 insertions(+), 40 deletions(-)
> 
> 
> base-commit: 049e5e43058e04fd4c6152938a31911f939df7ab
> -- 
> 2.41.0
> 
> 
> 

-- 
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 --]