From 0ccdcc9f24d9c2b41104ec7919043093d6165956 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 17 Apr 2025 22:45:26 +0200
Subject: [PATCH] taxi: 2.0.2 -> 2.0.2-unstable-2024-12-26

This includes updates to:
- gtk4 and granite7 [1]
- libsoup_3 [2]
- gnome post_install [3]

[1] https://github.com/ellie-commons/taxi/commit/4dcb5b2ad7df0c53ed311c4db13477f00a90d31c
[2] https://github.com/ellie-commons/taxi/commit/c65e7de3c157dc73986e4ab4b997df234ae65056
[3] https://github.com/ellie-commons/taxi/commit/b7e3b7226abe9a04cb156881252f32d0e7482aed
---
 pkgs/by-name/ta/taxi/package.nix | 42 ++++++++++++++------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/ta/taxi/package.nix b/pkgs/by-name/ta/taxi/package.nix
index 4eb5e061f089..1daeb516ae5b 100644
--- a/pkgs/by-name/ta/taxi/package.nix
+++ b/pkgs/by-name/ta/taxi/package.nix
@@ -1,13 +1,13 @@
 {
   lib,
   stdenv,
+  desktop-file-utils,
   fetchFromGitHub,
   gobject-introspection,
-  gtk3,
-  libgee,
-  libhandy,
+  gtk4,
+  libadwaita,
   libsecret,
-  libsoup_2_4,
+  libsoup_3,
   meson,
   ninja,
   nix-update-script,
@@ -15,52 +15,46 @@
   pkg-config,
   python3,
   vala,
-  wrapGAppsHook3,
+  wrapGAppsHook4,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "taxi";
-  version = "2.0.2";
+  version = "2.0.2-unstable-2024-12-26";
 
   src = fetchFromGitHub {
-    owner = "Alecaddd";
+    owner = "ellie-commons";
     repo = "taxi";
-    rev = version;
-    sha256 = "1a4a14b2d5vqbk56drzbbldp0nngfqhwycpyv8d3svi2nchkvpqa";
+    rev = "b1c81490641f102005d9451a33d21610c0637e22";
+    sha256 = "sha256-boPwRSHzFpbrzRoSmNWf/fgi3cJDEt9qjZHWQWutL+o=";
   };
 
   nativeBuildInputs = [
+    desktop-file-utils
     gobject-introspection
     meson
     ninja
     pkg-config
     python3
     vala
-    wrapGAppsHook3
+    wrapGAppsHook4
   ];
 
   buildInputs = [
-    gtk3
-    libgee
-    libhandy
+    gtk4
+    libadwaita
     libsecret
-    libsoup_2_4
-    pantheon.granite
+    libsoup_3
+    pantheon.granite7
   ];
-
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-  '';
-
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    homepage = "https://github.com/Alecaddd/taxi";
+    homepage = "https://github.com/ellie-commons/taxi";
     description = "FTP Client that drives you anywhere";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ ] ++ teams.pantheon.members;
     platforms = platforms.linux;
-    mainProgram = "com.github.alecaddd.taxi";
+    mainProgram = "io.github.ellie_commons.taxi";
   };
 }