gnu: usbutils: Update to 014.

* gnu/packages/linux.scm (usbutils): Update to 014.
[arguments]: Remove obsolete autogen.sh substitution.
Don't explicitly return #t from phases.
This commit is contained in:
Tobias Geerinckx-Rice 2021-11-30 00:51:30 +01:00
parent 215524a116
commit 2397cc097c
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -2082,14 +2082,14 @@ slabtop, tload, top, vmstat, w, watch and sysctl.")
(define-public usbutils (define-public usbutils
(package (package
(name "usbutils") (name "usbutils")
(version "013") (version "014")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/linux/utils/usb/usbutils/" (uri (string-append "mirror://kernel.org/linux/utils/usb/usbutils/"
"usbutils-" version ".tar.xz")) "usbutils-" version ".tar.xz"))
(sha256 (sha256
(base32 "0f0klk6d3hmbpf6p4dcwa1qjzblmkhbxs1wsw87aidvqri7lj8wy")))) (base32 "0sgwfvr1b5w3ai1c0rmvzhk67y9vh7bq490rcxxj4q05svx9q1rs"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs (list "out" "python")) (outputs (list "out" "python"))
(arguments (arguments
@ -2098,12 +2098,7 @@ slabtop, tload, top, vmstat, w, watch and sysctl.")
(add-before 'bootstrap 'patch-bootstrap-scripts (add-before 'bootstrap 'patch-bootstrap-scripts
(lambda _ (lambda _
(substitute* "usbhid-dump/bootstrap" (substitute* "usbhid-dump/bootstrap"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))))
;; Don't let autogen.sh run configure with bogus options & CFLAGS.
(substitute* "autogen.sh"
(("^\\./configure.*") ""))
#t))
(add-after 'install 'separate-python-output (add-after 'install 'separate-python-output
;; Separating one Python script shaves more than 106 MiB from :out. ;; Separating one Python script shaves more than 106 MiB from :out.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -2114,8 +2109,7 @@ slabtop, tload, top, vmstat, w, watch and sysctl.")
(new (string-append out:python "/" file))) (new (string-append out:python "/" file)))
(mkdir-p (dirname new)) (mkdir-p (dirname new))
(rename-file old new))) (rename-file old new)))
(list "bin/lsusb.py")) (list "bin/lsusb.py"))))))))
#t))))))
(inputs (inputs
`(("eudev" ,eudev) `(("eudev" ,eudev)
("libusb" ,libusb) ("libusb" ,libusb)