Unverified Commit 70df9ef2 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #232056 from hellwolf/owncloud_4_0_0 

owncloud: 3.2.1 -> 4.0.0
parents 0e5dd9fd 696596a8

pkgs/applications/networking/owncloud-client/default.nix

+2 −5
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


stdenv.mkDerivation rec {

  pname = "owncloud-client";

  version = "3.2.1";

  version = "4.0.0";



  libregraph = callPackage ./libre-graph-api-cpp-qt-client.nix { };
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec { 
    owner = "owncloud";

    repo = "client";

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

    hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE=";

    hash = "sha256-KZ/e8ISQ4FNgT/mtKSlOCa3WQ0lRSaqNIhQn6al6NSM=";

  };



  nativeBuildInputs = [ pkg-config cmake extra-cmake-modules wrapQtAppsHook qttools ];
@@ -33,9 +33,6 @@ stdenv.mkDerivation rec { 
  cmakeFlags = [

    "-UCMAKE_INSTALL_LIBDIR"

    "-DNO_SHIBBOLETH=1"

    # https://github.com/owncloud/client/issues/10537#issuecomment-1447965096

    # NB! From 4.0 it may be turned off by default

    "-DWITH_AUTO_UPDATER=OFF"

  ];



  meta = with lib; {

pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 


stdenv.mkDerivation rec {

  pname = "libre-graph-api-cpp-qt-client";

  version = "0.13.2";

  version = "1.0.4";



  src = fetchFromGitHub {

    owner = "owncloud";

    repo = pname;

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

    hash = "sha256-gbrA8P+ukQAiF2czC2szw3fJv1qoPJyMQ72t7PqB5/s=";

    hash = "sha256-wbdamPi2XSLWeprrYZtBUDH1A2gdp6/5geFZv+ZqSWk=";

  };



  sourceRoot = "source/client";