diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:36:11 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:48:37 -0500 |
| commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
| tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/libusb.scm | |
| parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
| download | guix-0d41fe4855588fb659b8adafe215d5573517a79b.tar.gz guix-0d41fe4855588fb659b8adafe215d5573517a79b.zip | |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/libusb.scm')
| -rw-r--r-- | gnu/packages/libusb.scm | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index db7ae86cc7..01771dffca 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -223,17 +223,17 @@ implementing @code{javax.usb} (JSR-80).") (define-public python-libusb1 (package (name "python-libusb1") - (version "1.9.3") + (version "2.0.1") (source (origin (method url-fetch) (uri (pypi-uri "libusb1" version)) (sha256 (base32 - "0j8p7jb7sibiiib18vyv3w5rrk0f4d2dl99bs18nwkq6pqvwxrk0")))) + "0ikc7z7mdyr8pm0mk3ibab1hqrq4cpi9frmc3p94hsmbyzn85fnk")))) (build-system python-build-system) (arguments - `(#:modules ((srfi srfi-1) + '(#:modules ((srfi srfi-1) (guix build utils) (guix build python-build-system)) #:phases @@ -242,19 +242,17 @@ implementing @code{javax.usb} (JSR-80).") (lambda* (#:key out #:allow-other-keys) ;; Was relicensed to LGPL 2.1+, but old COPYING file still left ;; in source. Remove it so it does not get installed. - (delete-file "COPYING") - #t)) + (delete-file "COPYING"))) (add-after 'unpack 'fix-libusb-reference (lambda* (#:key inputs #:allow-other-keys) - (substitute* "usb1/libusb1.py" - (("libusb_path = ctypes.util.find_library\\(base_name\\)") + (substitute* "usb1/_libusb1.py" + (("libusb_path = ctypes\\.util\\.find_library\\(base_name\\)") (string-append "libusb_path = \"" (find (negate symbolic-link?) (find-files (assoc-ref inputs "libusb") "^libusb.*\\.so\\..*")) - "\""))) - #t))))) + "\"")))))))) (propagated-inputs (list libusb)) (home-page "https://github.com/vpelletier/python-libusb1") (synopsis "Pure-python wrapper for libusb-1.0") |