diff options
| author | Elis Hirwing <elis@hirwing.se> | 2019-02-10 11:01:03 +0100 |
|---|---|---|
| committer | Elis Hirwing <elis@hirwing.se> | 2019-02-10 11:01:03 +0100 |
| commit | d3390e50822460f3d23270b2c6eb2a44a8e7a33d (patch) | |
| tree | e531a43fd4f1c4bc8560a6d9aa1312875320f012 /pkgs/applications/radio/tqsl | |
| parent | 1540ab34befecf78f7ab8209100ebde317cd33e0 (diff) | |
tqsl: 2.3.1 -> 2.4.3
Changelog:
https://www.arrl.org/files/file/LoTW%20Instructions/TrustedQSL-2-4-3-release.pdf
Diffstat (limited to 'pkgs/applications/radio/tqsl')
| -rw-r--r-- | pkgs/applications/radio/tqsl/cmake_lib_path.patch | 12 | ||||
| -rw-r--r-- | pkgs/applications/radio/tqsl/default.nix | 12 |
2 files changed, 5 insertions, 19 deletions
diff --git a/pkgs/applications/radio/tqsl/cmake_lib_path.patch b/pkgs/applications/radio/tqsl/cmake_lib_path.patch deleted file mode 100644 index 5eed93834632..000000000000 --- a/pkgs/applications/radio/tqsl/cmake_lib_path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -dur tqsl-2.3.1/src/CMakeLists.txt tqsl-2.3.1b/src/CMakeLists.txt ---- tqsl-2.3.1/src/CMakeLists.txt 2017-04-17 20:53:22.000000000 -0400 -+++ tqsl-2.3.1b/src/CMakeLists.txt 2017-10-05 21:14:39.048329343 -0400 -@@ -54,7 +54,7 @@ - if(NOT APPLE AND NOT WIN32) - set_source_files_properties(location.cpp PROPERTIES COMPILE_DEFINITIONS CONFDIR="${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/") - set(HEADERS_TO_INSTALL tqsllib.h tqslerrno.h cabrillo.h adif.h tqslconvert.h) --install(TARGETS tqsllib DESTINATION lib$(LIB_SUFFIX)) -+install(TARGETS tqsllib DESTINATION lib${LIB_SUFFIX}) - install(FILES config.xml DESTINATION share/TrustedQSL) - install(FILES ${HEADERS_TO_INSTALL} DESTINATION include) - endif() diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index f001cbcaab92..ce0fbf0e16dc 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }: stdenv.mkDerivation rec { - name = "tqsl-${version}"; - version = "2.3.1"; + pname = "tqsl"; + version = "2.4.3"; src = fetchurl { - url = "https://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz"; - sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv"; + url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz"; + sha256 = "0f8pa5wnp0x0mjjr5kanka9hirgmp5wf6jsb95dc6hjlzlvy6kz9"; }; nativeBuildInputs = [ makeWrapper ]; @@ -20,11 +20,9 @@ stdenv.mkDerivation rec { wxGTK ]; - patches = [ ./cmake_lib_path.patch ]; - meta = with stdenv.lib; { description = "Software for using the ARRL Logbook of the World"; - homepage = https://lotw.arrl.org/; + homepage = https://www.arrl.org/tqsl-download; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.dpflug ]; |