diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-08 12:19:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-08 12:19:33 +0000 |
| commit | bef005163c5aa8b3cf33a9ad5746414e9e97b79b (patch) | |
| tree | be5926410b719c946f1a06448465c7618866ca54 /pkgs/applications/radio | |
| parent | f6ef5ce47348e99ecd0217f0035686dee9f2014c (diff) | |
| parent | 078f89379522b5f9e8485af6217f2fe5284e64c6 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/radio')
| -rw-r--r-- | pkgs/applications/radio/fldigi/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/radio/sdrangel/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 51728bfb403e8..d14e0017f6d38 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.17"; + version = "4.1.18"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1gzff60sn3h05279f9mdi1rkdws52m28shcil16911lvlq6ki13m"; + sha256 = "sha256-PH/YSrOoS6RSWyUenVYSDa7mJqODFoSpdP2tR2+QJw0="; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index b4a6cb775cc3c..6f723971c8e6b 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -9,7 +9,7 @@ fftwFloat, glew, hackrf, lib, -libav, +ffmpeg, libiio, libopus, libpulseaudio, @@ -44,7 +44,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio + glew opencv3 libusb1 boost libopus limesuite ffmpeg libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf fftwFloat codec2 cm256cc serialdv qtserialport libbladeRF uhd soapysdr-with-plugins |