From 306fdc573b6f08296fb83695b704cbbbf69b3da2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 May 2025 00:31:32 +0000
Subject: [PATCH 1/3] android-file-transfer: 4.4 -> 4.5

---
 pkgs/tools/filesystems/android-file-transfer/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix
index d270cd8e7a6d..42ec6256ddad 100644
--- a/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -4,7 +4,7 @@
   mkDerivation,
   fetchFromGitHub,
   cmake,
-  fuse,
+  fuse3,
   readline,
   pkg-config,
   qtbase,
@@ -14,13 +14,13 @@
 
 mkDerivation rec {
   pname = "android-file-transfer";
-  version = "4.4";
+  version = "4.5";
 
   src = fetchFromGitHub {
     owner = "whoozle";
     repo = "android-file-transfer-linux";
     rev = "v${version}";
-    sha256 = "sha256-1euoWM9KMauOkAp7g1FvY4olMiOg+La/Uk1QlQ3mKi8=";
+    sha256 = "sha256-G+ErwZ/F8Cl8WLSzC+5LrEWWqNZL3xDMBvx/gjkgAXk=";
   };
 
   patches = [ ./darwin-dont-vendor-dependencies.patch ];
@@ -32,7 +32,7 @@ mkDerivation rec {
     wrapQtAppsHook
   ];
   buildInputs = [
-    fuse
+    fuse3
     qtbase
     qttools
   ];

From f9e9c67e53ba2fea76d1e7965e03ca2f78a26db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Mon, 19 May 2025 11:09:57 +0200
Subject: [PATCH 2/3] android-file-transfer: use qt6

---
 .../filesystems/android-file-transfer/default.nix   | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix
index 42ec6256ddad..75c7db22608e 100644
--- a/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -1,18 +1,15 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchFromGitHub,
   cmake,
   fuse3,
   readline,
   pkg-config,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  qt6,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "android-file-transfer";
   version = "4.5";
 
@@ -29,12 +26,12 @@ mkDerivation rec {
     cmake
     readline
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
   buildInputs = [
     fuse3
-    qtbase
-    qttools
+    qt6.qtbase
+    qt6.qttools
   ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57c631edd034..4d5209cff3ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16170,7 +16170,7 @@ with pkgs;
 
   ### MISC
 
-  android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { };
+  android-file-transfer = callPackage ../tools/filesystems/android-file-transfer { };
 
   antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { };
 

From 231eb1df8fd3d2abcb60dcd1c8026c6c1dacfd52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Mon, 26 May 2025 07:44:29 +0200
Subject: [PATCH 3/3] android-file-transfer: move to by-name

---
 .../android-file-transfer/darwin-dont-vendor-dependencies.patch | 0
 .../an/android-file-transfer/package.nix}                       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{tools/filesystems => by-name/an}/android-file-transfer/darwin-dont-vendor-dependencies.patch (100%)
 rename pkgs/{tools/filesystems/android-file-transfer/default.nix => by-name/an/android-file-transfer/package.nix} (100%)

diff --git a/pkgs/tools/filesystems/android-file-transfer/darwin-dont-vendor-dependencies.patch b/pkgs/by-name/an/android-file-transfer/darwin-dont-vendor-dependencies.patch
similarity index 100%
rename from pkgs/tools/filesystems/android-file-transfer/darwin-dont-vendor-dependencies.patch
rename to pkgs/by-name/an/android-file-transfer/darwin-dont-vendor-dependencies.patch
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/by-name/an/android-file-transfer/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/android-file-transfer/default.nix
rename to pkgs/by-name/an/android-file-transfer/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d5209cff3ad..050f836dc0d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16170,8 +16170,6 @@ with pkgs;
 
   ### MISC
 
-  android-file-transfer = callPackage ../tools/filesystems/android-file-transfer { };
-
   antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { };
 
   autotiling = python3Packages.callPackage ../misc/autotiling { };