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

Lassulus a115cf16 6d626b5e

Changed files
+31 -11
pkgs
servers
+10 -11
pkgs/servers/web-apps/sogo/default.nix
···
{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests
-
, oath-toolkit }:
gnustep.stdenv.mkDerivation rec {
pname = "SOGo";
-
version = "5.5.0";
src = fetchFromGitHub {
owner = "inverse-inc";
repo = pname;
rev = "SOGo-${version}";
-
sha256 = "1kyfn3qw299qsyivbrm487h68va99rrb3gmhpgjpwqd2xdg9aypk";
};
nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
-
buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ];
-
patches = [
-
# TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches
-
(fetchpatch {
-
url = "https://salsa.debian.org/debian/sogo/-/raw/120ac6390602c811908c7fcb212a79acbc7f7f28/debian/patches/0005-Remove-build-date.patch";
-
sha256 = "151i8504kwdlcirgd0pbif7cxnb1q6jsp5j7dbh9p6zw2xgwkp25";
-
})
-
];
postPatch = ''
# Exclude NIX_ variables
···
for bin in $out/bin/*; do
wrapProgram $bin --prefix LD_LIBRARY_PATH : $out/lib/sogo --prefix GNUSTEP_CONFIG_FILE : $out/share/GNUstep/GNUstep.conf
done
'';
passthru.tests.sogo = nixosTests.sogo;
···
{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests
+
, oath-toolkit
+
, enableActiveSync ? false
+
, libwbxml }:
gnustep.stdenv.mkDerivation rec {
pname = "SOGo";
+
version = "5.7.0";
src = fetchFromGitHub {
owner = "inverse-inc";
repo = pname;
rev = "SOGo-${version}";
+
hash = "sha256-3Xy0y1sdixy4gXhzhP9mfWeaDmOVJty+X95xCyxayPE=";
};
nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
+
buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ]
+
++ lib.optional enableActiveSync libwbxml;
+
patches = lib.optional enableActiveSync ./enable-activesync.patch;
postPatch = ''
# Exclude NIX_ variables
···
for bin in $out/bin/*; do
wrapProgram $bin --prefix LD_LIBRARY_PATH : $out/lib/sogo --prefix GNUSTEP_CONFIG_FILE : $out/share/GNUstep/GNUstep.conf
done
+
+
rmdir $out/nix
'';
passthru.tests.sogo = nixosTests.sogo;
+21
pkgs/servers/web-apps/sogo/enable-activesync.patch
···
···
+
--- a/ActiveSync/NSData+ActiveSync.m
+
+++ b/ActiveSync/NSData+ActiveSync.m
+
@@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
#import <NGExtensions/NGBase64Coding.h>
+
#import <NGExtensions/NSObject+Logs.h>
+
+
-#include <wbxml/wbxml.h>
+
+#include <libwbxml-1.0/wbxml/wbxml.h>
+
+
#define WBXMLDEBUG 0
+
+
--- a/GNUmakefile
+
+++ b/GNUmakefile
+
@@ -11,6 +11,7 @@ SUBPROJECTS = \
+
UI \
+
Tools \
+
Tests/Unit \
+
+ ActiveSync \
+
+
+
include $(GNUSTEP_MAKEFILES)/aggregate.make