diff options
author | Matej Cotman <cotman.matej@gmail.com> | 2014-05-24 03:32:02 +0200 |
---|---|---|
committer | Matej Cotman <cotman.matej@gmail.com> | 2014-05-24 03:36:10 +0200 |
commit | 116ab5f0c122532ba7834ad1a4f511ba6f820be2 (patch) | |
tree | a7e1ea95efaa4eb39a8fff66f90195dfab4a6fa4 /pkgs/misc/seafile-shared | |
parent | 458087db373fd72323141c8b387c8386451e029a (diff) | |
download | nixpkgs-116ab5f0c122532ba7834ad1a4f511ba6f820be2.tar nixpkgs-116ab5f0c122532ba7834ad1a4f511ba6f820be2.tar.gz nixpkgs-116ab5f0c122532ba7834ad1a4f511ba6f820be2.tar.bz2 nixpkgs-116ab5f0c122532ba7834ad1a4f511ba6f820be2.tar.lz nixpkgs-116ab5f0c122532ba7834ad1a4f511ba6f820be2.tar.xz nixpkgs-116ab5f0c122532ba7834ad1a4f511ba6f820be2.tar.zst nixpkgs-116ab5f0c122532ba7834ad1a4f511ba6f820be2.zip |
seafile: update client, ccnet, libsearpc and shared
Diffstat (limited to 'pkgs/misc/seafile-shared')
-rw-r--r-- | pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch | 121 | ||||
-rw-r--r-- | pkgs/misc/seafile-shared/default.nix | 6 |
2 files changed, 2 insertions, 125 deletions
diff --git a/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch b/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch deleted file mode 100644 index 7966d1e683b..00000000000 --- a/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -r -u a/app/Makefile.am b/app/Makefile.am ---- a/app/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/app/Makefile.am 2014-01-16 14:22:24.584094619 +0100 -@@ -21,7 +21,7 @@ - seafile_LDADD = @CCNET_LIBS@ \ - $(top_builddir)/lib/libseafile.la \ - $(top_builddir)/lib/libseafile_common.la \ -- @SEARPC_LIBS@ \ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 - - seafile_LDFALGS = @STATIC_COMPILE@ @CONSOLE@ -@@ -29,7 +29,7 @@ - if COMPILE_SERVER - seafserv_tool_SOURCES = seafserv-tool.c - seafserv_tool_LDADD = @CCNET_LIBS@ \ -- $(top_builddir)/lib/libseafile.la @SEARPC_LIBS@ \ -+ $(top_builddir)/lib/libseafile.la @SEARPC_LIBS@ @JANSSON_LIBS@ \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 - - seafserv_tool_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -diff -r -u a/configure.ac b/configure.ac ---- a/configure.ac 2014-01-10 11:38:46.000000000 +0100 -+++ b/configure.ac 2014-01-16 14:22:24.584094619 +0100 -@@ -233,6 +233,7 @@ - GLIB_REQUIRED=2.16.0 - CCNET_REQUIRED=0.9.3 - SEARPC_REQUIRED=1.0 -+JANSSON_REQUIRED=2.2.1 - ZDB_REQUIRED=2.10 - #LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 - CURL_REQUIRED=7.17 -@@ -254,6 +255,11 @@ - AC_SUBST(SEARPC_CFLAGS) - AC_SUBST(SEARPC_LIBS) - -+PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED]) -+AC_SUBST(JANSSON_CFLAGS) -+AC_SUBST(JANSSON_LIBS) -+ -+ - PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_REQUIRED]) - AC_SUBST(LIBEVENT_CFLAGS) - AC_SUBST(LIBEVENT_LIBS) -diff -r -u a/daemon/Makefile.am b/daemon/Makefile.am ---- a/daemon/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/daemon/Makefile.am 2014-01-16 14:22:24.587427993 +0100 -@@ -139,7 +139,7 @@ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ - $(top_builddir)/common/cdc/libcdc.la \ - $(top_builddir)/common/index/libindex.la ${LIB_WS32} \ -- @SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ -+ @SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ @JANSSON_LIBS@ - - seaf_daemon_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ - -diff -r -u a/server/gc/Makefile.am b/server/gc/Makefile.am ---- a/server/gc/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/server/gc/Makefile.am 2014-01-16 14:23:20.991449822 +0100 -@@ -50,7 +50,7 @@ - $(top_builddir)/common/cdc/libcdc.la \ - $(top_builddir)/lib/libseafile_common.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} - - seafserv_gc_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ - -@@ -63,6 +63,6 @@ - $(top_builddir)/common/cdc/libcdc.la \ - $(top_builddir)/lib/libseafile_common.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} - - seaf_fsck_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -diff -r -u a/server/Makefile.am b/server/Makefile.am ---- a/server/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/server/Makefile.am 2014-01-16 14:23:40.498354610 +0100 -@@ -99,6 +99,6 @@ - $(top_builddir)/common/index/libindex.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ - $(top_builddir)/common/cdc/libcdc.la \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} - - seaf_server_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -diff -r -u a/httpserver/Makefile.am b/httpserver/Makefile.am ---- a/httpserver/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/httpserver/Makefile.am 2014-01-16 14:26:48.673985279 +0100 -@@ -50,7 +50,7 @@ - @CCNET_LIBS@ \ - $(top_builddir)/lib/libseafile.la \ - $(top_builddir)/common/cdc/libcdc.la \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \ - @LIBARCHIVE_LIBS@ ${LIB_WS32} - - httpserver_LDFLAGS = @STATIC_COMPILE@ -diff -r -u a/controller/Makefile.am b/controller/Makefile.am ---- a/controller/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/controller/Makefile.am 2014-01-16 14:29:42.076102675 +0100 -@@ -18,6 +18,6 @@ - seafile_controller_LDADD = @CCNET_LIBS@ \ - $(top_builddir)/lib/libseafile_common.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -levent \ -- @SEARPC_LIBS@ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ - - seafile_controller_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -diff -r -u a/fuse/Makefile.am b/fuse/Makefile.am ---- a/fuse/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/fuse/Makefile.am 2014-01-16 14:31:44.764267711 +0100 -@@ -43,6 +43,6 @@ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ \ - -lsqlite3 -levent \ - $(top_builddir)/common/cdc/libcdc.la \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@ - - seaf_fuse_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 53092e3a8b7..d6c08e99a51 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,17 +2,15 @@ stdenv.mkDerivation rec { - version = "2.1.1"; + version = "3.0.4"; name = "seafile-shared-${version}"; src = fetchurl { url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; - sha256 = "f07b09ab1eb1cb33f92cee74e499d0350941624396910a4c1a7d79abb45acaa6"; + sha256 = "0a0yj9k2rr3q42swwzn1js3r8bld9wcysw6p9415rw5jabcm1af0"; }; - patches = [ ./0003-Add-autoconfiguration-for-libjansson.patch ]; - buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ]; propagatedBuildInputs = [ ccnet ]; |