Unverified Commit 0d7cc712 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

nextcloud-client: 3.14.3 -> 3.15.2, to by-name, minor tweaks (#368914)

parents d9f2b5c0 45326182

pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch→pkgs/by-name/ne/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch

+0 −0

File moved.

View file

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

+23 −27
Original line number Diff line number Diff line 
{ lib

, stdenv

, gitUpdater

, fetchFromGitHub

, qt6Packages

, cmake

, extra-cmake-modules

, inotify-tools
@@ -11,31 +12,23 @@ 
, openssl

, pcre

, pkg-config

, qt5compat

, qtbase

, qtkeychain

, qtsvg

, qttools

, qtwebengine

, qtwebsockets

, sphinx

, sqlite

, xdg-utils

, qtwayland

, wrapQtAppsHook

, libsysprof-capture

}:



stdenv.mkDerivation rec {

qt6Packages.stdenv.mkDerivation rec {

  pname = "nextcloud-client";

  version = "3.14.3";

  version = "3.15.2";



  outputs = [ "out" "dev" ];



  src = fetchFromGitHub {

    owner = "nextcloud-releases";

    repo = "desktop";

    rev = "refs/tags/v${version}";

    hash = "sha256-nYoBs5EnWiqYRsqc5CPxCIs0NAxSprI9PV0lO/c8khw=";

    tag = "v${version}";

    hash = "sha256-JA6ke9tBS4IiuDWJ8Efa76+5os+RT0L/zv00ncgH+IU=";

  };



  patches = [
@@ -55,7 +48,7 @@ stdenv.mkDerivation rec { 
    extra-cmake-modules

    librsvg

    sphinx

    wrapQtAppsHook

    qt6Packages.wrapQtAppsHook

  ];



  buildInputs = [
@@ -65,15 +58,16 @@ 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

    libsysprof-capture

  ];



  qtWrapperArgs = [
@@ -92,13 +86,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";

  };

}

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -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 { };