git.iko.soy/typeable/nixpkgs
on master help sign in
wsjtx: 2.0.1 -> 2.1.0
commit6417b034311f80f9170c7fdd0c02ef8916b42275 authorLuke Sandell <lasandell@gmail.com> dateSat 10 Aug 2019, 18:54 (7 years ago) parent0f91a1f
2 files changed+14−13
pkgs/applications/radio/wsjtx/default.nix+8−8 pkgs/applications/radio/wsjtx/wsjtx.patch+6−5
pkgs/applications/radio/wsjtx/default.nix+8−8
@@ -1,22 +1,22 @@
11{ stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake,
2− docbook_xsl, fftw, fftwFloat, gfortran, libtool, qtbase,
3− qtmultimedia, qtserialport, texinfo, libusb1 }:
2+ docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase,
3+ qtmultimedia, qtserialport, qttools, texinfo }:
44
55stdenv.mkDerivation rec {
66 name = "wsjtx-${version}";
7− version = "2.0.1";
7+ version = "2.1.0";
88
99 # This is a "superbuild" tarball containing both wsjtx and a hamlib fork
1010 src = fetchurl {
1111 url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz";
12− sha256 = "1kd0w57i9d9srbbfacza491vah8wa8100zjzzwqwdv70yy9qzw8q";
12+ sha256 = "04flhyfw0djnnbrzh3f5lx06bnn92khchz3bmswk8if8n8j58v4y";
1313 };
1414
1515 # Hamlib builds with autotools, wsjtx builds with cmake
1616 # Omitting pkgconfig because it causes issues locating the built hamlib
1717 nativeBuildInputs = [
1818 asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool
19− texinfo
19+ qttools texinfo
2020 ];
2121 buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ];
2222
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
2929 meta = with stdenv.lib; {
3030 description = "Weak-signal digital communication modes for amateur radio";
3131 longDescription = ''
32− WSJT-X implements communication protocols or "modes" called FT8, JT4, JT9,
33− JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for
32+ WSJT-X implements communication protocols or "modes" called FT4, FT8, JT4,
33+ JT9, JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for
3434 detecting and measuring your own radio signals reflected from the Moon.
3535 These modes were all designed for making reliable, confirmed ham radio
3636 contacts under extreme weak-signal conditions.
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
3939 # Older licenses are for the statically-linked hamlib
4040 license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ];
4141 platforms = platforms.linux;
42− maintainers = [ maintainers.lasandell ];
42+ maintainers = with maintainers; [ lasandell ];
4343 };
4444}
pkgs/applications/radio/wsjtx/wsjtx.patch+6−5
@@ -2,11 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
22index 3e7e816b..e7dbb14a 100644
33--- a/CMakeLists.txt
44+++ b/CMakeLists.txt
5−@@ -860,6 +860,7 @@ find_package (Qt5Widgets 5 REQUIRED)
6− find_package (Qt5Multimedia 5 REQUIRED)
7− find_package (Qt5PrintSupport 5 REQUIRED)
8− find_package (Qt5Sql 5 REQUIRED)
9−+find_package (Qt5SerialPort 5 REQUIRED)
5+@@ -885,6 +885,6 @@
6+ #
7+
8+ # Widgets finds its own dependencies.
9+-find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools REQUIRED)
10++find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools SerialPort REQUIRED)
1011
1112 if (WIN32)
1213 add_definitions (-DQT_NEEDS_QTMAIN)