BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #134829 from helsinki-systems/upd/sogo

Browse source
This commit is contained in:
Sandro 2021-08-20 16:06:05 +02:00 committed by GitHub
commit a3ff5a84d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/sope/default.nix
View file

@ -1,21 +1,21 @@
{ gnustep, lib, fetchFromGitHub , libxml2, openssl_1_1
{ gnustep, lib, fetchFromGitHub , libxml2, openssl
, openldap, mariadb, libmysqlclient, postgresql }:
with lib;
gnustep.stdenv.mkDerivation rec {
pname = "sope";
version = "5.1.1";
version = "5.2.0";
src = fetchFromGitHub {
owner = "inverse-inc";
repo = pname;
rev = "SOPE-${version}";
sha256 = "0pap7c38kgadyp1a6qkmf9xhk69ybpmhfd4kc2n5nafhdbvks985";
sha256 = "14s9rcnglkwl0nmbmpdxxbiqqnr3m8n7x69idm1crgbbjkj4gi68";
};
hardeningDisable = [ "format" ];
nativeBuildInputs = [ gnustep.make ];
buildInputs = flatten ([ gnustep.base libxml2 openssl_1_1 ]
buildInputs = flatten ([ gnustep.base libxml2 openssl ]
++ optional (openldap != null) openldap
++ optionals (mariadb != null) [ libmysqlclient mariadb ]
++ optional (postgresql != null) postgresql);

14
pkgs/servers/web-apps/sogo/default.nix
View file

@ -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/";