From 6658a7ac687d846e269cfdca1e23a33516c6b209 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 4 Apr 2024 23:57:38 +0400
Subject: [PATCH 1/2] =?UTF-8?q?gpscorrelate:=202.0=20=E2=86=92=202.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../misc/gpscorrelate/default.nix             | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index 67e246227f06..6e029d411371 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -1,25 +1,29 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, exiv2, libxml2, gtk3
-, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, exiv2
+, libxml2
+, gtk3
+, libxslt
+, docbook_xsl
+, docbook_xml_dtd_42
+, desktop-file-utils
+, wrapGAppsHook
+, desktopToDarwinBundle
+}:
 
 stdenv.mkDerivation rec {
   pname = "gpscorrelate";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "dfandrich";
-    repo = pname;
+    repo = "gpscorrelate";
     rev = version;
-    sha256 = "1wkpb0nqnm0ik46hp2sibf96h2gxi6n951zm8c72scgmh4ciq4fl";
+    sha256 = "sha256-1t9XUY12hVaUNOg785dMJCiaMMCI2XCcif1DkKYXOoo=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "gpscorrelate-2.0-exiv2-0.28.patch";
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0";
-      hash = "sha256-/5czvSh2siPmohXWHQEg6VWCUQnZxEm2livLsEOAa6c=";
-    })
-  ];
-
   nativeBuildInputs = [
     desktop-file-utils
     docbook_xml_dtd_42
@@ -27,7 +31,7 @@ stdenv.mkDerivation rec {
     libxslt
     pkg-config
     wrapGAppsHook
-  ];
+  ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
 
   buildInputs = [
     exiv2

From 2c10be2751fec16d0c64cf1c8ac29afab11d62bc Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 5 Apr 2024 00:00:18 +0400
Subject: [PATCH 2/2] gpscorrelate: migrate to by-name

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

diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/by-name/gp/gpscorrelate/package.nix
similarity index 100%
rename from pkgs/applications/misc/gpscorrelate/default.nix
rename to pkgs/by-name/gp/gpscorrelate/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9fbfdaae592..d11285d5afcc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31717,8 +31717,6 @@ with pkgs;
     withDoc = true;
   };
 
-  gpscorrelate = callPackage ../applications/misc/gpscorrelate { };
-
   gpsd = callPackage ../servers/gpsd { };
 
   gpsprune = callPackage ../applications/misc/gpsprune { };