From b92afdaebca325a2243399c710705b8cadcc3d9a Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Wed, 29 Apr 2026 15:31:36 +0200
Subject: [PATCH 1/2] gpredict: 2.2.1 -> 2.5.1

- goocanvas has been replaced with native GTK3/Cairo: https://github.com/csete/gpredict/pull/390
- hamlib C bindings haven't been used since 2008: https://github.com/csete/gpredict/commit/1123de6044f6e5ad031567f0c047c13e0a348123
---
 pkgs/by-name/gp/gpredict/package.nix | 33 +++++-----------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/gp/gpredict/package.nix b/pkgs/by-name/gp/gpredict/package.nix
index bf2811325998..e1e6d45f80a0 100644
--- a/pkgs/by-name/gp/gpredict/package.nix
+++ b/pkgs/by-name/gp/gpredict/package.nix
@@ -2,48 +2,29 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   pkg-config,
   intltool,
   autoreconfHook,
   gtk3,
-  glib,
   curl,
-  goocanvas_2,
   gpsd,
-  hamlib_4,
   wrapGAppsHook3,
   nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpredict";
-  version = "2.2.1";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "csete";
     repo = "gpredict";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+hgjImfT3nWMBYwde7+KC/hzd84pwQbpoJvaJSNG4E8=";
+    hash = "sha256-lP+QakQ+uTgBY8NNEC7DwQifh3Zi0ZKbarxNGB4onq0=";
   };
 
-  patches = [
-    # Pull upstream fix for -fno-common toolchains:
-    #   https://github.com/csete/gpredict/issues/195
-    (fetchpatch {
-      name = "fno-common.patch";
-      url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch";
-      sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a";
-    })
-    # Updates URLs for TLE files
-    # https://github.com/csete/gpredict/pull/305
-    (fetchpatch {
-      name = "TLE-urls.patch";
-      url = "https://github.com/csete/gpredict/commit/8f60f856921e8ee143cd6e2d34a9183778cb0fbf.patch";
-      hash = "sha256-X/nKrqh5sjxDMLhA9LQek8AsJFqhvK/k8Ep3ug/0rMI=";
-    })
-
-  ];
+  strictDeps = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     pkg-config
@@ -51,13 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
     autoreconfHook
   ];
+
   buildInputs = [
     curl
-    glib
     gtk3
-    goocanvas_2
     gpsd
-    hamlib_4
   ];
 
   passthru.updateScript = nix-update-script { };
@@ -74,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
-    homepage = "http://gpredict.oz9aec.net/";
+    homepage = "https://oz9aec.dk/gpredict/";
     maintainers = with lib.maintainers; [
       cmcdragonkai
       pandapip1

From d54c7bdcdfba0be8c902fc87646f386f797b1f94 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Wed, 29 Apr 2026 15:49:51 +0200
Subject: [PATCH 2/2] gpredict-unstable: drop

---
 pkgs/by-name/gp/gpredict-unstable/package.nix | 25 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 pkgs/by-name/gp/gpredict-unstable/package.nix

diff --git a/pkgs/by-name/gp/gpredict-unstable/package.nix b/pkgs/by-name/gp/gpredict-unstable/package.nix
deleted file mode 100644
index c5aee98340e0..000000000000
--- a/pkgs/by-name/gp/gpredict-unstable/package.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  goocanvas_3,
-  nix-update-script,
-  gpredict,
-}:
-
-(gpredict.override {
-  goocanvas_2 = goocanvas_3;
-}).overrideAttrs
-  (finalAttrs: {
-    version = "2.2.1-unstable-2025-09-20";
-
-    src = fetchFromGitHub {
-      owner = "csete";
-      repo = "gpredict";
-      rev = "34af48e6bfd9647559abb1df4907a65d064fc870";
-      hash = "sha256-G4bS7w/USIzYOa+aYv3YQCbUQolV22Z/7+71GHHSUpk=";
-    };
-
-    patches = [ ];
-
-    passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
-  })
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e44b206eb363..6ca5d6cc2bfc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -897,6 +897,7 @@ mapAliases {
   goocanvas = warnAlias "'goocanvas' has been renamed to goocanvas_1" goocanvas_1; # Added 2026-01-17
   gphotos-sync = throw "'gphotos-sync' has been removed, as it was archived upstream due to API changes that ceased its functions"; # Added 2025-11-06
   gprbuild-boot = throw "'gprbuild-boot' has been renamed to/replaced by 'gnatPackages.gprbuild-boot'"; # Converted to throw 2025-10-27
+  gpredict-unstable = throw "'gpredict-unstable' has been removed, as it was behind 'gpredict'"; # Added 2026-04-29
   gpt-box = throw "'gpt-box' has been removed, as it is unmaintained"; # Added 2026-01-25
   gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # Added 2025-09-09
   gpxsee-qt6 = gpxsee; # Added 2025-09-09