From 6a36dabcfaf803b958793288810f0046694614ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Wed, 30 Jun 2021 16:08:51 +0200 Subject: [PATCH 1/4] seafile-shared: 8.0.1 -> 8.0.3 (cherry picked from commit 7644ef6f57d005a47da37b8eb73df72f3f3b1256) --- pkgs/misc/seafile-shared/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 15a129246e1..a94964d888d 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -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 = [ From 39e0ac53f8945d8c508c7492a14495e3f4e9b66a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Wed, 30 Jun 2021 16:11:42 +0200 Subject: [PATCH 2/4] seafile-client: 8.0.1 -> 8.0.3 (cherry picked from commit 004d1683b883b126b0a604eb769757f41f098764) --- .../networking/seafile-client/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 6b73f03531d..f17d1fa3ae7 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -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; From 4ab3794325fbc099d1804c74f5454eff0dc21f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sat, 3 Jul 2021 12:38:52 +0200 Subject: [PATCH 3/4] seafile-shared: update source hash It looks like the tag has been modified (cherry picked from commit 8f901848bf509d3719c1805350194e301523b027) --- pkgs/misc/seafile-shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index a94964d888d..cc6d0ced6d1 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "F6kLPWZb7FttyAP7pNEn+aRcAjvZlMNXrmuHMYa0Xig="; + sha256 = "QflLh3fj+jOq/8etr9aG8LGrvtIlB/htVkWbdO+GIbM="; }; nativeBuildInputs = [ From 4e3128d349b141267895ba2345f69f5312791913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sat, 3 Jul 2021 12:42:02 +0200 Subject: [PATCH 4/4] seafile-client: update source hash It looks like the tag has been modified (cherry picked from commit 1a4c9851c2b79c4d181d9c306476714ce6a217c9) --- pkgs/applications/networking/seafile-client/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index f17d1fa3ae7..446da4cdea3 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -10,7 +10,7 @@ mkDerivation rec { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "lhdKbR19ScNeezICf7vwZaeJikPjwbqrz42bo4lhxJs="; + sha256 = "cG3OSqRhYnxlzfauQia6pM/1gu+iE5mtHTGk3kGMFH0="; }; nativeBuildInputs = [ pkg-config cmake ];