Unverified Commit 7568fbf2 authored by Janik's avatar Janik Committed by GitHub
Browse files

Merge pull request #223575 from MGlolenstine/seafile-client

parents 724df8b6 a28d962e

pkgs/applications/networking/seafile-client/default.nix

+33 −14
Original line number Diff line number Diff line 
{ 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

  ];



  buildInputs = [

    seafile-shared

    jansson

    libsearpc

  ] ++ lib.optional withShibboleth qtwebengine;



  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]

    ++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";

  cmakeFlags = lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";



  qtWrapperArgs = [

    "--suffix PATH : ${lib.makeBinPath [ seafile-shared ]}"

pkgs/development/libraries/libsearpc/default.nix

+4 −6
Original line number Diff line number Diff line
@@ -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

  ];

pkgs/misc/seafile-shared/default.nix

+5 −3
Original line number Diff line number Diff line
@@ -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