seafile-shared: 7.0.2 -> 7.0.5, seafile-client: 6.2.11 -> 7.0.5 (#72656)

seafile-shared: 7.0.2 -> 7.0.5, seafile-client: 6.2.11 -> 7.0.5
This commit is contained in:
Silvan Mosberger 2020-01-15 23:45:40 +01:00 committed by GitHub
commit 67373ae389
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 19 deletions

View File

@ -1,33 +1,31 @@
{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools { stdenv, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
, seafile-shared, ccnet , seafile-shared, ccnet, jansson, libsearpc
, withShibboleth ? true, qtwebengine }: , withShibboleth ? true, qtwebengine }:
with stdenv.lib; stdenv.mkDerivation rec {
mkDerivation rec {
version = "6.2.11";
pname = "seafile-client"; pname = "seafile-client";
version = "7.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "haiwen"; owner = "haiwen";
repo = "seafile-client"; repo = "seafile-client";
rev = "v${version}"; rev = "v${version}";
sha256 = "1b8jqmr2qd3bpb3sr4p5w2a76x5zlknkj922sxrvw1rdwqhkb2pj"; sha256 = "08ysmhvdpyzq2s16i3fvii252fzjrxly3da74x8y6wbyy8yywmjy";
}; };
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qtbase qttools seafile-shared ] buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ]
++ optional withShibboleth qtwebengine; ++ lib.optional withShibboleth qtwebengine;
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]
++ optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; ++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";
qtWrapperArgs = [ qtWrapperArgs = [
"--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}" "--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}"
]; ];
meta = with stdenv.lib; { meta = with lib; {
homepage = https://github.com/haiwen/seafile-client; homepage = "https://github.com/haiwen/seafile-client";
description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.linux; platforms = platforms.linux;

View File

@ -1,27 +1,48 @@
{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}: {stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, vala, python2, curl, libevent, glib, libsearpc, sqlite, intltool, fuse, ccnet, libuuid }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "7.0.2";
pname = "seafile-shared"; pname = "seafile-shared";
version = "7.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "haiwen"; owner = "haiwen";
repo = "seafile"; repo = "seafile";
rev = "v${version}"; rev = "v${version}";
sha256 = "0633hhz2cky95y8mvrg9q2cyrnzpnzvn8fcq350wl4a64ij6wa04"; sha256 = "162dnm3sf7bkrnyqd8bcb6il6f2cam9gnaxj6d5dn48k77fw9ryc";
}; };
nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ]; nativeBuildInputs = [
buildInputs = [ python fuse ]; autoreconfHook
propagatedBuildInputs = [ ccnet curl ]; vala
pkgconfig
python2
python2.pkgs.wrapPython
];
buildInputs = [
libuuid
sqlite
libsearpc
libevent
curl
];
configureFlags = [ configureFlags = [
"--disable-server" "--disable-server"
"--disable-console" "--disable-console"
]; ];
pythonPath = with python2.pkgs; [
future
libsearpc
];
postFixup = ''
wrapPythonPrograms
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/haiwen/seafile; homepage = "https://github.com/haiwen/seafile";
description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons"; description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = platforms.linux;