From cbfc6b95c0cb80510997826c3ca97595e20bf93a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 5 Sep 2025 01:37:00 -0400 Subject: [PATCH] gnu: xoscope: Update to 2.3-0.0.0.d97b9b1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes this build failure: ------ comedi.c: In function ‘open_comedi’: comedi.c:480:15: error: too few arguments to function ‘comedi_get_cmd_generic_timed’ 480 | ret = comedi_get_cmd_generic_timed(comedi_dev, comedi_subdevice, &cmd, 0); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from comedi.c:27: /gnu/store/hghrvvp0lnmfb8ifad30yfgj1bca7ypx-comedilib-0.13.0/include/comedilib.h:193:5: note: declared here 193 | int comedi_get_cmd_generic_timed(comedi_t *dev,unsigned int subdevice, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ make[1]: *** [Makefile:508: comedi.o] Error 1 ------ * gnu/packages/electronics.scm (xoscope): Update to 2.3-0.0.0.d97b9b1. [origin]: Use git-fetch. [native-inputs]: Add automake, libtool, autoconf for bootstrapping. Change-Id: If78a5f4fcdbcf477bc3e7c7dbf57c37ea397c020 --- gnu/packages/electronics.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 58c932e5c3de1a7f93758aaad04647b713ffd596..56cae54c14bca93ba59ac80909a5fc4e2a2563f8 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -2426,27 +2426,31 @@ and coverage-analysis points. It outputs single- or multi-threaded (license license:lgpl3))) (define-public xoscope + (let ((revision "0.0.0") + (commit "d97b9b186a4137582ae27fce1da73f51c06f852e")) (package (name "xoscope") - (version "2.3") + (version (git-version "2.3" revision commit)) (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/xoscope/xoscope/" - version "/xoscope-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://git.code.sf.net/p/xoscope/code") + (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 - "0a5ycfc1qdmibvagc82r2mhv2i99m6pndy5i6ixas3j2297g6pgq")))) + "1jaz14pb8lx1y34f979v507dmkrq3wdczi0hkqzb64zg76cdkwya")))) (build-system gnu-build-system) (native-inputs - (list m4 pkg-config)) + (list m4 pkg-config automake libtool autoconf)) (inputs (list alsa-lib comedilib fftw gtk+ gtkdatabox)) (synopsis "Digital oscilloscope") (description "Xoscope is a digital oscilloscope that can acquire signals from ALSA, ESD, and COMEDI sources. This package currently does not include -support for ESD sources.") +support for ESD or COMEDI sources.") (home-page "https://xoscope.sourceforge.net/") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public yosys (package