[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/13: gnu: gnuradio: Simplify package definition.
From: |
guix-commits |
Subject: |
08/13: gnu: gnuradio: Simplify package definition. |
Date: |
Thu, 30 Jun 2022 05:25:01 -0400 (EDT) |
glv pushed a commit to branch master
in repository guix.
commit 1f6a9bbea68915b21cce86a7eeefa54ebdfdf096
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Thu Jun 30 10:53:29 2022 +0200
gnu: gnuradio: Simplify package definition.
* gnu/packages/radio.scm (gnuradio)[native-inputs]: Remove labels.
[propagated-inputs]: Move spdlog to...
[inputs]: ... here. Remove labels.
[arguments]: Remove trailing #t in phases.
---
gnu/packages/radio.scm | 110 ++++++++++++++++++++++++-------------------------
1 file changed, 53 insertions(+), 57 deletions(-)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index a4390fa201..74ee7bd081 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -556,58 +556,57 @@ used by RDS Spy, and audio files containing
@dfn{multiplex} signals (MPX).")
(base32 "0xdhb2blzajxpi0f2ch23hh6bzdwz5q7syi3bmiqzdjlj2yjfzd4"))))
(build-system cmake-build-system)
(native-inputs
- `(("doxygen" ,doxygen)
- ("ghostscript" ,ghostscript)
- ("js-mathjax" ,js-mathjax)
- ("orc" ,orc)
- ("pkg-config" ,pkg-config)
- ("pybind11" ,pybind11)
- ("python-cheetah" ,python-cheetah)
- ("python-mako" ,python-mako)
- ("python-pyzmq" ,python-pyzmq)
- ("python-scipy" ,python-scipy)
- ("python-sphinx" ,python-sphinx)
- ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
- texlive-amsmath
- ;; TODO: Add newunicodechar.
- texlive-latex-graphics)))
- ("xorg-server" ,xorg-server-for-tests)))
+ (list doxygen
+ ghostscript
+ js-mathjax
+ orc
+ pkg-config
+ pybind11
+ python-cheetah
+ python-mako
+ python-pyzmq
+ python-scipy
+ python-sphinx
+ (texlive-updmap.cfg (list texlive-amsfonts
+ texlive-amsmath
+ ;; TODO: Add newunicodechar.
+ texlive-latex-graphics))
+ xorg-server-for-tests))
(inputs
- `(("alsa-lib" ,alsa-lib)
- ("boost" ,boost)
- ("cairo" ,cairo)
- ("codec2" ,codec2)
- ("cppzmq" ,cppzmq)
- ("fftwf" ,fftwf)
- ("gmp" ,gmp)
- ("gsl" ,gsl)
- ("gsm" ,gsm)
- ("gtk+" ,gtk+)
- ("jack" ,jack-1)
- ("libsndfile" ,libsndfile)
- ("log4cpp" ,log4cpp)
- ("pango" ,pango)
- ("portaudio" ,portaudio)
- ("python" ,python)
- ("python-click" ,python-click)
- ("python-click-plugins" ,python-click-plugins)
- ("python-jsonschema" ,python-jsonschema)
- ("python-lxml" ,python-lxml)
- ("python-matplotlib" ,python-matplotlib)
- ("python-numpy" ,python-numpy)
- ("python-pycairo" ,python-pycairo)
- ("python-pygobject" ,python-pygobject)
- ("python-pyqt" ,python-pyqt-without-qtwebkit)
- ("python-pyqtgraph" ,python-pyqtgraph)
- ("python-pyyaml" ,python-pyyaml)
- ("qtbase" ,qtbase-5)
- ("qwt" ,qwt)
- ("sdl" ,sdl)
- ("soapysdr" ,soapysdr)
- ("volk" ,volk)
- ("zeromq" ,zeromq)))
- (propagated-inputs
- (list spdlog))
+ (list alsa-lib
+ boost
+ cairo
+ codec2
+ cppzmq
+ fftwf
+ gmp
+ gsl
+ gsm
+ gtk+
+ jack-1
+ libsndfile
+ log4cpp
+ pango
+ portaudio
+ python
+ python-click
+ python-click-plugins
+ python-jsonschema
+ python-lxml
+ python-matplotlib
+ python-numpy
+ python-pycairo
+ python-pygobject
+ python-pyqt-without-qtwebkit
+ python-pyqtgraph
+ python-pyyaml
+ qtbase-5
+ qwt
+ sdl
+ soapysdr
+ spdlog
+ volk
+ zeromq))
(arguments
`(#:modules ((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
@@ -645,14 +644,12 @@ used by RDS Spy, and audio files containing
@dfn{multiplex} signals (MPX).")
(substitute* '("gr-vocoder/include/gnuradio/vocoder/codec2.h"
"gr-vocoder/include/gnuradio/vocoder/freedv_api.h")
(("<codec2/")
- "<"))
- #t))
+ "<"))))
(add-before 'check 'set-test-environment
(lambda* (#:key inputs #:allow-other-keys)
(setenv "HOME" "/tmp")
(system "Xvfb :1 &")
- (setenv "DISPLAY" ":1")
- #t))
+ (setenv "DISPLAY" ":1")))
(replace 'check
(lambda* (#:key tests? parallel-tests? #:allow-other-keys)
(invoke "ctest" "-j" (if parallel-tests?
@@ -686,8 +683,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex}
signals (MPX).")
#f))))
inputs)))
(wrap-program (string-append out "/bin/gnuradio-companion")
- `("GI_TYPELIB_PATH" ":" prefix ,(filter identity paths))))
- #t)))))
+ `("GI_TYPELIB_PATH" ":" prefix ,(filter identity
paths)))))))))
(native-search-paths
;; Variables required to find third-party plugins at runtime.
(list (search-path-specification
- branch master updated (d921516f50 -> 9121fd78da), guix-commits, 2022/06/30
- 03/13: gnu: Add r-mathjaxr., guix-commits, 2022/06/30
- 04/13: gnu: r-metafor: Update to 3.4-0., guix-commits, 2022/06/30
- 07/13: gnu: gnss-sdr: Update to 0.0.17., guix-commits, 2022/06/30
- 02/13: gnu: Add r-metadat., guix-commits, 2022/06/30
- 06/13: gnu: gr-satellites: Update to 4.6.0., guix-commits, 2022/06/30
- 08/13: gnu: gnuradio: Simplify package definition.,
guix-commits <=
- 10/13: gnu: gr-iqbal: Add missing input., guix-commits, 2022/06/30
- 12/13: gnu: gnss-sdr: Add missing input., guix-commits, 2022/06/30
- 01/13: gnu: octave: Update to 7.1.0., guix-commits, 2022/06/30
- 09/13: gnu: gr-satellites: Add missing input., guix-commits, 2022/06/30
- 13/13: gnu: gqrx: Add missing input., guix-commits, 2022/06/30
- 05/13: gnu: gnuradio: Update to 3.10.3.0., guix-commits, 2022/06/30
- 11/13: gnu: gr-osmosdr: Add missing input., guix-commits, 2022/06/30