diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 83f15b54fa7..fb0c0a18ac5 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "7.0.10"; + version = "8.0.1"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; - rev = "v${version}"; - sha256 = "082v1qbysrqb7m0lk56fpx8n403fjxbvbj0svm4mkjl6mzs2cv22"; + rev = "b4b944921c7efef13a93d693c45c997943899dec"; + sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw="; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 385f2f3cc13..0d911cd35c1 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,22 +1,38 @@ -{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, vala, python2, curl, libevent, glib, libsearpc, sqlite, intltool, fuse, libuuid }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, ccnet +, curl +, fuse +, glib +, intltool +, libevent +, libsearpc +, libuuid +, pkg-config +, python3 +, sqlite +, vala +, which +}: stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "7.0.10"; + version = "8.0.1"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; - rev = "v${version}"; - sha256 = "0b3297cbagi9x8dnw2gjifmb8dk6vyhg6vfrfsanm1wyx8pgw2jg"; + rev = "d34499a2aafa024623a4210fe7f663cef13fe9a6"; + sha256 = "VKoGr3CTDFg3Q0X+MTlwa4BbfLB+28FeTyTJRCq37RA="; }; nativeBuildInputs = [ autoreconfHook vala - pkgconfig - python2 - python2.pkgs.wrapPython + pkg-config + python3 + python3.pkgs.wrapPython ]; buildInputs = [ @@ -30,10 +46,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-server" "--disable-console" + "--with-python3" ]; - pythonPath = with python2.pkgs; [ - future + pythonPath = with python3.pkgs; [ libsearpc ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cf7279fbdd..e53ffce6060 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24155,7 +24155,7 @@ in scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { }; - seafile-client = libsForQt514.callPackage ../applications/networking/seafile-client { }; + seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; sent = callPackage ../applications/misc/sent { };