From 2fba511e0fa2b39218101c2661864b6b570315c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Oct 2018 02:24:39 +0200 Subject: gnu: libsigrok: Update to 0.5.1. * gnu/packages/electronics.scm (libsigrok): Update to 0.5.1. [arguments]: Adjust to split udev rules and clean up a little. --- gnu/packages/electronics.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'gnu/packages/electronics.scm') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index d13f220b84..4aaf050faf 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -123,7 +123,7 @@ as simple logic analyzer and/or oscilloscope hardware.") (define-public libsigrok (package (name "libsigrok") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (string-append @@ -131,19 +131,17 @@ as simple logic analyzer and/or oscilloscope hardware.") version ".tar.gz")) (sha256 (base32 - "197kr5ip98lxn7rv10zs35d1w0j7265s0xvckx0mq2l8kdvqd32c")))) + "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4")))) (outputs '("out" "doc")) (arguments - `(#:tests? #f ; tests need usb access + `(#:tests? #f ; tests need USB access #:phases (modify-phases %standard-phases (add-before 'configure 'change-udev-group (lambda _ - (let ((file "contrib/z60_libsigrok.rules")) - (substitute* file - (("plugdev") "dialout")) - (rename-file file "contrib/60-libsigrok.rules") - #t))) + (substitute* (find-files "contrib" "\\.rules$") + (("plugdev") "dialout")) + #t)) (add-after 'build 'build-doc (lambda _ (invoke "doxygen"))) @@ -155,11 +153,12 @@ as simple logic analyzer and/or oscilloscope hardware.") #t)) (add-after 'install-doc 'install-udev-rules (lambda* (#:key outputs #:allow-other-keys) - (install-file "contrib/60-libsigrok.rules" - (string-append - (assoc-ref outputs "out") - "/lib/udev/rules.d/")) - #t)) + (let* ((out (assoc-ref outputs "out")) + (rules (string-append out "/lib/udev/rules.d/"))) + (for-each (lambda (file) + (install-file file rules)) + (find-files "contrib" "\\.rules$")) + #t))) (add-after 'install-udev-rules 'install-fw (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((fx2lafw (assoc-ref inputs "sigrok-firmware-fx2lafw")) @@ -167,7 +166,6 @@ as simple logic analyzer and/or oscilloscope hardware.") (dir-suffix "/share/sigrok-firmware/") (input-dir (string-append fx2lafw dir-suffix)) (output-dir (string-append out dir-suffix))) - (mkdir-p output-dir) (for-each (lambda (file) (install-file file output-dir)) -- cgit v1.2.3 From 61c58b7827b336877758d824aafd0c5e4a50713f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Oct 2018 15:54:20 +0100 Subject: gnu: sigrok-cli: Update to 0.7.1. * gnu/packages/electronics.scm (sigrok-cli): Update to 0.7.1. --- gnu/packages/electronics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/electronics.scm') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 4aaf050faf..ddee5bac13 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -202,7 +202,7 @@ format support.") (define-public sigrok-cli (package (name "sigrok-cli") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (string-append @@ -210,7 +210,7 @@ format support.") version ".tar.gz")) (sha256 (base32 - "072ylscp0ppgii1k5j07hhv7dfmni4vyhxnsvxmgqgfyq9ldjsan")))) + "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m")))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 58cd3123ac4d6fb704a07c2ab8165805db03da9a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Oct 2018 16:30:11 +0100 Subject: gnu: pulseview: Update to 0.4.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/electronics.scm (pulseview): Update to 0.4.1. [arguments]: Remove CMAKE_CXX_FLAGS from #:configure-flags. (Keep) build(ing) the unit tests. Add a ‘remove-empty-doc-directory’ phase. --- gnu/packages/electronics.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'gnu/packages/electronics.scm') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index ddee5bac13..bc30e619ec 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -226,7 +226,7 @@ format support.") (define-public pulseview (package (name "pulseview") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (string-append @@ -234,9 +234,20 @@ format support.") version ".tar.gz")) (sha256 (base32 - "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q")))) + "0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy")))) + (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DCMAKE_CXX_FLAGS=-fext-numeric-literals"))) + `(#:configure-flags '("-DENABLE_TESTS=y") + #:phases + (modify-phases %standard-phases + (add-after 'install 'remove-empty-doc-directory + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion (string-append out "/share") + ;; Use RMDIR to never risk silently deleting files. + (rmdir "doc/pulseview") + (rmdir "doc")) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -247,7 +258,6 @@ format support.") ("libsigrokdecode" ,libsigrokdecode) ("qtbase" ,qtbase) ("qtsvg" ,qtsvg))) - (build-system cmake-build-system) (home-page "https://www.sigrok.org/wiki/PulseView") (synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok") (description "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI -- cgit v1.2.3