diff --git a/pkgs/servers/seafile-server/libevhtp.nix b/pkgs/by-name/se/seafile-server/libevhtp.nix similarity index 80% rename from pkgs/servers/seafile-server/libevhtp.nix rename to pkgs/by-name/se/seafile-server/libevhtp.nix index 97cdc0804faa..8eb1b3e22ff5 100644 --- a/pkgs/servers/seafile-server/libevhtp.nix +++ b/pkgs/by-name/se/seafile-server/libevhtp.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libevent }: +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + libevent, +}: stdenv.mkDerivation rec { pname = "libevhtp"; @@ -24,6 +30,10 @@ stdenv.mkDerivation rec { description = "Create extremely-fast and secure embedded HTTP servers with ease"; homepage = "https://github.com/criticalstack/libevhtp"; license = licenses.bsd3; - maintainers = with maintainers; [ greizgh schmittlauch ]; + maintainers = with maintainers; [ + greizgh + schmittlauch + melvyn2 + ]; }; } diff --git a/pkgs/servers/seafile-server/default.nix b/pkgs/by-name/se/seafile-server/package.nix similarity index 57% rename from pkgs/servers/seafile-server/default.nix rename to pkgs/by-name/se/seafile-server/package.nix index 109484c467b4..f9510c3c5fb6 100644 --- a/pkgs/servers/seafile-server/default.nix +++ b/pkgs/by-name/se/seafile-server/package.nix @@ -1,50 +1,61 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, python3 -, autoreconfHook -, libuuid -, sqlite -, glib -, libevent -, libsearpc -, openssl -, fuse -, libarchive -, libjwt -, curl -, which -, vala -, cmake -, oniguruma -, nixosTests +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + python3, + autoreconfHook, + libuuid, + libmysqlclient, + sqlite, + glib, + libevent, + libsearpc, + openssl, + fuse, + libarchive, + libjwt, + curl, + which, + vala, + cmake, + oniguruma, + nixosTests, }: let # seafile-server relies on a specific version of libevhtp. # It contains non upstreamed patches and is forked off an outdated version. libevhtp = import ./libevhtp.nix { - inherit stdenv lib fetchFromGitHub cmake libevent; + inherit + stdenv + lib + fetchFromGitHub + cmake + libevent + ; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "seafile-server"; - version = "10.0.1"; + version = "11.0.12"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-server"; - rev = "db09baec1b88fc131bf4453a808ab63a3fc714c9"; # using a fixed revision because upstream may re-tag releases :/ - sha256 = "sha256-a5vtJcbnaYzq6/3xmhbWk23BZ+Wil/Tb/q22ML4bDqs="; + rev = "5e6c0974e6abe5d92b8ba1db41c6ddbc1029f2d5"; # using a fixed revision because upstream may re-tag releases :/ + hash = "sha256-BVa4QZiHPkqRB5FvDlCSbEVxdnyxVy2KuCDb2orRMuI="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; buildInputs = [ libuuid + libmysqlclient sqlite - openssl glib libsearpc libevent @@ -52,7 +63,6 @@ stdenv.mkDerivation rec { fuse libarchive libjwt - curl which vala libevhtp @@ -73,6 +83,11 @@ stdenv.mkDerivation rec { homepage = "https://github.com/haiwen/seafile-server"; license = licenses.agpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ greizgh schmittlauch ]; + maintainers = with maintainers; [ + greizgh + schmittlauch + melvyn2 + ]; + mainProgram = "seaf-server"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b79143c50a5f..d639820fd492 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38250,8 +38250,6 @@ with pkgs; sct = callPackage ../tools/X11/sct { }; - seafile-server = callPackage ../servers/seafile-server { }; - seafile-shared = callPackage ../misc/seafile-shared { }; ser2net = callPackage ../servers/ser2net { };