ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-26 04:29:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libsigrok: Update to 0.5.1.

Browse source 
* gnu/packages/electronics.scm (libsigrok): Update to 0.5.1.
[arguments]: Adjust to split udev rules and clean up a little.
This commit is contained in:
Tobias Geerinckx-Rice 2018-10-26 02:24:39 +02:00
parent 0e8e29088f
commit 2fba511e0f
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/electronics.scm
View file

@ -123,7 +123,7 @@ (define-public sigrok-firmware-fx2lafw
(define-public libsigrok (define-public libsigrok
(package (package
(name "libsigrok") (name "libsigrok")
(version "0.5.0") (version "0.5.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -131,19 +131,17 @@ (define-public libsigrok
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"197kr5ip98lxn7rv10zs35d1w0j7265s0xvckx0mq2l8kdvqd32c")))) "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"))))
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
`(#:tests? #f ; tests need usb access `(#:tests? #f ; tests need USB access
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'change-udev-group (add-before 'configure 'change-udev-group
(lambda _ (lambda _
(let ((file "contrib/z60_libsigrok.rules")) (substitute* (find-files "contrib" "\\.rules$")
(substitute* file (("plugdev") "dialout"))
(("plugdev") "dialout")) #t))
(rename-file file "contrib/60-libsigrok.rules")
#t)))
(add-after 'build 'build-doc (add-after 'build 'build-doc
(lambda _ (lambda _
(invoke "doxygen"))) (invoke "doxygen")))
@ -155,11 +153,12 @@ (define-public libsigrok
#t)) #t))
(add-after 'install-doc 'install-udev-rules (add-after 'install-doc 'install-udev-rules
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(install-file "contrib/60-libsigrok.rules" (let* ((out (assoc-ref outputs "out"))
(string-append (rules (string-append out "/lib/udev/rules.d/")))
(assoc-ref outputs "out") (for-each (lambda (file)
"/lib/udev/rules.d/")) (install-file file rules))
#t)) (find-files "contrib" "\\.rules$"))
#t)))
(add-after 'install-udev-rules 'install-fw (add-after 'install-udev-rules 'install-fw
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((fx2lafw (assoc-ref inputs "sigrok-firmware-fx2lafw")) (let* ((fx2lafw (assoc-ref inputs "sigrok-firmware-fx2lafw"))
@ -167,7 +166,6 @@ (define-public libsigrok
(dir-suffix "/share/sigrok-firmware/") (dir-suffix "/share/sigrok-firmware/")
(input-dir (string-append fx2lafw dir-suffix)) (input-dir (string-append fx2lafw dir-suffix))
(output-dir (string-append out dir-suffix))) (output-dir (string-append out dir-suffix)))
(mkdir-p output-dir)
(for-each (for-each
(lambda (file) (lambda (file)
(install-file file output-dir)) (install-file file output-dir))