[bug#73856] [PATCH 0/8] gnu: Add cyme.

[bug#73856] [PATCH 0/8] gnu: Add cyme.

[Wilko Meyer]

Hi Guix,

Cyme is a quite nice tool, similiar to lsusb, that helps listing information
on a systems USB devices and buses. It didn't have too many dependencies so I
decided to package it; builds and works fine on my system so far:

[/home/wilko/devel/guix]% ./pre-inst-env guix build --rounds=2 cyme
/gnu/store/kk1bx529bfd9wz3c17hqc5shfmak6gwm-cyme-1.7.0

Cheers!

Wilko Meyer (8):
  gnu: Add rust-libusb1-sys-0.7.
  gnu: Add rust-rusb-0.9.
  gnu: Add rust-serde-with-2.
  gnu: Add rust-serde-with-macros-2.
  gnu: Add rust-udev-0.8.
  gnu: Add rust-udevrs-0.3.
  gnu: Add rust-usb-ids-1.
  gnu: Add cyme.

 gnu/packages/crates-io.scm | 166 ++++++++++++++++++++++++++++++++++++-
 gnu/packages/rust-apps.scm |  45 ++++++++++
 2 files changed, 207 insertions(+), 4 deletions(-)


base-commit: 91dd354a10edbb0d3d4bc3220b671504eda871a7
-- 
2.46.0

[bug#73856] [PATCH 1/8] gnu: Add rust-libusb1-sys-0.7.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-libusb1-sys-0.7): New variable.

Change-Id: Icb87644e6bc76fa9ac5019664c2d30071ef99fdc
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c08ccd29fd..ea4f087b75 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39778,6 +39778,28 @@ (define-public rust-libudev-sys-0.1
     (description "This package provides FFI bindings to libudev.")
     (license license:expat)))
 
+(define-public rust-libusb1-sys-0.7
+  (package
+    (name "rust-libusb1-sys")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libusb1-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03yfx469d1ldpw2h21hy322f5a0h1ahlgy4s6yjipzy4gbg0l1fs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3)
+                       ("rust-vcpkg" ,rust-vcpkg-0.2))))
+    (home-page "https://github.com/a1ien/rusb")
+    (synopsis "FFI bindings for libusb")
+    (description "This package provides FFI bindings for libusb.")
+    (license license:expat)))
+
 (define-public rust-listenfd-1
   (package
     (name "rust-listenfd")
-- 
2.46.0

[bug#73856] [PATCH 2/8] gnu: Add rust-rusb-0.9.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-rusb-0.9): New variable.

Change-Id: I3a34b5546422f6fe99d124f64825624611553d29
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ea4f087b75..6354b3ed93 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65301,6 +65301,28 @@ (define-public rust-etherparse-0.9
        #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
                                    ("rust-proptest" ,rust-proptest-0.9))))))
 
+(define-public rust-rusb-0.9
+  (package
+    (name "rust-rusb")
+    (version "0.9.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rusb" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1905rijhabvylblh24379229hjmkfhxr80jc79aqd9v3bgq9z7xb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-libusb1-sys" ,rust-libusb1-sys-0.7)
+                       ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/a1ien/rusb")
+    (synopsis "Library for accessing USB devices")
+    (description
+     "This package provides a Rust library for accessing USB devices.")
+    (license license:expat)))
+
 (define-public rust-rust-hawktracer-0.7
   (package
     (name "rust-rust-hawktracer")
-- 
2.46.0

[bug#73856] [PATCH 3/8] gnu: Add rust-serde-with-2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-serde-with-2): New variable.

Change-Id: Id87ef999e536cbc9ce6ed4f3ef37168e19187fba
---
 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 6354b3ed93..8b0d9a5011 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70038,6 +70038,30 @@ (define-public rust-serde-with-3
 Rust's serde.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-serde-with-2
+  (package
+    (inherit rust-serde-with-3)
+    (name "rust-serde-with")
+    (version "2.3.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serde_with" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gmgl2raxxnpvjgcvkrimgv55kbjywi5xbffc9rvb9s7q7973zq7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-base64" ,rust-base64-0.13)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-doc-comment" ,rust-doc-comment-0.3)
+                       ("rust-hex" ,rust-hex-0.4)
+                       ("rust-indexmap" ,rust-indexmap-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-serde-with-macros" ,rust-serde-with-macros-2)
+                       ("rust-time" ,rust-time-0.3))))))
+
 (define-public rust-serde-with-1
   (package
     (inherit rust-serde-with-3)
-- 
2.46.0

[bug#73856] [PATCH 4/8] gnu: Add rust-serde-with-macros-2.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-serde-with-macros-2): New variable.

Change-Id: Ie249f2a21f79b913d3ebd72fece2839d1c6b610c
---
 gnu/packages/crates-io.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8b0d9a5011..d95b60791b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -70137,6 +70137,25 @@ (define-public rust-serde-with-macros-3
 @code{serde_with}.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-serde-with-macros-2
+  (package
+    (inherit rust-serde-with-macros-3)
+    (name "rust-serde-with-macros")
+    (version "2.3.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serde_with_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0pv9wy1aihsaklg83qac4q0ksimbxcwwk56lwla35l8p3f46y6w8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-darling" ,rust-darling-0.20)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))))
+
 (define-public rust-serde-with-macros-1
   (package
     (inherit rust-serde-with-macros-3)
-- 
2.46.0

[bug#73856] [PATCH 5/8] gnu: Add rust-udev-0.8.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-udev-0.8): New variable.

Change-Id: I47f033f89cb9b05a0141c7d80b9aeff57aab3f46
---
 gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d95b60791b..e45803e8de 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -85942,20 +85942,21 @@ (define-public rust-ucd-util-0.1
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-udev-0.7
+(define-public rust-udev-0.8
   (package
     (name "rust-udev")
-    (version "0.7.0")
+    (version "0.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "udev" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "06hr927z0fdn7ay0p817b9x19i5fagmpmvz95yhl4d1pf3bbpgaf"))))
+        (base32 "18f5vkhjcljw1p5gfvy61p1837n27d7h2l3x45pywa5y49p1q1ah"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+     `(#:cargo-inputs (("rust-io-lifetimes" ,rust-io-lifetimes-1)
+                       ("rust-libc" ,rust-libc-0.2)
                        ("rust-libudev-sys" ,rust-libudev-sys-0.1)
                        ("rust-mio" ,rust-mio-0.6)
                        ("rust-mio" ,rust-mio-0.7)
@@ -85966,6 +85967,27 @@ (define-public rust-udev-0.7
     (description "This package provides libudev bindings for Rust.")
     (license license:expat)))
 
+(define-public rust-udev-0.7
+  (package
+    (inherit rust-udev-0.8)
+    (name "rust-udev")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "udev" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06hr927z0fdn7ay0p817b9x19i5fagmpmvz95yhl4d1pf3bbpgaf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-libudev-sys" ,rust-libudev-sys-0.1)
+                       ("rust-mio" ,rust-mio-0.6)
+                       ("rust-mio" ,rust-mio-0.7)
+                       ("rust-mio" ,rust-mio-0.8)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))))
+
 (define-public rust-ufmt-0.2
   (package
     (name "rust-ufmt")
-- 
2.46.0

[bug#73856] [PATCH 6/8] gnu: Add rust-udevrs-0.3.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-udevrs-0.3): New variable.

Change-Id: Ib0dc5534f9c0c48e4cb8444b6f1fd7f996dfb3b8
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e45803e8de..3d9f714432 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -85988,6 +85988,31 @@ (define-public rust-udev-0.7
                        ("rust-mio" ,rust-mio-0.8)
                        ("rust-pkg-config" ,rust-pkg-config-0.3))))))
 
+(define-public rust-udevrs-0.3
+  (package
+    (name "rust-udevrs")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "udevrs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "028s1sk1ym919z0w6p8mnvgh9d35c9zzrlaxlmvfrppi6fx5kjdx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-glob" ,rust-glob-0.3)
+                       ("rust-heapless" ,rust-heapless-0.7)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-nix" ,rust-nix-0.27))))
+    (home-page "https://github.com/cr8t/udev")
+    (synopsis "Pure Rust implementation of the user-land udev library")
+    (description
+     "This package provides Pure Rust implementation of the user-land udev library.")
+    (license license:lgpl2.0+)))
+
 (define-public rust-ufmt-0.2
   (package
     (name "rust-ufmt")
-- 
2.46.0

[bug#73856] [PATCH 7/8] gnu: Add rust-usb-ids-1.

[Wilko Meyer]

* gnu/packages/crates-io.scm (rust-usb-ids-1): New variable.

Change-Id: I56d2e78712667d107242fe40baa69f4fb67c3109
---
 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 3d9f714432..76d4b22566 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -87384,6 +87384,30 @@ (define-public rust-urlencoding-1
         (base32 "14sm5c8idb5jzib8dwf85p5yhd65vxjh946p80p49d2j6fsjw8y9"))))
     (arguments `(#:skip-build? #t))))
 
+(define-public rust-usb-ids-1
+  (package
+    (name "rust-usb-ids")
+    (version "1.2024.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "usb-ids" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qsgk1i2h5ngpbf17rx9m9c9pdfwli6psz8b4vxvcr1rhy0zmflg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-nom" ,rust-nom-7)
+                       ("rust-phf" ,rust-phf-0.11)
+                       ("rust-phf-codegen" ,rust-phf-codegen-0.11)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1))))
+    (home-page "https://github.com/woodruffw/usb-ids.rs")
+    (synopsis "Rust wrappers for the USB ID Repository")
+    (description
+     "This package provides Rust wrappers for the USB ID Repository.")
+    (license license:expat)))
+
 (define-public rust-users-0.11
   (package
     (name "rust-users")
-- 
2.46.0

[bug#73856] [PATCH 8/8] gnu: Add cyme.

[Wilko Meyer]

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

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

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index e6cce4d372..7e7ca61562 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -439,6 +439,51 @@ (define-public complgen
 from a single, concise, @code{EBNF}-like grammar.")
     (license license:asl2.0)))
 
+(define-public cyme
+  (package
+    (name "cyme")
+    (version "1.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cyme" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qss8cpsdbxlljscd046a14d624k5kcawwlw9n9r60shk9gljqpj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;; disable tests as they try to access host USB
+       #:cargo-inputs (("rust-clap" ,rust-clap-4)
+                       ("rust-clap-complete" ,rust-clap-complete-4)
+                       ("rust-clap-mangen" ,rust-clap-mangen-0.2)
+                       ("rust-colored" ,rust-colored-2)
+                       ("rust-dirs" ,rust-dirs-4)
+                       ("rust-heck" ,rust-heck-0.4)
+                       ("rust-itertools" ,rust-itertools-0.10)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-rusb" ,rust-rusb-0.9)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-serde-with" ,rust-serde-with-2)
+                       ("rust-simple-logger" ,rust-simple-logger-4)
+                       ("rust-strum" ,rust-strum-0.24)
+                       ("rust-strum-macros" ,rust-strum-macros-0.24)
+                       ("rust-terminal-size" ,rust-terminal-size-0.2)
+                       ("rust-udev" ,rust-udev-0.8)
+                       ("rust-udevrs" ,rust-udevrs-0.3)
+                       ("rust-usb-ids" ,rust-usb-ids-1))
+       #:cargo-development-inputs (("rust-assert-json-diff" ,rust-assert-json-diff-2)
+                                   ("rust-diff" ,rust-diff-0.1))))
+    (home-page "https://github.com/tuna-f1sh/cyme")
+    (synopsis
+     "List system USB buses and devices")
+    (description
+     "This package provides a CLI tool to list system USB buses and devices similar
+to lsusb.")
+    (license license:gpl3+)))
+
 (define-public diffr
   (package
     (name "diffr")
-- 
2.46.0

bug#73856: [PATCH 0/8] gnu: Add cyme.

[Efraim Flashner]

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

I replaced the bundled libusb in rust-libusb1-sys with our packaged one,
which involved some adjustments to the other packages, and added the
missing cargo-development-inputs so the other packages could build.

I also installed the manpage and the shell completions for cyme.

Thanks! Pushed to the rust-team branch.

On Fri, Oct 18, 2024 at 01:51:24AM +0200, Wilko Meyer wrote:
> Hi Guix,
> 
> Cyme is a quite nice tool, similiar to lsusb, that helps listing information
> on a systems USB devices and buses. It didn't have too many dependencies so I
> decided to package it; builds and works fine on my system so far:
> 
> [/home/wilko/devel/guix]% ./pre-inst-env guix build --rounds=2 cyme
> /gnu/store/kk1bx529bfd9wz3c17hqc5shfmak6gwm-cyme-1.7.0
> 
> Cheers!
> 
> Wilko Meyer (8):
>   gnu: Add rust-libusb1-sys-0.7.
>   gnu: Add rust-rusb-0.9.
>   gnu: Add rust-serde-with-2.
>   gnu: Add rust-serde-with-macros-2.
>   gnu: Add rust-udev-0.8.
>   gnu: Add rust-udevrs-0.3.
>   gnu: Add rust-usb-ids-1.
>   gnu: Add cyme.
> 
>  gnu/packages/crates-io.scm | 166 ++++++++++++++++++++++++++++++++++++-
>  gnu/packages/rust-apps.scm |  45 ++++++++++
>  2 files changed, 207 insertions(+), 4 deletions(-)
> 
> 
> base-commit: 91dd354a10edbb0d3d4bc3220b671504eda871a7
> -- 
> 2.46.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 --]