bump seafile components to version 8.0.0 and fix build

seafile-server/default.nix

@@ -1,18 +1,54 @@
-{ stdenv, lib, fetchFromGitHub, 
+{ stdenv
-  autoconf, automake, autoreconfHook, pkgconfig, curl, libevent, glib, libuuid, intltool, sqlite, withMysql ? true, libmysqlclient, libarchive, libtool, jansson, vala, fuse, openssl, libevhtp, libsearpc, which,
+, lib
-  # for SeaHub
+, fetchFromGitHub
-  python3, python3Packages }:
+, autoconf
-
+, automake
+, autoreconfHook
+, pkgconfig
+, curl
+, libevent
+, glib
+, libuuid
+, intltool
+, sqlite
+, withMysql ? true
+, libmysqlclient
+, libarchive
+, libtool
+, jansson
+, vala
+, fuse
+, openssl
+, oniguruma
+, libevhtp
+, libsearpc
+, which
+, # for SeaHub
+  python3
+, python3Packages
+}:
 let
-    version = "7.1.1";
+  version = "8.0.0";
   python = python3;
   pythonPackages = python3Packages;
-    django = pythonPackages.django_1_11;
+  django = pythonPackages.django;
   djangoModules = with pythonPackages; [ django-statici18n django-post_office django-picklefield django-formtools djangorestframework ];
   seahubPythonDependencies = with pythonPackages; [
-      django django-webpack-loader future captcha gunicorn pymysql openpyxl qrcode dateutil requests pillow pyjwt pycryptodome
+    django
+    django-webpack-loader
+    future
+    captcha
+    gunicorn
+    pymysql
+    openpyxl
+    qrcode
+    dateutil
+    requests
+    pillow
+    pyjwt
+    pycryptodome
   ]
-      ++ map (p: p.override { django = django; }) djangoModules; # build django modules with required version
+  ++ map (p: p.override { inherit django; }) djangoModules; # build django modules with required version
   seafile-server-core = stdenv.mkDerivation rec {
     name = "seafile-server-core";
     inherit version;
@@ -20,7 +56,7 @@
       owner = "haiwen";
       repo = "seafile-server";
       rev = "v${version}-server";
-        sha256 = "sha256:1y555nm4ic5mbmi87nlp1j23z13na1afziv847xczq3mkach9vqi";
+      sha256 = "0pd1zjsw6lkpxd54ln0dz5r9zx9585nib10kvpl1vgzp61g4d223";
     };
     # patch to work with latest, non-vulnerable libevhtp
     patches = [
@@ -29,7 +65,7 @@
     ];
     # `which` is called directly from python during buildPhase, so we need the binary
     nativeBuildInputs = [ autoconf automake libtool pkgconfig vala autoreconfHook which pythonPackages.wrapPython ];
-      buildInputs = [ sqlite glib python libuuid openssl fuse libarchive ccnet-server libevent libevhtp ];
+    buildInputs = [ sqlite glib python libuuid openssl oniguruma fuse libarchive libevent libevhtp ];
     propagatedBuildInputs = [ libsearpc ] ++ seahubPythonDependencies;
     postFixup = ''
       buildPythonPath $propagatedBuildInputs
@@ -49,11 +85,11 @@
       owner = "haiwen";
       repo = "seahub";
       rev = "v${version}-server";
-        sha256 = "sha256:1s5yd4w5z31hx3x7cd25zgzv7h2yzbdbryypa9in19akmsmb11fp";
+      sha256 = "0j7g43j7w1zb00pg4aaacdv5ycva3qf561hj9pbwh4709mbiykip";
     };
     phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ];
     buildInputs = [ python pythonPackages.wrapPython ];
-      propagatedBuildInputs = seahubPythonDependencies ++ [ pythonPackages.seafile-bindings pythonPackages.ccnet-bindings ]; # for `seaserv` module
+    propagatedBuildInputs = seahubPythonDependencies ++ [ pythonPackages.seafile-bindings ]; # for `seaserv` module
     installPhase = ''
       cp -r ./ $out
       cd "$out"
@@ -67,15 +103,6 @@
       maintainers = with maintainers; [ schmittlauch ];
     };
   };
-    ccnet-server = stdenv.mkDerivation rec {
-      name = "ccnet-server";
-      inherit version;
-      src = fetchFromGitHub {
-        owner = "haiwen";
-        repo = "ccnet-server";
-        rev = "v${version}-server";
-        sha256 = "sha256:0hf9mmf019984ybc20zxaqyhcfhhr3k0bjr45pq9d79w16ndnim8";
-      };
 
   buildInputs = [ vala fuse libsearpc libuuid sqlite openssl libarchive libevent glib python ]
     ++ lib.optional (!withMysql) "--without-mysql";
@@ -87,13 +114,13 @@
     description = "Internal communication framework and user/group management for Seafile server";
     license = lib.licenses.agpl3; # with additional OpenSSL linking exception
   };
-    };
 
-  in stdenv.mkDerivation {
+in
+stdenv.mkDerivation {
   name = "seafile-server";
   inherit version;
 
-    buildInputs = [ seahub seafile-server-core ccnet-server libsearpc ]
+  buildInputs = [ seahub seafile-server-core libsearpc ]
     ++ lib.optional withMysql libmysqlclient;
   phases = [ "installPhase" "fixupPhase" "distPhase" ];
   # todo: create data directory in /srv in activation script
@@ -107,5 +134,5 @@
     maintainers = with maintainers; [ schmittlauch ];
     license = licenses.free; # components with different free software licenses are combined
   };
-    inherit ccnet-server seafile-server-core seahub; # for using the path in the NixOS module
+  inherit seafile-server-core seahub;# for using the path in the NixOS module
 }

seafile-server/recent_libevhtp.patch

@@ -101,29 +101,6 @@ Subject: [PATCH] Update upload-file.c
      evhtp_set_regex_cb (htp, "^/upload_progress.*", upload_progress_cb, NULL);
  
 
-From b6c41aae74f1eb285a033125f4a5af578c8efbb6 Mon Sep 17 00:00:00 2001
-From: Ultima1252 <ultima1252@gmail.com>
-Date: Mon, 15 Jan 2018 17:13:57 -0800
-Subject: [PATCH] Update Makefile.am
-
----
- server/Makefile.am | 2 +-
-  1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/server/Makefile.am b/server/Makefile.am
-index 2491f5e..dd695bd 100644
---- a/server/Makefile.am
-+++ b/server/Makefile.am
-@@ -114,7 +114,7 @@ seaf_server_SOURCES = \
- 
- seaf_server_LDADD = @CCNET_LIBS@ \
- 	$(top_builddir)/lib/libseafile_common.la \
--	@GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ -levhtp \
-+	@ONIGURUMA_LIBS@ @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ @LIBEVHTP_LIBS@ \
- 	$(top_builddir)/common/cdc/libcdc.la \
- 	$(top_builddir)/common/db-wrapper/libdbwrapper.la \
- 	@SEARPC_LIBS@ @JANSSON_LIBS@ ${LIB_WS32} @ZLIB_LIBS@ \
-
 From bb2cd57f39450db39c1b6b222b06ac7987f3cd32 Mon Sep 17 00:00:00 2001
 From: Ultima1252 <ultima1252@gmail.com>
 Date: Mon, 15 Jan 2018 17:17:27 -0800