summaryrefslogtreecommitdiff
path: root/gnu/packages/libusb.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-07-20 11:42:02 +0200
committerLudovic Courtès <ludo@gnu.org>2016-07-20 11:42:17 +0200
commit7575655212ecfbcd1f04e429c8a7a41f8720d027 (patch)
tree558982d3cf50ef6b19ef293850de1f485fde66a6 /gnu/packages/libusb.scm
parent5d4c90ae02f1e0b42d575bba2d828d63aaf79be5 (diff)
parent5f01078129f4eaa4760a14f22761cf357afb6738 (diff)
downloadguix-patches-7575655212ecfbcd1f04e429c8a7a41f8720d027.tar
guix-patches-7575655212ecfbcd1f04e429c8a7a41f8720d027.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/libusb.scm')
-rw-r--r--gnu/packages/libusb.scm13
1 files changed, 6 insertions, 7 deletions
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index 1e72442c73..1f659c7594 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -92,14 +92,14 @@ version of libusb to run with newer libusb.")
(define-public python-pyusb
(package
(name "python-pyusb")
- (version "1.0.0rc1")
+ (version "1.0.0")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "pyusb" version))
+ (uri (pypi-uri "PyUSB" version))
(sha256
(base32
- "07cjq11qhngzjd746k7688s6y2x7lpj669fxqfsiy985rg0jsn7j"))))
+ "0s2k4z06fapd5vp1gnrlf8a9sjpc03p9974lzw5k6ky39akzyd2v"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ;no tests
@@ -135,15 +135,14 @@ version of libusb to run with newer libusb.")
(define-public libmtp
(package
(name "libmtp")
- (version "1.1.9")
+ (version "1.1.11")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/libmtp/" version
"/libmtp-" version ".tar.gz"))
(sha256
- (base32
- "12dinqic0ljnhrwx3rc61jc7q24ybr0mckc2ya5kh1s1np0d7w93"))
- (patches (search-patches "libmtp-devices.patch"))))
+ (base32
+ "1sc768q2cixwanlwrz95mp389iaadl4s95486caavxx4g7znvn8m"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))