diff options
| author | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/electronics.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/electronics.scm')
| -rw-r--r-- | gnu/packages/electronics.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index c578fda334..0e985c9750 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)) @@ -276,7 +277,7 @@ format support.") ("glibmm" ,glibmm) ("libsigrok" ,libsigrok) ("libsigrokdecode" ,libsigrokdecode) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (home-page "https://www.sigrok.org/wiki/PulseView") (synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok") @@ -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 |