diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
| commit | f03426420497cd9839f5fb3cb547dbecd8d6053b (patch) | |
| tree | 220cdbab5b58b27c63d2df3ee711ad4bfdda074b /gnu/packages/electronics.scm | |
| parent | 3cf1afb7e7249992b2db2f4f00899fd22237e89a (diff) | |
| parent | 069399ee9dbf75b7c89583f03346a63b2cfe4ac6 (diff) | |
| download | guix-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar.gz guix-f03426420497cd9839f5fb3cb547dbecd8d6053b.zip | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/django.scm
gnu/packages/gtk.scm
gnu/packages/llvm.scm
gnu/packages/python-web.scm
gnu/packages/python.scm
gnu/packages/tex.scm
guix/build-system/asdf.scm
guix/build/emacs-build-system.scm
guix/profiles.scm
Diffstat (limited to 'gnu/packages/electronics.scm')
| -rw-r--r-- | gnu/packages/electronics.scm | 10 |
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 |