Merge master into staging-next

2021-01-02 12:24:09 +00:00
parent 6221782074 0224ebfc4c
commit ec161d2240
26 changed files with 2305 additions and 671 deletions
@@ -1,14 +1,14 @@
-{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, vala, python2, curl, libevent, glib, libsearpc, sqlite, intltool, fuse, ccnet, libuuid }:
+{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, vala, python2, curl, libevent, glib, libsearpc, sqlite, intltool, fuse, libuuid }:

 stdenv.mkDerivation rec {
  pname = "seafile-shared";
-  version = "7.0.9";
+  version = "7.0.10";

  src = fetchFromGitHub {
    owner = "haiwen";
    repo = "seafile";
    rev = "v${version}";
-    sha256 = "1n0jq6d6vgk58qmqgdr7w7jfgcrlicnaafz1za9qf76sbi5vc6fk";
+    sha256 = "0b3297cbagi9x8dnw2gjifmb8dk6vyhg6vfrfsanm1wyx8pgw2jg";
  };

  nativeBuildInputs = [