summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2021-08-19 17:22:47 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-08-20 14:10:16 +0000
commitbb74e9be2f60bad574e65bbe3d063c4797763964 (patch)
tree877aa2b30c8db38d15cf6a0b3fd56bae9968c905
parentsope: 5.1.1 -> 5.2.0 (diff)
downloadnixpkgs-origin/backport-134829-to-release-21.05.tar.gz
https://github.com/inverse-inc/sogo/releases/tag/SOGo-5.2.0 (cherry picked from commit 5fdc39a49dbc39f044bfe2d86e3cfe697e5e60e3)
-rw-r--r--pkgs/servers/web-apps/sogo/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix
index 20fc0f6f0c0c..fc7af3bcf2dc 100644
--- a/pkgs/servers/web-apps/sogo/default.nix
+++ b/pkgs/servers/web-apps/sogo/default.nix
@@ -1,19 +1,19 @@
{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
-, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config, nixosTests }:
-with lib; gnustep.stdenv.mkDerivation rec {
+, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests }:
+gnustep.stdenv.mkDerivation rec {
pname = "SOGo";
- version = "5.1.1";
+ version = "5.2.0";
src = fetchFromGitHub {
owner = "inverse-inc";
repo = pname;
rev = "SOGo-${version}";
- sha256 = "19qkznk20fi47zxvg24hqnim5bpjlawk76w04jgd93yqakidl8ax";
+ sha256 = "0y9im5y6ffdc7sy2qphq0xai4ig1ks7vj10vy4mn1psdlc5kd516";
};
nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
- buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkg-config ]
- ++ optional (openldap != null) openldap;
+ buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config ]
+ ++ lib.optional (openldap != null) openldap;
patches = [
# TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches
@@ -68,7 +68,7 @@ with lib; gnustep.stdenv.mkDerivation rec {
passthru.tests.sogo = nixosTests.sogo;
- meta = {
+ meta = with lib; {
description = "A very fast and scalable modern collaboration suite (groupware)";
license = with licenses; [ gpl2Only lgpl21Only ];
homepage = "https://sogo.nu/";