From 6409ef1eacec0a4d8bb32060a05e2f87159c1814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Oct 2025 10:53:23 -0700
Subject: [PATCH 1/3] rclone-browser: modernize

---
 .../networking/sync/rclone/browser.nix        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix
index 3b6be7da5e6b..a6f1316c764c 100644
--- a/pkgs/applications/networking/sync/rclone/browser.nix
+++ b/pkgs/applications/networking/sync/rclone/browser.nix
@@ -15,15 +15,15 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kapitainsky";
     repo = "RcloneBrowser";
-    rev = version;
-    sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33";
+    tag = version;
+    hash = "sha256-Y0QFzpvAV01k9fYN5iMpxd8A+ThLePDtxdG7eX2bk5E=";
   };
 
   patches = [
     # patch for Qt 5.15, https://github.com/kapitainsky/RcloneBrowser/pull/126
     (fetchpatch {
       url = "https://github.com/kapitainsky/RcloneBrowser/commit/ce9cf52e9c584a2cc85a5fa814b0fd7fa9cf0152.patch";
-      sha256 = "0nm42flmaq7mva9j4dpp18i1xcv8gr08zfyb9apz1zwn79h1w0c8";
+      hash = "sha256-iAEeYDqW//CvSsu7j0B+aLMeIgr3NiKT2vVgVakTpFo=";
     })
   ];
 
@@ -32,16 +32,17 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ];
+  cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" ];
 
   buildInputs = [ qtbase ];
 
-  meta = with lib; {
-    inherit (src.meta) homepage;
+  meta = {
+    changelog = "https://github.com/kapitainsky/RcloneBrowser/blob/${src.tag}/CHANGELOG.md";
+    homepage = "https://github.com/kapitainsky/RcloneBrowser";
     description = "Graphical Frontend to Rclone written in Qt";
     mainProgram = "rclone-browser";
-    license = licenses.unlicense;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.unlicense;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From 1b168e31013d222969f2b9758a6806d38b9e9d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Oct 2025 10:55:17 -0700
Subject: [PATCH 2/3] rclone-browser: move to pkgs/by-name

---
 .../browser.nix => by-name/rc/rclone-browser/package.nix}  | 7 +++----
 pkgs/top-level/all-packages.nix                            | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{applications/networking/sync/rclone/browser.nix => by-name/rc/rclone-browser/package.nix} (93%)

diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/by-name/rc/rclone-browser/package.nix
similarity index 93%
rename from pkgs/applications/networking/sync/rclone/browser.nix
rename to pkgs/by-name/rc/rclone-browser/package.nix
index a6f1316c764c..ddb7109bda79 100644
--- a/pkgs/applications/networking/sync/rclone/browser.nix
+++ b/pkgs/by-name/rc/rclone-browser/package.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
-  wrapQtAppsHook,
-  qtbase,
+  qt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -29,12 +28,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ qt5.qtbase ];
 
   meta = {
     changelog = "https://github.com/kapitainsky/RcloneBrowser/blob/${src.tag}/CHANGELOG.md";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 294a73b11b90..89a6a84456b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12366,8 +12366,6 @@ with pkgs;
 
   rclone = callPackage ../applications/networking/sync/rclone { };
 
-  rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { };
-
   reaper = callPackage ../applications/audio/reaper {
     jackLibrary = libjack2; # Another option is "pipewire.jack".
     ffmpeg = ffmpeg_4-headless;

From 3de7554e67cde1066ff8408790a4aaa89617d7af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Oct 2025 11:00:55 -0700
Subject: [PATCH 3/3] rclone: move to pkgs/by-name

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

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/by-name/rc/rclone/package.nix
similarity index 100%
rename from pkgs/applications/networking/sync/rclone/default.nix
rename to pkgs/by-name/rc/rclone/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89a6a84456b2..409587f32711 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12364,8 +12364,6 @@ with pkgs;
     fftw = fftwSinglePrec;
   };
 
-  rclone = callPackage ../applications/networking/sync/rclone { };
-
   reaper = callPackage ../applications/audio/reaper {
     jackLibrary = libjack2; # Another option is "pipewire.jack".
     ffmpeg = ffmpeg_4-headless;