Merge pull request #259634 from hellwolf/owncloud-client-v5.0.0

owncloud-client: 4.2.0 -> 5.0.0

pkgs/by-name/kd/kdsingleapplication/package.nix

@@ -0,0 +1,33 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, qt6
+}:
+
+stdenv.mkDerivation rec {
+  pname = "KDSingleApplication";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "KDAB";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-5YprRbfiFI2UGMJqDf+3VDwXV904USEpMEpoNm0g7KY=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt6.qtbase ];
+
+  cmakeFlags = [ "-DKDSingleApplication_QT6=true" ];
+  dontWrapQtApps = true;
+
+  meta = with lib; {
+    description = "KDAB's helper class for single-instance policy applications";
+    homepage = "https://www.kdab.com/";
+    maintainers = with maintainers; [ hellwolf ];
+    platforms = platforms.unix;
+    license = licenses.mit;
+    changelog = "https://github.com/KDAB/KDSingleApplication/releases/tag/v${version}";
+  };
+}

pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix

@@ -2,8 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , cmake
-, qtbase
+, qt6
-, wrapQtAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -19,15 +18,14 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "${src.name}/client";
 
-  nativeBuildInputs = [ cmake wrapQtAppsHook ];
+  nativeBuildInputs = [ cmake ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ qt6.qtbase ];
-
+  dontWrapQtApps = true;
-  cmakeFlags = [  ];
 
   meta = with lib; {
     description = "C++ Qt API for Libre Graph, a free API for cloud collaboration inspired by the MS Graph API";
     homepage = "https://owncloud.org";
-    maintainers = with maintainers; [ qknight hellwolf ];
+    maintainers = with maintainers; [ hellwolf ];
     platforms = platforms.unix;
     license = licenses.asl20;
     changelog = "https://github.com/owncloud/libre-graph-api-cpp-qt-client/releases/tag/v${version}";

pkgs/by-name/ow/owncloud-client/package.nix

@@ -1,38 +1,49 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, mkDerivation
 , pkg-config
 , cmake
 , extra-cmake-modules
-, callPackage
+, qt6
-, qtbase
+, qt6Packages
-, qtkeychain
-, wrapQtAppsHook
-, qttools
 , sqlite
 , libsecret
+, libre-graph-api-cpp-qt-client
+, kdsingleapplication
+# darwin only:
+, libinotify-kqueue
+, sparkleshare
 }:
 
 stdenv.mkDerivation rec {
   pname = "owncloud-client";
-  version = "4.2.0";
+  version = "5.0.0";
-
-  libregraph = callPackage ./libre-graph-api-cpp-qt-client.nix { };
 
   src = fetchFromGitHub {
     owner = "owncloud";
     repo = "client";
     rev = "refs/tags/v${version}";
-    hash = "sha256-dPNVp5DxCI4ye8eFjHoLGDlf8Ap682o1UB0k2VNr2rs=";
+    hash = "sha256-SSMNmWrCT1sGa38oY8P84QNedNkQPcIRWrV9B65B5X8=";
   };
 
-  nativeBuildInputs = [ pkg-config cmake extra-cmake-modules wrapQtAppsHook qttools ];
+  nativeBuildInputs = [
-  buildInputs = [ qtbase qtkeychain sqlite libsecret libregraph ];
+    pkg-config
+    cmake
+    extra-cmake-modules
+    qt6.qttools
+    qt6.wrapQtAppsHook
+  ];
 
-  cmakeFlags = [
+  buildInputs = [
-    "-UCMAKE_INSTALL_LIBDIR"
+    sqlite
-    "-DNO_SHIBBOLETH=1"
+    libsecret
+    qt6.qtbase
+    qt6.qtsvg # Needed for the systray icon
+    qt6Packages.qtkeychain
+    libre-graph-api-cpp-qt-client
+    kdsingleapplication
+  ] ++ lib.optionals stdenv.isDarwin [
+    libinotify-kqueue sparkleshare
   ];
 
   meta = with lib; {
@@ -40,7 +51,6 @@ stdenv.mkDerivation rec {
     homepage = "https://owncloud.org";
     maintainers = with maintainers; [ qknight hellwolf ];
     platforms = platforms.unix;
-    broken = stdenv.isDarwin;
     license = licenses.gpl2Plus;
     changelog = "https://github.com/owncloud/client/releases/tag/v${version}";
   };

pkgs/top-level/all-packages.nix

@@ -11780,8 +11780,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration;
   };
 
-  owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { };
-
   oxefmsynth = callPackage ../applications/audio/oxefmsynth { };
 
   oxidized = callPackage ../tools/admin/oxidized { };