aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2021-03-15 12:05:50 +0100
committerRicardo Wurmus <rekado@elephly.net>2021-03-15 12:05:50 +0100
commit1daedaa8646696783c88553e03035d547fd001ca (patch)
tree34ed1dc4233ebf51b3e0c8f04e75f0cf63ac0d12
parent21bc326b9a20eca7ae5b14569a8e173957eb3cd9 (diff)
downloadguix-1daedaa8646696783c88553e03035d547fd001ca.tar.gz
guix-1daedaa8646696783c88553e03035d547fd001ca.zip
gnu: libusb-for-axoloti: Revert to 1.0.23.
* gnu/packages/axoloti.scm (libusb-for-axoloti): Revert to 1.0.23, because the patch does not apply to the latest version.
-rw-r--r--gnu/packages/axoloti.scm19
1 files changed, 13 insertions, 6 deletions
diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm
index 2a5cf8e0fc..3049051486 100644
--- a/gnu/packages/axoloti.scm
+++ b/gnu/packages/axoloti.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016, 2017, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
@@ -39,14 +39,21 @@
#:use-module (gnu packages version-control)
#:use-module (gnu packages xml))
+;; XXX The patch does not apply to libusb 1.0.24.
+;; See https://github.com/axoloti/axoloti/issues/464
(define libusb-for-axoloti
- (package (inherit libusb)
- (name "axoloti-libusb")
- (version (package-version libusb))
+ (package
+ (inherit libusb)
+ (version "1.0.23")
(source
(origin
- (inherit (package-source libusb))
- (patches (list (search-patch "libusb-for-axoloti.patch")))))))
+ (method url-fetch)
+ (uri (string-append "https://github.com/libusb/libusb/"
+ "releases/download/v" version
+ "/libusb-" version ".tar.bz2"))
+ (sha256
+ (base32 "13dd2a9x290d1q8nb1lqiaf36grcvns5ripk5k2xm0lajmpc04fv"))
+ (patches (list (search-patch "libusb-for-axoloti.patch")))))))
(define dfu-util-for-axoloti
(package (inherit dfu-util)