From d0b83ae0fa3b6bc30f1ba9557e5ec8f501ff8e71 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Thu, 26 Oct 2023 23:43:36 +0300 Subject: [PATCH 1/3] libre-graph-api-cpp-qt-client: refactor - move to pkgs/by-name --- .../li/libre-graph-api-cpp-qt-client/package.nix} | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) rename pkgs/{applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix => by-name/li/libre-graph-api-cpp-qt-client/package.nix} (79%) diff --git a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix similarity index 79% rename from pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix rename to pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix index 31412e72ec98..5fc90574d40f 100644 --- a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix +++ b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix @@ -2,8 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, qtbase -, wrapQtAppsHook +, qt6 }: stdenv.mkDerivation rec { @@ -19,15 +18,14 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/client"; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ qtbase ]; - - cmakeFlags = [ ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt6.qtbase ]; + dontWrapQtApps = true; 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}"; From 0c1b3cb64aeb0463efe0473e116c1846ceeb7a95 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Thu, 26 Oct 2023 23:45:54 +0300 Subject: [PATCH 2/3] kdsingleapplication: init at 1.0.0 - new library required by owncloud-client 5.0.0 --- .../kd/kdsingleapplication/package.nix | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/kd/kdsingleapplication/package.nix diff --git a/pkgs/by-name/kd/kdsingleapplication/package.nix b/pkgs/by-name/kd/kdsingleapplication/package.nix new file mode 100644 index 000000000000..22522dd6dc97 --- /dev/null +++ b/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}"; + }; +} From ae102bbaac9ce4d109424bbfa7bb23483358390b Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Thu, 26 Oct 2023 23:46:39 +0300 Subject: [PATCH 3/3] owncloud-client: 4.2.0 -> 5.0.0 - 5.0.0 adds new a new local dependency: kdsingleapplication - 5.0.0 starts to use Qt6 - Qt6 requires qt6.qtsvg for tray icon support - move all packages under by-name --- .../ow/owncloud-client/package.nix} | 42 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 26 insertions(+), 18 deletions(-) rename pkgs/{applications/networking/owncloud-client/default.nix => by-name/ow/owncloud-client/package.nix} (52%) diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/by-name/ow/owncloud-client/package.nix similarity index 52% rename from pkgs/applications/networking/owncloud-client/default.nix rename to pkgs/by-name/ow/owncloud-client/package.nix index 7da1a368d845..5edbd5d0f6b8 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/by-name/ow/owncloud-client/package.nix @@ -1,38 +1,49 @@ { lib , stdenv , fetchFromGitHub -, mkDerivation , pkg-config , cmake , extra-cmake-modules -, callPackage -, qtbase -, qtkeychain -, wrapQtAppsHook -, qttools +, qt6 +, qt6Packages , sqlite , libsecret +, libre-graph-api-cpp-qt-client +, kdsingleapplication +# darwin only: +, libinotify-kqueue +, sparkleshare }: stdenv.mkDerivation rec { pname = "owncloud-client"; - version = "4.2.0"; - - libregraph = callPackage ./libre-graph-api-cpp-qt-client.nix { }; + version = "5.0.0"; 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 ]; - buildInputs = [ qtbase qtkeychain sqlite libsecret libregraph ]; + nativeBuildInputs = [ + pkg-config + cmake + extra-cmake-modules + qt6.qttools + qt6.wrapQtAppsHook + ]; - cmakeFlags = [ - "-UCMAKE_INSTALL_LIBDIR" - "-DNO_SHIBBOLETH=1" + buildInputs = [ + sqlite + 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}"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 235d9fe41ed6..75375824d102 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11791,8 +11791,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 { };