From f2aea0cf53d4e8e19064adaa91f9692b1e3d568d Mon Sep 17 00:00:00 2001
From: Paul Grayson <pdg@alum.mit.edu>
Date: Tue, 3 Feb 2026 08:59:41 -0800
Subject: [PATCH 1/3] maintainers: add pdg137

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c66180c9329f..f3c6fe29eb87 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20498,6 +20498,11 @@
     githubId = 943430;
     name = "David Hagege";
   };
+  pdg137 = {
+    name = "Paul Grayson";
+    github = "pdg137";
+    githubId = 466760;
+  };
   peat-psuwit = {
     name = "Ratchanan Srirattanamet";
     email = "peat@peat-network.xyz";

From d364ec7f991221977466aeec7776da0db3b468e7 Mon Sep 17 00:00:00 2001
From: Paul Grayson <pdg@alum.mit.edu>
Date: Tue, 10 Feb 2026 20:44:00 -0800
Subject: [PATCH 2/3] js8call: move to by-name

---
 .../js8call/default.nix => by-name/js/js8call/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/radio/js8call/default.nix => by-name/js/js8call/package.nix} (100%)

diff --git a/pkgs/applications/radio/js8call/default.nix b/pkgs/by-name/js/js8call/package.nix
similarity index 100%
rename from pkgs/applications/radio/js8call/default.nix
rename to pkgs/by-name/js/js8call/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29e3cd02d8ba..3756c54e17cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10271,8 +10271,6 @@ with pkgs;
 
   jackmix_jack1 = jackmix.override { jack = jack1; };
 
-  js8call = qt5.callPackage ../applications/radio/js8call { };
-
   jwm = callPackage ../applications/window-managers/jwm { };
 
   jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };

From 389fddabdd6291096e9c7bec660cb68fc31c6502 Mon Sep 17 00:00:00 2001
From: Paul Grayson <pdg@alum.mit.edu>
Date: Tue, 3 Feb 2026 07:57:02 -0800
Subject: [PATCH 3/3] js8call: replace with js8call-improved at 2.5.2

This package is a fork of js8call which is being more actively
maintained. The original js8call package no longer works under nixos
25.11: https://github.com/NixOS/nixpkgs/issues/486598
---
 pkgs/by-name/js/js8call/package.nix | 41 +++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/js/js8call/package.nix b/pkgs/by-name/js/js8call/package.nix
index fc7fa9564e32..3b547b54b4e7 100644
--- a/pkgs/by-name/js/js8call/package.nix
+++ b/pkgs/by-name/js/js8call/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "js8call";
-  version = "2.3.1";
+  version = "2.5.2";
 
   src = fetchFromGitHub {
-    owner = "js8call";
-    repo = "js8call";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-rYXjcmQRRfizJVriZo9yX8x2yYfWpL94Cprx9eFC3ss=";
+    owner = "JS8Call-improved";
+    repo = "JS8Call-improved";
+    tag = "release/${finalAttrs.version}";
+    hash = "sha256-dpPh3+s29ksdVGc1I5JOJrqzS51Bda8afgU5RrO6B3w=";
   };
 
   nativeBuildInputs = [
@@ -40,11 +40,23 @@ stdenv.mkDerivation (finalAttrs: {
     boost
   ];
 
-  prePatch = ''
-    substituteInPlace CMakeLists.txt \
-        --replace "/usr/share/applications" "$out/share/applications" \
-        --replace "/usr/share/pixmaps" "$out/share/icons/hicolor/128x128/apps" \
-        --replace "/usr/bin/" "$out/bin"
+  # The "install" target is apparently no longer supported so we have
+  # to copy the built assets explicitly.
+  # https://github.com/JS8Call-improved/JS8Call-improved/issues/115
+  installPhase = ''
+    mkdir -p $out/bin $out/share/doc/js8call $out/share/icons/hicolor/128x128/apps $out/share/applications
+    cp JS8Call $out/bin/js8call
+    cp ../LICENSE ../README.md $out/share/doc/js8call
+    cp ../artwork/js8call_icon.png $out/share/icons/hicolor/128x128/apps
+    cp ../JS8Call.desktop $out/share/applications
+    runHook postInstall
+  '';
+
+  # We renamed the executable to lowercase for consistency with older
+  # versions and Linux more generally. Fix up the desktop file here:
+  postInstall = ''
+    substituteInPlace $out/share/applications/JS8Call.desktop \
+      --replace-fail "Exec=JS8Call" "Exec=js8call"
   '';
 
   meta = {
@@ -52,12 +64,19 @@ stdenv.mkDerivation (finalAttrs: {
     longDescription = ''
       JS8Call is software using the JS8 Digital Mode providing weak signal
       keyboard to keyboard messaging to Amateur Radio Operators.
+
+      JS8Call-Improved is a community-driven evolution of JS8Call,
+      bringing modern features, active development, and long-term
+      support to HF digital communication. It’s fully compatible with
+      existing JS8Call versions while adding new capabilities and
+      refinements.
     '';
-    homepage = "http://js8call.com/";
+    homepage = "https://js8call-improved.com/";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       sarcasticadmin
+      pdg137
     ];
   };
 })