Merge pull request #128776 from eduardosm/seafile

seafile-shared: 8.0.1 -> 8.0.3, seafile-client: 8.0.1 -> 8.0.3
This commit is contained in:
Luke Granger-Brown 2021-07-03 01:35:39 +01:00 committed by GitHub
commit 1de7020858
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 16 deletions

View file

@ -1,27 +1,18 @@
{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, qtbase, qttools
{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools
, seafile-shared, jansson, libsearpc
, withShibboleth ? true, qtwebengine }:
mkDerivation rec {
pname = "seafile-client";
version = "8.0.1";
version = "8.0.3";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile-client";
rev = "b4b944921c7efef13a93d693c45c997943899dec";
sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw=";
rev = "v${version}";
sha256 = "lhdKbR19ScNeezICf7vwZaeJikPjwbqrz42bo4lhxJs=";
};
patches = [
# Fix compilation failure with "error: template with C linkage", fixes #122505
(fetchpatch {
url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_glib2.diff?h=seafile-client&id=7be253aaa2bdb6771721f45aa08bc875c8001c5a";
name = "fix_build_with_glib2.diff";
sha256 = "0hl7rcqfr8k62c1pr133bp3j63b905izaaggmgvr1af4jibal05v";
})
];
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ]
++ lib.optional withShibboleth qtwebengine;

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "seafile-shared";
version = "8.0.1";
version = "8.0.3";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile";
rev = "d34499a2aafa024623a4210fe7f663cef13fe9a6";
sha256 = "VKoGr3CTDFg3Q0X+MTlwa4BbfLB+28FeTyTJRCq37RA=";
rev = "v${version}";
sha256 = "F6kLPWZb7FttyAP7pNEn+aRcAjvZlMNXrmuHMYa0Xig=";
};
nativeBuildInputs = [