wsjtx: 2.7.0 -> 3.0.0 (#507145)

doc/release-notes/rl-2605.section.md

@@ -287,6 +287,9 @@
 
 - Added `lovr` package, a LUA-based game engine for VR and XR applications.
 
+- Updated `wsjtx` from 2.7.0 to 3.0.0 for amateur radio hobbyists who use FT8 and other related digital modes.
+  See the [release notes](https://wsjt.sourceforge.io/Release_Notes.txt) for the changelog.
+
 - `openrgb` was updated to 1.0rc2, which now uses Plugin API version 4.
   Some existing OpenRGB plugins may be incompatible or require updates.
 

pkgs/by-name/ws/wsjtx/package.nix

@@ -1,10 +1,12 @@
 {
   lib,
   stdenv,
-  fetchgit,
+  fetchFromGitHub,
   asciidoc,
   asciidoctor,
   cmake,
+  nix-update-script,
+  gitUpdater,
   pkg-config,
   fftw,
   fftwFloat,
@@ -12,23 +14,20 @@
   hamlib_4,
   libtool,
   libusb1,
-  qtbase,
-  qtmultimedia,
-  qtserialport,
-  qttools,
+  qt5,
   boost,
   texinfo,
-  wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "wsjtx";
-  version = "2.7.0";
+  version = "3.0.0";
 
-  src = fetchgit {
-    url = "https://git.code.sf.net/p/wsjt/wsjtx";
-    rev = "wsjtx-${version}";
-    hash = "sha256-AAPZTJUhz3x/28B9rk2uwFs1bkcEvaj+hOzAjpsFALQ=";
+  src = fetchFromGitHub {
+    owner = "WSJTX";
+    repo = "wsjtx";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZM46ouS4NyXP7wPsAxY7Uf2mn0CawRiRmqYkkS8yTAU=";
   };
 
   nativeBuildInputs = [
@@ -39,23 +38,31 @@ stdenv.mkDerivation rec {
     hamlib_4 # rigctl
     libtool
     pkg-config
-    qttools
+    qt5.qttools
     texinfo
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
     fftw
     fftwFloat
     hamlib_4
     libusb1
-    qtbase
-    qtmultimedia
-    qtserialport
+    qt5.qtbase
+    qt5.qtmultimedia
+    qt5.qtserialport
+    qt5.qtwebsockets
     boost
   ];
 
   strictDeps = true;
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "^v([0-9]\\.[0-9]\\.[0-9])$"
+    ];
+  };
+
   meta = {
     description = "Weak-signal digital communication modes for amateur radio";
     longDescription = ''
@@ -73,4 +80,4 @@ stdenv.mkDerivation rec {
       numinit
     ];
   };
-}
+})

pkgs/by-name/ws/wsjtz/package.nix

@@ -19,6 +19,9 @@ wsjtx.overrideAttrs (
       mv $out/bin/wsjtx_app_version $out/bin/wsjtz_app_version
     '';
 
+    # Source isn't available in Git.
+    passthru = lib.removeAttrs old.passthru [ "updateScript" ];
+
     meta = {
       description = "WSJT-X fork, primarily focused on automation and enhanced functionality";
       homepage = "https://sourceforge.net/projects/wsjt-z/";

pkgs/top-level/all-packages.nix

@@ -10803,8 +10803,6 @@ with pkgs;
 
   wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { };
 
-  wsjtx = qt5.callPackage ../applications/radio/wsjtx { };
-
   x2gokdriveclient = libsForQt5.callPackage ../applications/networking/remote/x2gokdriveclient { };
 
   x32edit = callPackage ../applications/audio/midas/x32edit.nix { };