summaryrefslogtreecommitdiff
path: root/gnu/packages/electronics.scm
diff options
context:
space:
mode:
authorLudovic Courtès <[email protected]>2021-04-29 15:41:48 +0200
committerLudovic Courtès <[email protected]>2021-04-29 15:41:48 +0200
commit2c11e7be745a790320a42a357635997310d731d0 (patch)
tree226aafaccf6f77758ab6e0e174ff8f08318a1772 /gnu/packages/electronics.scm
parente12210dc92098d8581cea3007d57dbb6be16bb41 (diff)
parent041d62f7cc244d7f6c0bd6d60cdf08e72d400313 (diff)
Merge remote-tracking branch 'origin/master' into wip-ungrafting
Diffstat (limited to 'gnu/packages/electronics.scm')
-rw-r--r--gnu/packages/electronics.scm10
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index c578fda334..861544ee22 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -43,6 +43,7 @@
#:use-module (gnu packages libftdi)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages m4)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages qt))
@@ -308,22 +309,23 @@ individual low-level driver modules.")
(define-public xoscope
(package
(name "xoscope")
- (version "2.2")
+ (version "2.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/xoscope/xoscope/"
version "/xoscope-" version ".tar.gz"))
(sha256
(base32
- "1b9wxnrwz8qy6qyx5icrklb4720rlxnr1c4h3dr6g0dzj6nkc5av"))))
+ "0a5ycfc1qdmibvagc82r2mhv2i99m6pndy5i6ixas3j2297g6pgq"))))
(build-system gnu-build-system)
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("m4" ,m4)
+ ("pkg-config" ,pkg-config)))
(inputs
`(("alsa-lib" ,alsa-lib)
("comedilib" ,comedilib)
("fftw" ,fftw)
- ("gtk+-2" ,gtk+-2)
+ ("gtk+" ,gtk+)
("gtkdatabox" ,gtkdatabox)))
(synopsis "Digital oscilloscope")
(description "Xoscope is a digital oscilloscope that can acquire signals