From 7cc9c9adab82dbcf38e0824b524860888c3bced2 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Thu, 26 Dec 2019 01:27:30 +0100
Subject: [PATCH] bump versions of libsearpc and ccnet-server, fix ccnet-server
 build

---
 libsearpc/default.nix      | 6 +++---
 seafile-server/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libsearpc/default.nix b/libsearpc/default.nix
index 14ef2e3..4bd0e73 100644
--- a/libsearpc/default.nix
+++ b/libsearpc/default.nix
@@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "libsearpc";
-    #rev = "v${version}";
-    rev = "v3.1-latest";
-    sha256 = "sha256:078r0bgncgadsv4v82kxmq2mvd19grssakjn0syrv61a96vmfyjj";
+    rev = "v${version}";
+    #rev = "35a19401d6b23e2fd6b90b5d9d9923b08927916d";
+    sha256 = "sha256:18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd";
   };
 
   patches = [ ./libsearpc.pc.patch ];
diff --git a/seafile-server/default.nix b/seafile-server/default.nix
index 22ab3ad..169d7be 100644
--- a/seafile-server/default.nix
+++ b/seafile-server/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, 
-  autoconf, automake, autoreconfHook, pkgconfig, curl, libevent, glib, libuuid, intltool, sqlite, withMysql ? true, libmysql, libarchive, libtool, jansson, vala, fuse, openssl, libevhtp, ccnet, libsearpc, which,
+  autoconf, automake, autoreconfHook, pkgconfig, curl, libevent, glib, libuuid, intltool, sqlite, withMysql ? true, libmysql, libarchive, libtool, jansson, vala, fuse, openssl, libevhtp, libsearpc, which,
   # for SeaHub
   python3, python3Packages }:
 
@@ -20,7 +20,7 @@
         owner = "haiwen";
         repo = "seafile-server";
         rev = "v${version}-server";
-        sha256 = "sha256:1805q0dcy6lw0nkjqjg8qwahwqxm8iy02lw8012s5qp91jcg8gpl";
+        sha256 = "sha256:1y555nm4ic5mbmi87nlp1j23z13na1afziv847xczq3mkach9vqi";
       };
       # patch to work with latest, non-vulnerable libevhtp
       patches = [
@@ -77,7 +77,7 @@
         sha256 = "sha256:0hf9mmf019984ybc20zxaqyhcfhhr3k0bjr45pq9d79w16ndnim8";
       };
 
-      buildInputs = [ vala libsearpc libuuid sqlite openssl libevent glib python ]
+      buildInputs = [ vala fuse libsearpc libuuid sqlite openssl libarchive libevent glib python ]
       ++ lib.optional (!withMysql) "--without-mysql";
       # `which` is called directly from python during buildPhase, so we need the binary
       nativeBuildInputs = [ autoconf automake libtool pkgconfig autoreconfHook which ];