From a836782af79d98f6c4f46770d5127ac88b871ad2 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 4 Aug 2025 21:15:23 -0700
Subject: [PATCH 1/4] zombietrackergps: use callPackage

---
 pkgs/applications/gis/zombietrackergps/default.nix | 14 +++++---------
 pkgs/top-level/all-packages.nix                    |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix
index 3cc6bf69e45c..801095b6e7b1 100644
--- a/pkgs/applications/gis/zombietrackergps/default.nix
+++ b/pkgs/applications/gis/zombietrackergps/default.nix
@@ -1,14 +1,12 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
   gitUpdater,
-  wrapQtAppsHook,
   cmake,
-  marble,
   libsForQt5,
 }:
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "zombietrackergps";
   version = "1.15";
 
@@ -21,20 +19,18 @@ mkDerivation rec {
     hash = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM=";
   };
 
-  buildInputs = [
+  buildInputs = with libsForQt5; [
     marble.dev
-  ]
-  ++ (with libsForQt5; [
     qtbase
     qtcharts
     qtsvg
     qtwebengine
     ldutils
-  ]);
+  ];
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a2b319170a0..4a80b413358e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11580,7 +11580,7 @@ with pkgs;
     wxGTK = wxGTK32;
   };
 
-  zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { };
+  zombietrackergps = callPackage ../applications/gis/zombietrackergps { };
 
   ### APPLICATIONS
 

From 12bc7a5e5da3f5fcc5581484e6db43d0120ee3a8 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 4 Aug 2025 21:18:21 -0700
Subject: [PATCH 2/4] zombietrackergps: remove rec

---
 pkgs/applications/gis/zombietrackergps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix
index 801095b6e7b1..dc297841eba5 100644
--- a/pkgs/applications/gis/zombietrackergps/default.nix
+++ b/pkgs/applications/gis/zombietrackergps/default.nix
@@ -6,13 +6,13 @@
   cmake,
   libsForQt5,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "zombietrackergps";
   version = "1.15";
 
   src = fetchFromGitLab {
     owner = "ldutils-projects";
-    repo = pname;
+    repo = "zombietrackergps";
     # latest revision is not tagged upstream, use commit sha in the meantime
     #rev = "v_${version}";
     rev = "cc75d5744965cc6973323f5bb77f00b0b0153dce";

From 67d8b9e1757e548c22204e52af4a50d8fc6c81d4 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 4 Aug 2025 21:18:49 -0700
Subject: [PATCH 3/4] zombietrackergps: remove with lib

---
 pkgs/applications/gis/zombietrackergps/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix
index dc297841eba5..46660eef0d97 100644
--- a/pkgs/applications/gis/zombietrackergps/default.nix
+++ b/pkgs/applications/gis/zombietrackergps/default.nix
@@ -45,12 +45,12 @@ stdenv.mkDerivation {
     rev-prefix = "v_";
   };
 
-  meta = with lib; {
+  meta = {
     description = "GPS track manager for Qt using KDE Marble maps";
     homepage = "https://www.zombietrackergps.net/ztgps/";
     changelog = "https://www.zombietrackergps.net/ztgps/history.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ sohalt ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ sohalt ];
+    platforms = lib.platforms.linux;
   };
 }

From 1a020d050913a838ad59d40c69707f222c577090 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 4 Aug 2025 21:19:29 -0700
Subject: [PATCH 4/4] zombietrackergps: move to by-name

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

diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/by-name/zo/zombietrackergps/package.nix
similarity index 100%
rename from pkgs/applications/gis/zombietrackergps/default.nix
rename to pkgs/by-name/zo/zombietrackergps/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a80b413358e..836a5581009f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11580,8 +11580,6 @@ with pkgs;
     wxGTK = wxGTK32;
   };
 
-  zombietrackergps = callPackage ../applications/gis/zombietrackergps { };
-
   ### APPLICATIONS
 
   _2bwm = callPackage ../applications/window-managers/2bwm {