diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/radio')
45 files changed, 203 insertions, 117 deletions
diff --git a/nixpkgs/pkgs/applications/radio/airspy/default.nix b/nixpkgs/pkgs/applications/radio/airspy/default.nix index 0a313c35a18..67a59b68cd5 100644 --- a/nixpkgs/pkgs/applications/radio/airspy/default.nix +++ b/nixpkgs/pkgs/applications/radio/airspy/default.nix @@ -1,36 +1,33 @@ { stdenv, lib, fetchFromGitHub -, cmake , pkgconfig, libusb +, cmake , pkgconfig, libusb1 }: -let +stdenv.mkDerivation rec { + pname = "airspy"; version = "1.0.9"; -in - stdenv.mkDerivation { - pname = "airspy"; - inherit version; - src = fetchFromGitHub { - owner = "airspy"; - repo = "airspyone_host"; - rev = "v${version}"; - sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x"; - }; + src = fetchFromGitHub { + owner = "airspy"; + repo = "airspyone_host"; + rev = "v${version}"; + sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x"; + }; - postPatch = '' - substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d" - ''; + postPatch = '' + substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d" + ''; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libusb ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libusb1 ]; - cmakeFlags = - lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; + cmakeFlags = + lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; - meta = with stdenv.lib; { - homepage = https://github.com/airspy/airspyone_host; - description = "Host tools and driver library for the AirSpy SDR"; - license = licenses.bsd3; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ markuskowa ]; - }; - } + meta = with stdenv.lib; { + homepage = "https://github.com/airspy/airspyone_host"; + description = "Host tools and driver library for the AirSpy SDR"; + license = licenses.bsd3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ markuskowa ]; + }; +} diff --git a/nixpkgs/pkgs/applications/radio/aldo/default.nix b/nixpkgs/pkgs/applications/radio/aldo/default.nix index fc38f6be4cc..df52531a518 100644 --- a/nixpkgs/pkgs/applications/radio/aldo/default.nix +++ b/nixpkgs/pkgs/applications/radio/aldo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Morse code training program"; - homepage = http://aldo.nongnu.org/; + homepage = "http://aldo.nongnu.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/radio/chirp/default.nix b/nixpkgs/pkgs/applications/radio/chirp/default.nix index f88687b076e..898244970c8 100644 --- a/nixpkgs/pkgs/applications/radio/chirp/default.nix +++ b/nixpkgs/pkgs/applications/radio/chirp/default.nix @@ -4,11 +4,11 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20200213"; + version = "20200409"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "189kg3425wggib1cggcj49bk01pq3j4b8mks7najpp1rjsl5f2i1"; + sha256 = "16zhwg2xmp5kpqx5isavwwkfq1212zgfj8gbp453ngjcrvp3m4lq"; }; propagatedBuildInputs = with python2.pkgs; [ @@ -17,7 +17,7 @@ python2.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A free, open-source tool for programming your amateur radio"; - homepage = https://chirp.danplanet.com/; + homepage = "https://chirp.danplanet.com/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.the-kenny ]; diff --git a/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix b/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix index 14badd6c55c..ef4d68af54c 100644 --- a/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; meta = with stdenv.lib; { - homepage = https://cubicsdr.com; + homepage = "https://cubicsdr.com"; description = "Software Defined Radio application"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lasandell ]; diff --git a/nixpkgs/pkgs/applications/radio/dablin/default.nix b/nixpkgs/pkgs/applications/radio/dablin/default.nix index fba63362ab6..d365596b9c3 100644 --- a/nixpkgs/pkgs/applications/radio/dablin/default.nix +++ b/nixpkgs/pkgs/applications/radio/dablin/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Play DAB/DAB+ from ETI-NI aligned stream"; - homepage = https://github.com/Opendigitalradio/dablin; + homepage = "https://github.com/Opendigitalradio/dablin"; license = with licenses; [ gpl3 lgpl21 ]; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; diff --git a/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix b/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix index 68b4cfe8af4..47b72669f8f 100644 --- a/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix +++ b/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { longDescription = '' DMRconfig is a utility for programming digital radios via USB programming cable. ''; - homepage = https://github.com/sergev/dmrconfig; + homepage = "https://github.com/sergev/dmrconfig"; license = licenses.asl20; maintainers = [ maintainers.etu ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/radio/dump1090/default.nix b/nixpkgs/pkgs/applications/radio/dump1090/default.nix index 0a92bea44e8..01af881d133 100644 --- a/nixpkgs/pkgs/applications/radio/dump1090/default.nix +++ b/nixpkgs/pkgs/applications/radio/dump1090/default.nix @@ -2,27 +2,27 @@ , fetchFromGitHub , pkgconfig , libbladeRF -, libusb +, libusb1 , ncurses , rtl-sdr }: stdenv.mkDerivation rec { pname = "dump1090"; - version = "3.7.2"; + version = "3.8.0"; src = fetchFromGitHub { owner = "flightaware"; repo = pname; rev = "v${version}"; - sha256 = "0vlv9bd805kid202xxkrnl51rh02cyrl055gbcqlqgk51j5rrq8w"; + sha256 = "0c30x56h79hza9m6b9zp5y28jxx4f4n5xgaaw597l8agcm5iia0p"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libbladeRF - libusb + libusb1 ncurses rtl-sdr ]; diff --git a/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix b/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix index 915d0ba84db..d273594f4c9 100644 --- a/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix +++ b/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert ebooks to Morse MP3s/OGGs"; - homepage = http://fkurz.net/ham/ebook2cw.html; + homepage = "http://fkurz.net/ham/ebook2cw.html"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ earldouglas ]; diff --git a/nixpkgs/pkgs/applications/radio/fldigi/default.nix b/nixpkgs/pkgs/applications/radio/fldigi/default.nix index b7705cff026..20cf2cf6286 100644 --- a/nixpkgs/pkgs/applications/radio/fldigi/default.nix +++ b/nixpkgs/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.09"; + version = "4.1.11"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1pdwm8na2yq6wj76057sbfxr5cb5avnm26if8spsp5fkfw9yylwp"; + sha256 = "1y62xn1pim38ibaf2mbl8b7aq20jdaac6lgggb9r402w9bj5b196"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem program"; - homepage = https://sourceforge.net/projects/fldigi/; + homepage = "https://sourceforge.net/projects/fldigi/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ relrod ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/applications/radio/fllog/default.nix b/nixpkgs/pkgs/applications/radio/fllog/default.nix index 49149a2d82a..649caae0902 100644 --- a/nixpkgs/pkgs/applications/radio/fllog/default.nix +++ b/nixpkgs/pkgs/applications/radio/fllog/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem log program"; - homepage = https://sourceforge.net/projects/fldigi/; + homepage = "https://sourceforge.net/projects/fldigi/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ dysinger ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/applications/radio/flmsg/default.nix b/nixpkgs/pkgs/applications/radio/flmsg/default.nix index 39fbb0de06c..e437dffa485 100644 --- a/nixpkgs/pkgs/applications/radio/flmsg/default.nix +++ b/nixpkgs/pkgs/applications/radio/flmsg/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem message program"; - homepage = https://sourceforge.net/projects/fldigi/; + homepage = "https://sourceforge.net/projects/fldigi/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ dysinger ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/applications/radio/flrig/default.nix b/nixpkgs/pkgs/applications/radio/flrig/default.nix index 17d579cb45e..968b2fd0df9 100644 --- a/nixpkgs/pkgs/applications/radio/flrig/default.nix +++ b/nixpkgs/pkgs/applications/radio/flrig/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.49"; + version = "1.3.50"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "0icfniiw2l7d7gyxrzy87n3ragzvf0ykvq7c10ppf111wl5in295"; + sha256 = "0fzrknzzi8kmzmrcfpc8rxr7v4a4ny6z6z5q5qwh95sp2kn2qzp9"; }; buildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem rig control program"; - homepage = https://sourceforge.net/projects/fldigi/; + homepage = "https://sourceforge.net/projects/fldigi/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ dysinger ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/applications/radio/flwrap/default.nix b/nixpkgs/pkgs/applications/radio/flwrap/default.nix index 6bdab0a925d..889c212de4e 100644 --- a/nixpkgs/pkgs/applications/radio/flwrap/default.nix +++ b/nixpkgs/pkgs/applications/radio/flwrap/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem file transfer program"; - homepage = https://sourceforge.net/projects/fldigi/; + homepage = "https://sourceforge.net/projects/fldigi/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ dysinger ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix b/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix index c26d3e77c70..30c2638a72f 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnuradio block for ais"; - homepage = https://github.com/bistromath/gr-ais; + homepage = "https://github.com/bistromath/gr-ais"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mog ]; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index f5c89ae51ce..6d788f77bc3 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/default.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { environments to support both wireless communications research and real-world radio systems. ''; - homepage = https://www.gnuradio.org; + homepage = "https://www.gnuradio.org"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor fpletz ]; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix b/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix index 27cdfc74aab..e0b8d7dd44f 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnuradio block for gsm"; - homepage = https://github.com/ptrkrysik/gr-gsm; + homepage = "https://github.com/ptrkrysik/gr-gsm"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ mog ]; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix index ec1b802c659..490caaaa7be 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnuradio source and sink blocks for LimeSDR"; - homepage = https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio; + homepage = "https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix b/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix index 3026c81e8ef..e3d851e2e14 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnuradio block for encryption"; - homepage = https://github.com/stwunsch/gr-nacl; + homepage = "https://github.com/stwunsch/gr-nacl"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mog ]; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix b/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix index 017e2e1632c..1078cf4df68 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnuradio block for OsmoSDR and rtl-sdr"; - homepage = https://sdr.osmocom.org/trac/wiki/GrOsmoSDR; + homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor the-kenny ]; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix b/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix index e4a55fe5098..1f8ed211ef2 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnuradio block for radio data system"; - homepage = https://github.com/bastibl/gr-rds; + homepage = "https://github.com/bastibl/gr-rds"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mog ]; diff --git a/nixpkgs/pkgs/applications/radio/gqrx/default.nix b/nixpkgs/pkgs/applications/radio/gqrx/default.nix index e95c7d77952..f1a71804e3f 100644 --- a/nixpkgs/pkgs/applications/radio/gqrx/default.nix +++ b/nixpkgs/pkgs/applications/radio/gqrx/default.nix @@ -38,7 +38,7 @@ mkDerivation rec { including Funcube Dongle Pro/Pro+, rtl-sdr, HackRF, and Universal Software Radio Peripheral (USRP) devices. ''; - homepage = http://gqrx.dk/; + homepage = "https://gqrx.dk/"; # Some of the code comes from the Cutesdr project, with a BSD license, but # it's currently unknown which version of the BSD license that is. license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/applications/radio/hackrf/default.nix b/nixpkgs/pkgs/applications/radio/hackrf/default.nix index 09b4c84c131..9569dd89797 100644 --- a/nixpkgs/pkgs/applications/radio/hackrf/default.nix +++ b/nixpkgs/pkgs/applications/radio/hackrf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libusb, fftwSinglePrec }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libusb1, fftwSinglePrec }: stdenv.mkDerivation rec { pname = "hackrf"; @@ -11,9 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0idh983xh6gndk9kdgx5nzz76x3mxb42b02c5xvdqahadsfx3b9w"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; + buildInputs = [ - cmake libusb fftwSinglePrec + libusb1 + fftwSinglePrec ]; cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ]; @@ -24,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source SDR platform"; - homepage = http://greatscottgadgets.com/hackrf/; + homepage = "http://greatscottgadgets.com/hackrf/"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ sjmackenzie the-kenny ]; diff --git a/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix b/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix index 3964a8c3737..273d2d8c8e3 100644 --- a/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix +++ b/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { This package is for hackrf devices. ''; - homepage = https://github.com/scateu/kalibrate-hackrf; + homepage = "https://github.com/scateu/kalibrate-hackrf"; license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.mog ]; diff --git a/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix b/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix index 879cd6e3aac..38913e827d0 100644 --- a/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { This package is for RTL-SDR devices. ''; - homepage = https://github.com/steve-m/kalibrate-rtl; + homepage = "https://github.com/steve-m/kalibrate-rtl"; license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/applications/radio/limesuite/default.nix b/nixpkgs/pkgs/applications/radio/limesuite/default.nix index aae062a87c7..ef36eac28e4 100644 --- a/nixpkgs/pkgs/applications/radio/limesuite/default.nix +++ b/nixpkgs/pkgs/applications/radio/limesuite/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Driver and GUI for LMS7002M-based SDR platforms"; - homepage = https://github.com/myriadrf/LimeSuite; + homepage = "https://github.com/myriadrf/LimeSuite"; license = licenses.asl20; maintainers = with maintainers; [ markuskowa ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/radio/minimodem/default.nix b/nixpkgs/pkgs/applications/radio/minimodem/default.nix index 55cd14cf70d..e94561e46dc 100644 --- a/nixpkgs/pkgs/applications/radio/minimodem/default.nix +++ b/nixpkgs/pkgs/applications/radio/minimodem/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { standard FSK protocols such as Bell103, Bell202, RTTY, NOAA SAME, and Caller-ID. ''; - homepage = http://www.whence.com/minimodem/; + homepage = "http://www.whence.com/minimodem/"; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ relrod ]; diff --git a/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix b/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix index c0f189686ac..de6b8504091 100644 --- a/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix +++ b/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { AFSK2400 AFSK2400_2 AFSK2400_3 HAPN4800 FSK9600 DTMF ZVEI1 ZVEI2 ZVEI3 DZVEI PZVEI EEA EIA CCIR MORSE CW ''; - homepage = https://github.com/EliasOenal/multimon-ng; + homepage = "https://github.com/EliasOenal/multimon-ng"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ the-kenny ]; diff --git a/nixpkgs/pkgs/applications/radio/pyradio/default.nix b/nixpkgs/pkgs/applications/radio/pyradio/default.nix index 88ce23cd709..f23359688c6 100644 --- a/nixpkgs/pkgs/applications/radio/pyradio/default.nix +++ b/nixpkgs/pkgs/applications/radio/pyradio/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.7.1"; + version = "0.8.7.2"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = version; - sha256 = "1f1dch5vrx2armrff19rh9gpqydspn3nvzc9p9j2jfi6gsxhppyb"; + sha256 = "0h2sxaqpmc1d1kpvpbcs9wymgzhx25x0x9p7dbyfw9r90i6123q1"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/applications/radio/qradiolink/default.nix b/nixpkgs/pkgs/applications/radio/qradiolink/default.nix index a00ec6c47eb..4c792811dc5 100644 --- a/nixpkgs/pkgs/applications/radio/qradiolink/default.nix +++ b/nixpkgs/pkgs/applications/radio/qradiolink/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "SDR transceiver application for analog and digital modes"; - homepage = http://qradiolink.org/; + homepage = "http://qradiolink.org/"; license = licenses.agpl3; maintainers = [ maintainers.markuskowa ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/radio/qsstv/default.nix b/nixpkgs/pkgs/applications/radio/qsstv/default.nix index a4ef5a2a0d1..d5d12a71403 100644 --- a/nixpkgs/pkgs/applications/radio/qsstv/default.nix +++ b/nixpkgs/pkgs/applications/radio/qsstv/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Qt-based slow-scan TV and fax"; - homepage = http://users.telenet.be/on4qz/; + homepage = "http://users.telenet.be/on4qz/"; platforms = platforms.linux; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ hax404 ]; diff --git a/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix b/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix index 69c568c3a1b..8fb5154ff78 100644 --- a/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; - homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr; + homepage = "http://sdr.osmocom.org/trac/wiki/rtl-sdr"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/applications/radio/rtl_433/default.nix b/nixpkgs/pkgs/applications/radio/rtl_433/default.nix index 5faac96d28f..78d0f8befc9 100644 --- a/nixpkgs/pkgs/applications/radio/rtl_433/default.nix +++ b/nixpkgs/pkgs/applications/radio/rtl_433/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Decode traffic from devices that broadcast on 433.9 MHz"; - homepage = https://github.com/merbanan/rtl_433; + homepage = "https://github.com/merbanan/rtl_433"; license = licenses.gpl2; maintainers = with maintainers; [ earldouglas ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix b/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix index eacbe66e5e5..4a69e52741e 100644 --- a/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyAirspy; + homepage = "https://github.com/pothosware/SoapyAirspy"; description = "SoapySDR plugin for Airspy devices"; license = licenses.mit; maintainers = with maintainers; [ markuskowa ]; diff --git a/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix b/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix index 0bb05a204da..7e2e17a8455 100644 --- a/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyBladeRF; + homepage = "https://github.com/pothosware/SoapyBladeRF"; description = "SoapySDR plugin for BladeRF devices"; license = licenses.lgpl21; maintainers = with maintainers; [ markuskowa ]; diff --git a/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix b/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix index 5ab4c3363f4..e472b1cc3ae 100644 --- a/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyHackRF; + homepage = "https://github.com/pothosware/SoapyHackRF"; description = "SoapySDR plugin for HackRF devices"; license = licenses.mit; maintainers = with maintainers; [ markuskowa ]; diff --git a/nixpkgs/pkgs/applications/radio/soapyremote/default.nix b/nixpkgs/pkgs/applications/radio/soapyremote/default.nix index 2f73403a168..ed94693db41 100644 --- a/nixpkgs/pkgs/applications/radio/soapyremote/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyremote/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyRemote; + homepage = "https://github.com/pothosware/SoapyRemote"; description = "SoapySDR plugin for remote access to SDRs"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; diff --git a/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix b/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix index 8bf473cb36a..8f342190ba7 100644 --- a/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyRTLSDR; + homepage = "https://github.com/pothosware/SoapyRTLSDR"; description = "SoapySDR plugin for RTL-SDR devices"; license = licenses.mit; maintainers = with maintainers; [ ragge ]; diff --git a/nixpkgs/pkgs/applications/radio/soapysdr/default.nix b/nixpkgs/pkgs/applications/radio/soapysdr/default.nix index e072ec97b97..36df6ad19d3 100644 --- a/nixpkgs/pkgs/applications/radio/soapysdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapysdr/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapySDR; + homepage = "https://github.com/pothosware/SoapySDR"; description = "Vendor and platform neutral SDR support library"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; diff --git a/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix b/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix index 9e910584158..a169116c29a 100644 --- a/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyAirspy; + homepage = "https://github.com/pothosware/SoapyAirspy"; description = "SoapySDR plugin for UHD devices"; license = licenses.gpl3; maintainers = with maintainers; [ markuskowa ]; diff --git a/nixpkgs/pkgs/applications/radio/tlf/default.nix b/nixpkgs/pkgs/applications/radio/tlf/default.nix index 530008702f1..e3fdb9718e4 100644 --- a/nixpkgs/pkgs/applications/radio/tlf/default.nix +++ b/nixpkgs/pkgs/applications/radio/tlf/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { EU SPRINT shortwave contests (single operator) as well as a LOT MORE basic contests, general QSO and DXpedition mode. ''; - homepage = https://tlf.github.io/; + homepage = "https://tlf.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/radio/tqsl/default.nix b/nixpkgs/pkgs/applications/radio/tqsl/default.nix index 451a63c3d81..fd5f5505a67 100644 --- a/nixpkgs/pkgs/applications/radio/tqsl/default.nix +++ b/nixpkgs/pkgs/applications/radio/tqsl/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software for using the ARRL Logbook of the World"; - homepage = https://www.arrl.org/tqsl-download; + homepage = "https://www.arrl.org/tqsl-download"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.dpflug ]; diff --git a/nixpkgs/pkgs/applications/radio/uhd/default.nix b/nixpkgs/pkgs/applications/radio/uhd/default.nix index 76519062f59..e7ddb5787fa 100644 --- a/nixpkgs/pkgs/applications/radio/uhd/default.nix +++ b/nixpkgs/pkgs/applications/radio/uhd/default.nix @@ -1,57 +1,129 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig -, python, orc, libusb1, boost }: - -# You need these udev rules to not have to run as root (copied from -# ${uhd}/share/uhd/utils/uhd-usrp.rules): -# -# SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666" -# SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" +{ stdenv +, fetchurl +, fetchFromGitHub +, cmake +, pkgconfig +# See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations +, boost +, enableLibuhd_C_api ? true +# requires numpy +, enableLibuhd_Python_api ? false +, python3 ? null +, enableExamples ? false +, enableUtils ? false +, enableLiberio ? false +, liberio ? null +, libusb1 ? null +, enableDpdk ? false +, dpdk ? null +# Devices +, enableOctoClock ? true +, enableMpmd ? true +, enableB100 ? true +, enableB200 ? true +, enableUsrp1 ? true +, enableUsrp2 ? true +, enableX300 ? true +, enableN230 ? true +, enableN300 ? true +, enableN320 ? true +, enableE300 ? true +, enableE320 ? true +}: let - uhdVer = "v" + version; + onOffBool = b: if b then "ON" else "OFF"; + inherit (stdenv.lib) optionals; +in +stdenv.mkDerivation rec { + pname = "uhd"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... style keeps changing - version = "3.14.0.0"; - - # Firmware images are downloaded (pre-built) from the respective release on Github - uhdImagesSrc = fetchurl { - url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz"; - sha256 = "1fp37wgqkbr14cxg9l7ghfd4r92y2bxwgb7cfjzs96hbpd9s6al0"; - }; - -in stdenv.mkDerivation { - pname = "uhd"; - inherit version; + version = "3.15.0.0"; src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = uhdVer; - sha256 = "0y1hff4vslfv36vxgvjqajg4862a11d4wgr0vcb0visgh1bi8qgy"; + rev = "v${version}"; + sha256 = "0jknln88a69fh244670nb7qrflbyv0vvdxfddb5g8ncpb6hcg8qf"; + }; + # Firmware images are downloaded (pre-built) from the respective release on Github + uhdImagesSrc = fetchurl { + url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz"; + sha256 = "1fir1a13ac07mqhm4sr34cixiqj2difxq0870qv1wr7a7cbfw6vp"; }; enableParallelBuilding = true; - # ABI differences GCC 7.1 - # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1 + cmakeFlags = [ + "-DENABLE_LIBUHD=ON" + "-DENABLE_USB=ON" + "-DENABLE_TESTS=ON" # This installs tests as well so we delete them via postPhases + "-DENABLE_EXAMPLES=${onOffBool enableExamples}" + "-DENABLE_UTILS=${onOffBool enableUtils}" + "-DENABLE_LIBUHD_C_API=${onOffBool enableLibuhd_C_api}" + "-DENABLE_LIBUHD_PYTHON_API=${onOffBool enableLibuhd_Python_api}" + "-DENABLE_LIBERIO=${onOffBool enableLiberio}" + "-DENABLE_DPDK=${onOffBool enableDpdk}" + # Devices + "-DENABLE_OCTOCLOCK=${onOffBool enableOctoClock}" + "-DENABLE_MPMD=${onOffBool enableMpmd}" + "-DENABLE_B100=${onOffBool enableB100}" + "-DENABLE_B200=${onOffBool enableB200}" + "-DENABLE_USRP1=${onOffBool enableUsrp1}" + "-DENABLE_USRP2=${onOffBool enableUsrp2}" + "-DENABLE_X300=${onOffBool enableX300}" + "-DENABLE_N230=${onOffBool enableN230}" + "-DENABLE_N300=${onOffBool enableN300}" + "-DENABLE_N320=${onOffBool enableN320}" + "-DENABLE_E300=${onOffBool enableE300}" + "-DENABLE_E320=${onOffBool enableE320}" + ] + # TODO: Check if this still needed + # ABI differences GCC 7.1 + # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1 + ++ [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] + ; - cmakeFlags = [ "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"] ++ - [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]; + # Python + Mako are always required for the build itself but not necessary for runtime. + pythonEnv = python3.withPackages (ps: with ps; [ Mako ] + ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ] + ++ optionals (enableUtils) [ requests six ] + ); - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + ] + # If both enableLibuhd_Python_api and enableUtils are off, we don't need + # pythonEnv in buildInputs as it's a 'build' dependency and not a runtime + # dependency + ++ optionals (!enableLibuhd_Python_api && !enableUtils) [ pythonEnv ] + ; buildInputs = [ - (python.withPackages (ps: with ps; [ Mako six requests ])) - orc - libusb1 boost - ]; + libusb1 + ] + # However, if enableLibuhd_Python_api *or* enableUtils is on, we need + # pythonEnv for runtime as well. The utilities' runtime dependencies are + # handled at the environment + ++ optionals (enableLibuhd_Python_api || enableUtils) [ pythonEnv ] + ++ optionals (enableLiberio) [ liberio ] + ++ optionals (enableDpdk) [ dpdk ] + ; + + doCheck = true; # Build only the host software preConfigure = "cd host"; + # TODO: Check if this still needed, perhaps relevant: + # https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm patches = if stdenv.isAarch32 then ./neon.patch else null; - postPhases = [ "installFirmware" ]; + postPhases = [ "installFirmware" "removeInstalledTests" ] + ++ optionals (enableUtils) [ "moveUdevRules" ] + ; # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` installFirmware = '' @@ -59,6 +131,18 @@ in stdenv.mkDerivation { tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images" ''; + # -DENABLE_TESTS=ON installs the tests, we don't need them in the output + removeInstalledTests = '' + rm -r $out/lib/uhd/tests + ''; + + # Moves the udev rules to the standard location, needed only if utils are + # enabled + moveUdevRules = '' + mkdir -p $out/lib/udev/rules.d + mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/ + ''; + meta = with stdenv.lib; { description = "USRP Hardware Driver (for Software Defined Radio)"; longDescription = '' @@ -68,7 +152,7 @@ in stdenv.mkDerivation { USRP devices are designed and sold by Ettus Research, LLC and its parent company, National Instruments. ''; - homepage = https://uhd.ettus.com/; + homepage = "https://uhd.ettus.com/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor fpletz tomberek ]; diff --git a/nixpkgs/pkgs/applications/radio/urh/default.nix b/nixpkgs/pkgs/applications/radio/urh/default.nix index 6c8615fd631..850f73c4922 100644 --- a/nixpkgs/pkgs/applications/radio/urh/default.nix +++ b/nixpkgs/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.8.3"; + version = "2.8.5"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "17104livp6fv2zg56sqv90lqb7ywqhq2qfnal1hriwwh1b92glv8"; + sha256 = "060npn0q7yrby2zj9hi8x7raivs91v9hvryvf45k1ipyqh8dgri6"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/radio/welle-io/default.nix b/nixpkgs/pkgs/applications/radio/welle-io/default.nix index 66a033fef25..971399c4a22 100644 --- a/nixpkgs/pkgs/applications/radio/welle-io/default.nix +++ b/nixpkgs/pkgs/applications/radio/welle-io/default.nix @@ -42,7 +42,7 @@ in mkDerivation { meta = with lib; { description = "A DAB/DAB+ Software Radio"; - homepage = https://www.welle.io/; + homepage = "https://www.welle.io/"; maintainers = with maintainers; [ ck3d markuskowa ]; license = licenses.gpl2; platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; diff --git a/nixpkgs/pkgs/applications/radio/xlog/default.nix b/nixpkgs/pkgs/applications/radio/xlog/default.nix index 2268cdf725d..31bcfa463b9 100644 --- a/nixpkgs/pkgs/applications/radio/xlog/default.nix +++ b/nixpkgs/pkgs/applications/radio/xlog/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { location in latitude and longitude and distance and heading in kilometers or miles, both for short and long path. ''; - homepage = https://www.nongnu.org/xlog; + homepage = "https://www.nongnu.org/xlog"; maintainers = [ maintainers.mafo ]; license = licenses.gpl3; platforms = platforms.unix; |