From 7b37a436db1a755eff901ab5fe414858fc604c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 9 Sep 2025 18:29:17 -0700
Subject: [PATCH 1/3] gpxsee: 13.46 -> 13.47

Diff: https://github.com/tumic0/GPXSee/compare/13.46...13.47

Changelog: https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes
---
 pkgs/applications/misc/gpxsee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 1c0fef12c42a..315ab5432e5d 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpxsee";
-  version = "13.46";
+  version = "13.47";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     tag = finalAttrs.version;
-    hash = "sha256-SkAEnKviUHQrej1fhpLs1bh/nAOgmRzzBzTFe4fURVc=";
+    hash = "sha256-1waE0A70MsUaGttaxHcOO2aaeRdZ9ihc7ZeqJ+azH/0=";
   };
 
   buildInputs = [

From 005fc1912eb22f4b14a6a078b71136448c6ea200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 9 Sep 2025 18:33:38 -0700
Subject: [PATCH 2/3] gpxsee-qt5: drop

---
 pkgs/applications/misc/gpxsee/default.nix | 23 +++++------------------
 pkgs/top-level/aliases.nix                |  2 ++
 pkgs/top-level/all-packages.nix           |  6 +-----
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 315ab5432e5d..2c01e96306de 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -6,17 +6,13 @@
   nix-update-script,
   qtbase,
   qttools,
-  qtlocation ? null, # qt5 only
-  qtpositioning ? null, # qt6 only
+  qtpositioning,
   qtserialport,
   qtsvg,
   wrapQtAppsHook,
   wrapGAppsHook3,
 }:
 
-let
-  isQt6 = lib.versions.major qtbase.version == "6";
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpxsee";
   version = "13.47";
@@ -29,20 +25,11 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
+    qtbase
+    qtpositioning
     qtserialport
-  ]
-  ++ (
-    if isQt6 then
-      [
-        qtbase
-        qtpositioning
-        qtsvg
-      ]
-    else
-      [
-        qtlocation
-      ]
-  );
+    qtsvg
+  ];
 
   nativeBuildInputs = [
     qmake
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 641ccf49c220..7a3192cd0831 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1113,6 +1113,8 @@ mapAliases {
   googler = throw "'googler' has been removed, as it no longer works and is abandoned upstream"; # Added 2025-04-01
   gpicview = throw "'gpicview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'loupe', 'gthumb' or 'image-roll' instead"; # Added 2024-09-15
   gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25;
+  gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # added 2025-09-09
+  gpxsee-qt6 = gpxsee; # added 2025-09-09
 
   gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead";
   gr-framework = throw "gr-framework has been removed, as it was broken"; # Added 2025-08-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c95e4fac78e..2ebeb2aa8991 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11764,11 +11764,7 @@ with pkgs;
     withDoc = true;
   };
 
-  gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { };
-
-  gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { };
-
-  gpxsee = gpxsee-qt5;
+  gpxsee = qt6Packages.callPackage ../applications/misc/gpxsee { };
 
   guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { };
 

From a09a78fa11bdceae1da143c5378bd636ce2222e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 9 Sep 2025 18:34:46 -0700
Subject: [PATCH 3/3] gpxsee: move to pkgs/by-name

---
 .../gp/gpxsee/package.nix}                    | 22 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 8 insertions(+), 16 deletions(-)
 rename pkgs/{applications/misc/gpxsee/default.nix => by-name/gp/gpxsee/package.nix} (88%)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/by-name/gp/gpxsee/package.nix
similarity index 88%
rename from pkgs/applications/misc/gpxsee/default.nix
rename to pkgs/by-name/gp/gpxsee/package.nix
index 2c01e96306de..3e414f88eadb 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/by-name/gp/gpxsee/package.nix
@@ -2,14 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
   nix-update-script,
-  qtbase,
-  qttools,
-  qtpositioning,
-  qtserialport,
-  qtsvg,
-  wrapQtAppsHook,
+  qt6,
   wrapGAppsHook3,
 }:
 
@@ -25,16 +19,16 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    qtbase
-    qtpositioning
-    qtserialport
-    qtsvg
+    qt6.qtbase
+    qt6.qtpositioning
+    qt6.qtserialport
+    qt6.qtsvg
   ];
 
   nativeBuildInputs = [
-    qmake
-    qttools
-    wrapQtAppsHook
+    qt6.qmake
+    qt6.qttools
+    qt6.wrapQtAppsHook
     wrapGAppsHook3
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ebeb2aa8991..4ce505a6de74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11764,8 +11764,6 @@ with pkgs;
     withDoc = true;
   };
 
-  gpxsee = qt6Packages.callPackage ../applications/misc/gpxsee { };
-
   guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { };
 
   hachoir = with python3Packages; toPythonApplication hachoir;