wsjtx: 2.0.1 -> 2.1.0

This commit is contained in:
Luke Sandell 2019-08-10 18:54:55 -05:00
parent 0f91a1f329
commit 6417b03431
2 changed files with 14 additions and 13 deletions

View File

@ -1,22 +1,22 @@
{ stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake,
docbook_xsl, fftw, fftwFloat, gfortran, libtool, qtbase,
qtmultimedia, qtserialport, texinfo, libusb1 }:
docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase,
qtmultimedia, qtserialport, qttools, texinfo }:
stdenv.mkDerivation rec {
name = "wsjtx-${version}";
version = "2.0.1";
version = "2.1.0";
# This is a "superbuild" tarball containing both wsjtx and a hamlib fork
src = fetchurl {
url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz";
sha256 = "1kd0w57i9d9srbbfacza491vah8wa8100zjzzwqwdv70yy9qzw8q";
sha256 = "04flhyfw0djnnbrzh3f5lx06bnn92khchz3bmswk8if8n8j58v4y";
};
# Hamlib builds with autotools, wsjtx builds with cmake
# Omitting pkgconfig because it causes issues locating the built hamlib
nativeBuildInputs = [
asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool
texinfo
qttools texinfo
];
buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ];
@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Weak-signal digital communication modes for amateur radio";
longDescription = ''
WSJT-X implements communication protocols or "modes" called FT8, JT4, JT9,
JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for
WSJT-X implements communication protocols or "modes" called FT4, FT8, JT4,
JT9, JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for
detecting and measuring your own radio signals reflected from the Moon.
These modes were all designed for making reliable, confirmed ham radio
contacts under extreme weak-signal conditions.
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
# Older licenses are for the statically-linked hamlib
license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ];
platforms = platforms.linux;
maintainers = [ maintainers.lasandell ];
maintainers = with maintainers; [ lasandell ];
};
}

View File

@ -2,11 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e7e816b..e7dbb14a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -860,6 +860,7 @@ find_package (Qt5Widgets 5 REQUIRED)
find_package (Qt5Multimedia 5 REQUIRED)
find_package (Qt5PrintSupport 5 REQUIRED)
find_package (Qt5Sql 5 REQUIRED)
+find_package (Qt5SerialPort 5 REQUIRED)
@@ -885,6 +885,6 @@
#
# Widgets finds its own dependencies.
-find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools REQUIRED)
+find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools SerialPort REQUIRED)
if (WIN32)
add_definitions (-DQT_NEEDS_QTMAIN)