diff options
Diffstat (limited to 'gnu/packages/libusb.scm')
| -rw-r--r-- | gnu/packages/libusb.scm | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index d46f1f8cc2..c009c78e88 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Christopher Howard <christopher@librehacker.com> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2022 Jacob Hrbek <kreyren@rixotstudio.cz> +;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) @@ -51,6 +53,7 @@ #:use-module (gnu packages mp3) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages tls) @@ -310,18 +313,28 @@ wrapper for accessing libusb-1.0.") (define-public python-capablerobot-usbhub (package (name "python-capablerobot-usbhub") - (version "0.2.7") + (version "0.5.0") (source (origin - (method url-fetch) - (uri (pypi-uri "capablerobot_usbhub" version)) + ;; PyPI tarball fails to build. + (method git-fetch) + (uri (git-reference + (url "https://github.com/CapableRobot/CapableRobot_USBHub_Driver") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1priic4iq2vn1rc711kzxwhxrwa508rkxrr193qdz2lw26kdhvix")))) - (build-system python-build-system) + (base32 "1nfd12612z9a9hby5dxg7lfqw5jcv3wcyqqagbg5izragni646mc")))) + (build-system pyproject-build-system) (arguments - `(#:phases + `(#:tests? #f ; No tests provided. + #:phases (modify-phases %standard-phases + (add-after 'unpack 'use-poetry-core + (lambda _ + ;; Patch to use the core poetry API. + (substitute* "pyproject.toml" + (("poetry.masonry.api") + "poetry.core.masonry.api")))) (add-after 'install 'install-udev-rules (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -329,10 +342,11 @@ wrapper for accessing libusb-1.0.") (copy-file "50-capablerobot-usbhub.rules" (string-append out "/lib/udev/rules.d/" - "50-capablerobot-usbhub.rules")) - #t)))))) + "50-capablerobot-usbhub.rules")))))))) + (native-inputs + (list python-poetry-core)) (propagated-inputs - (list python-click python-construct python-pyusb python-pyyaml)) + (list python-click-7 python-construct python-pyusb python-pyyaml-5)) (home-page "https://github.com/CapableRobot/CapableRobot_USBHub_Driver") (synopsis @@ -564,7 +578,7 @@ over USB.") (list #:configure-flags #~(list "--disable-static" (string-append "--with-udev=" #$output "/lib/udev")))) - (home-page "http://libmtp.sourceforge.net/") + (home-page "https://libmtp.sourceforge.net/") (synopsis "Library implementing the Media Transfer Protocol") (description "Libmtp implements an MTP (Media Transfer Protocol) initiator, which means that it initiates MTP sessions with devices. The @@ -601,7 +615,7 @@ proposed for standardization.") (list gtk+ flac libvorbis libid3tag libmtp)) (native-inputs (list pkg-config)) - (home-page "http://gmtp.sourceforge.net/") + (home-page "https://gmtp.sourceforge.net/") (synopsis "Simple graphical MTP client") (description "gMTP is a simple graphical client for the Media Transfer Protocol (MTP), which allows media files to be transferred to and from many portable |