From a213da1d8bba75dc5b0c0677704c06d16acf1e79 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Sat, 28 Dec 2024 16:53:10 -0300
Subject: [PATCH] nextcloud-client: move to by-name, tweak

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 ...e-autostart-entry-do-not-use-an-abso.patch |  0
 .../ne/nextcloud-client/package.nix}          | 44 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 19 insertions(+), 27 deletions(-)
 rename pkgs/{applications/networking => by-name/ne}/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch (100%)
 rename pkgs/{applications/networking/nextcloud-client/default.nix => by-name/ne/nextcloud-client/package.nix} (74%)

diff --git a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch b/pkgs/by-name/ne/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
similarity index 100%
rename from pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
rename to pkgs/by-name/ne/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
similarity index 74%
rename from pkgs/applications/networking/nextcloud-client/default.nix
rename to pkgs/by-name/ne/nextcloud-client/package.nix
index 376dbae74836..18a63ad2e8ad 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -1,6 +1,7 @@
 { lib
-, stdenv
+, gitUpdater
 , fetchFromGitHub
+, qt6Packages
 , cmake
 , extra-cmake-modules
 , inotify-tools
@@ -11,21 +12,12 @@
 , openssl
 , pcre
 , pkg-config
-, qt5compat
-, qtbase
-, qtkeychain
-, qtsvg
-, qttools
-, qtwebengine
-, qtwebsockets
 , sphinx
 , sqlite
 , xdg-utils
-, qtwayland
-, wrapQtAppsHook
 }:
 
-stdenv.mkDerivation rec {
+qt6Packages.stdenv.mkDerivation rec {
   pname = "nextcloud-client";
   version = "3.14.3";
 
@@ -34,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nextcloud-releases";
     repo = "desktop";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nYoBs5EnWiqYRsqc5CPxCIs0NAxSprI9PV0lO/c8khw=";
   };
 
@@ -55,7 +47,7 @@ stdenv.mkDerivation rec {
     extra-cmake-modules
     librsvg
     sphinx
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -65,15 +57,15 @@ stdenv.mkDerivation rec {
     libsecret
     openssl
     pcre
-    qt5compat
-    qtbase
-    qtkeychain
-    qtsvg
-    qttools
-    qtwebengine
-    qtwebsockets
+    qt6Packages.qt5compat
+    qt6Packages.qtbase
+    qt6Packages.qtkeychain
+    qt6Packages.qtsvg
+    qt6Packages.qttools
+    qt6Packages.qtwebengine
+    qt6Packages.qtwebsockets
+    qt6Packages.qtwayland
     sqlite
-    qtwayland
   ];
 
   qtWrapperArgs = [
@@ -92,13 +84,15 @@ stdenv.mkDerivation rec {
     make doc-man
   '';
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
+  meta = {
     changelog = "https://github.com/nextcloud/desktop/releases/tag/v${version}";
     description = "Desktop sync client for Nextcloud";
     homepage = "https://nextcloud.com";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ kranzes SuperSandro2000 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ kranzes SuperSandro2000 ];
+    platforms = lib.platforms.linux;
     mainProgram = "nextcloud";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86ce4f1eb9a2..7baad67708f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4445,8 +4445,6 @@ with pkgs;
   nextcloud29Packages = callPackage ../servers/nextcloud/packages { ncVersion = "29"; };
   nextcloud30Packages = callPackage ../servers/nextcloud/packages { ncVersion = "30"; };
 
-  nextcloud-client = qt6Packages.callPackage ../applications/networking/nextcloud-client { };
-
   nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };
 
   nextcloud-notify_push = callPackage ../servers/nextcloud/notify_push.nix { };