schmittlauch/nixos-seafile-overlay
1
0
Fork 0
Code Issues 7 Pull requests Releases Wiki Activity

bump versions of libsearpc and ccnet-server, fix ccnet-server build

Browse source
This commit is contained in:
Trolli Schmittlauch 2019-12-26 01:27:30 +01:00
parent ba46230605
commit 7cc9c9adab
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libsearpc/default.nix
View file

@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "haiwen"; owner = "haiwen";
repo = "libsearpc"; repo = "libsearpc";
#rev = "v${version}"; rev = "v${version}";
rev = "v3.1-latest"; #rev = "35a19401d6b23e2fd6b90b5d9d9923b08927916d";
sha256 = "sha256:078r0bgncgadsv4v82kxmq2mvd19grssakjn0syrv61a96vmfyjj"; sha256 = "sha256:18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd";
}; };
patches = [ ./libsearpc.pc.patch ]; patches = [ ./libsearpc.pc.patch ];

6
seafile-server/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, { 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 # for SeaHub
python3, python3Packages }: python3, python3Packages }:
@ -20,7 +20,7 @@
owner = "haiwen"; owner = "haiwen";
repo = "seafile-server"; repo = "seafile-server";
rev = "v${version}-server"; rev = "v${version}-server";
sha256 = "sha256:1805q0dcy6lw0nkjqjg8qwahwqxm8iy02lw8012s5qp91jcg8gpl"; sha256 = "sha256:1y555nm4ic5mbmi87nlp1j23z13na1afziv847xczq3mkach9vqi";
}; };
# patch to work with latest, non-vulnerable libevhtp # patch to work with latest, non-vulnerable libevhtp
patches = [ patches = [
@ -77,7 +77,7 @@
sha256 = "sha256:0hf9mmf019984ybc20zxaqyhcfhhr3k0bjr45pq9d79w16ndnim8"; 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"; ++ lib.optional (!withMysql) "--without-mysql";
# `which` is called directly from python during buildPhase, so we need the binary # `which` is called directly from python during buildPhase, so we need the binary
nativeBuildInputs = [ autoconf automake libtool pkgconfig autoreconfHook which ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig autoreconfHook which ];