Merge branch 'master' into core-updates

1 files changed, 6 insertions, 7 deletions

diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index 1e72442c734..1f659c7594f 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)))