Skip to content

Commit 0d7cc71

Browse files
authored
nextcloud-client: 3.14.3 -> 3.15.2, to by-name, minor tweaks (#368914)
2 parents d9f2b5c + 4532618 commit 0d7cc71

File tree

3 files changed

+23
-29
lines changed

3 files changed

+23
-29
lines changed

pkgs/applications/networking/nextcloud-client/default.nix renamed to pkgs/by-name/ne/nextcloud-client/package.nix

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{ lib
2-
, stdenv
2+
, gitUpdater
33
, fetchFromGitHub
4+
, qt6Packages
45
, cmake
56
, extra-cmake-modules
67
, inotify-tools
@@ -11,31 +12,23 @@
1112
, openssl
1213
, pcre
1314
, pkg-config
14-
, qt5compat
15-
, qtbase
16-
, qtkeychain
17-
, qtsvg
18-
, qttools
19-
, qtwebengine
20-
, qtwebsockets
2115
, sphinx
2216
, sqlite
2317
, xdg-utils
24-
, qtwayland
25-
, wrapQtAppsHook
18+
, libsysprof-capture
2619
}:
2720

28-
stdenv.mkDerivation rec {
21+
qt6Packages.stdenv.mkDerivation rec {
2922
pname = "nextcloud-client";
30-
version = "3.14.3";
23+
version = "3.15.2";
3124

3225
outputs = [ "out" "dev" ];
3326

3427
src = fetchFromGitHub {
3528
owner = "nextcloud-releases";
3629
repo = "desktop";
37-
rev = "refs/tags/v${version}";
38-
hash = "sha256-nYoBs5EnWiqYRsqc5CPxCIs0NAxSprI9PV0lO/c8khw=";
30+
tag = "v${version}";
31+
hash = "sha256-JA6ke9tBS4IiuDWJ8Efa76+5os+RT0L/zv00ncgH+IU=";
3932
};
4033

4134
patches = [
@@ -55,7 +48,7 @@ stdenv.mkDerivation rec {
5548
extra-cmake-modules
5649
librsvg
5750
sphinx
58-
wrapQtAppsHook
51+
qt6Packages.wrapQtAppsHook
5952
];
6053

6154
buildInputs = [
@@ -65,15 +58,16 @@ stdenv.mkDerivation rec {
6558
libsecret
6659
openssl
6760
pcre
68-
qt5compat
69-
qtbase
70-
qtkeychain
71-
qtsvg
72-
qttools
73-
qtwebengine
74-
qtwebsockets
61+
qt6Packages.qt5compat
62+
qt6Packages.qtbase
63+
qt6Packages.qtkeychain
64+
qt6Packages.qtsvg
65+
qt6Packages.qttools
66+
qt6Packages.qtwebengine
67+
qt6Packages.qtwebsockets
68+
qt6Packages.qtwayland
7569
sqlite
76-
qtwayland
70+
libsysprof-capture
7771
];
7872

7973
qtWrapperArgs = [
@@ -92,13 +86,15 @@ stdenv.mkDerivation rec {
9286
make doc-man
9387
'';
9488

95-
meta = with lib; {
89+
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
90+
91+
meta = {
9692
changelog = "https://github.com/nextcloud/desktop/releases/tag/v${version}";
9793
description = "Desktop sync client for Nextcloud";
9894
homepage = "https://nextcloud.com";
99-
license = licenses.gpl2Plus;
100-
maintainers = with maintainers; [ kranzes SuperSandro2000 ];
101-
platforms = platforms.linux;
95+
license = lib.licenses.gpl2Plus;
96+
maintainers = with lib.maintainers; [ kranzes SuperSandro2000 ];
97+
platforms = lib.platforms.linux;
10298
mainProgram = "nextcloud";
10399
};
104100
}

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4445,8 +4445,6 @@ with pkgs;
44454445
nextcloud29Packages = callPackage ../servers/nextcloud/packages { ncVersion = "29"; };
44464446
nextcloud30Packages = callPackage ../servers/nextcloud/packages { ncVersion = "30"; };
44474447

4448-
nextcloud-client = qt6Packages.callPackage ../applications/networking/nextcloud-client { };
4449-
44504448
nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };
44514449

44524450
nextcloud-notify_push = callPackage ../servers/nextcloud/notify_push.nix { };

0 commit comments

Comments
 (0)