From 6055148854621134dcca323014715e76d2103d15 Mon Sep 17 00:00:00 2001 From: MGlolenstine Date: Mon, 26 Jun 2023 12:07:38 +0200 Subject: [PATCH 1/3] libsearpc: 3.2.0 -> 3.3-20230626 --- pkgs/development/libraries/libsearpc/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index bbd892c33ee8..9ae8d87f8872 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -9,22 +9,20 @@ }: stdenv.mkDerivation rec { - version = "3.2.0"; + version = "3.3-20230626"; + commit = "783141fb694f3bd1f8bd8a783670dd25a53b9fc1"; pname = "libsearpc"; src = fetchFromGitHub { owner = "haiwen"; repo = "libsearpc"; - rev = "v${version}"; - sha256 = "18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd"; + rev = commit; + sha256 = "sha256-nYYp3EyA8nufhbWaw4Lv/c4utGYaxC+PoFyamUEVJx4="; }; nativeBuildInputs = [ autoreconfHook pkg-config - ]; - - buildInputs = [ python3 ]; From ecb8485514605749222e0f99c40168d97df0d4c7 Mon Sep 17 00:00:00 2001 From: MGlolenstine Date: Mon, 26 Jun 2023 12:08:02 +0200 Subject: [PATCH 2/3] seafile-shared: 8.0.3 -> 9.0.2 --- pkgs/misc/seafile-shared/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 6db3ab932db9..a5bb8835008e 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -9,20 +9,22 @@ , python3 , sqlite , vala +, libwebsockets }: stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "8.0.3"; + version = "9.0.2"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; - rev = "0fdc14d5175979919b7c741f6bb97bfaaacbbfbe"; - sha256 = "1cr1hvpp96s5arnzh1r5sazapcghhvbazbf7zym37yp3fy3lpya1"; + rev = "v${version}"; + sha256 = "sha256-aJJVrKulZVa1LNOUBIwuPrWqlsjz7kyP/LXWwxO8++A="; }; nativeBuildInputs = [ + libwebsockets autoreconfHook vala pkg-config From a28d962e11d39961552c3f6bad2e65816c2dcc31 Mon Sep 17 00:00:00 2001 From: MGlolenstine Date: Mon, 26 Jun 2023 12:08:26 +0200 Subject: [PATCH 3/3] seafile-client: 8.0.7 -> 9.0.2 --- .../networking/seafile-client/default.nix | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index adda284a6b8c..faa6304c38a8 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,26 +1,45 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools -, seafile-shared, jansson, libsearpc -, withShibboleth ? true, qtwebengine }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, qtbase +, qttools +, libuuid +, seafile-shared +, jansson +, libsearpc +, withShibboleth ? true +, qtwebengine +, wrapQtAppsHook +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "seafile-client"; - version = "8.0.7"; + version = "9.0.2"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; - # Tag v8.0.7 used to point to this commit, but was re-tagged later to a state - # that fails to link properly - rev = "8b96abf64e6aa19e3beeff6b322bcd6d28120bdd"; - sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj"; + rev = "v${version}"; + sha256 = "sha256-6AsvqlXDmTr3yBvYlV/0qjH+KnZ03S5TU7yzGt0MqiI="; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ] - ++ lib.optional withShibboleth qtwebengine; + nativeBuildInputs = [ + libuuid + pkg-config + cmake + wrapQtAppsHook + qttools + ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] - ++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; + buildInputs = [ + seafile-shared + jansson + libsearpc + ] ++ lib.optional withShibboleth qtwebengine; + + cmakeFlags = lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; qtWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ seafile-shared ]}"