public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
sogo: 4.3.2 -> 5.0.0
This commit is contained in:
Lassulus 2020-08-26 00:04:36 +02:00 committed by GitHub
commit e357d0ec8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/web-apps/sogo.nix
View File

@ -77,7 +77,6 @@ in {
// Paths // Paths
WOSendMail = "/run/wrappers/bin/sendmail"; WOSendMail = "/run/wrappers/bin/sendmail";
SOGoMailSpoolPath = "/var/lib/sogo/spool"; SOGoMailSpoolPath = "/var/lib/sogo/spool";
SOGoZipPath = "${pkgs.zip}/bin/zip";
// Enable CSRF protection // Enable CSRF protection
SOGoXSRFValidationEnabled = YES; SOGoXSRFValidationEnabled = YES;
// Remove dates from log (jornald does that) // Remove dates from log (jornald does that)

4
pkgs/development/libraries/sope/default.nix
View File

@ -1,13 +1,13 @@
{ gnustep, lib, fetchFromGitHub , libxml2, openssl_1_1 { gnustep, lib, fetchFromGitHub , libxml2, openssl_1_1
, openldap, mysql, libmysqlclient, postgresql }: with lib; gnustep.stdenv.mkDerivation rec { , openldap, mysql, libmysqlclient, postgresql }: with lib; gnustep.stdenv.mkDerivation rec {
pname = "sope"; pname = "sope";
version = "4.3.2"; version = "5.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "inverse-inc"; owner = "inverse-inc";
repo = pname; repo = pname;
rev = "SOPE-${version}"; rev = "SOPE-${version}";
sha256 = "0ny1ihx38gd25w8f3dfybyswvyjfljvb2fhfmkajgg6hhjrkfar2"; sha256 = "sha256-7NM9wcyHDSVmjjqu489Ff3iJgl9VM+UBF3XYWoiHHTg=";
}; };
nativeBuildInputs = [ gnustep.make ]; nativeBuildInputs = [ gnustep.make ];

13
pkgs/servers/web-apps/sogo/default.nix
View File

@ -1,24 +1,25 @@
{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python2, lndir { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python2, lndir
, openssl_1_1, openldap, sope, libmemcached, curl }: with lib; gnustep.stdenv.mkDerivation rec { , openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkgconfig }:
with lib; gnustep.stdenv.mkDerivation rec {
pname = "SOGo"; pname = "SOGo";
version = "4.3.2"; version = "5.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "inverse-inc"; owner = "inverse-inc";
repo = pname; repo = pname;
rev = "SOGo-${version}"; rev = "SOGo-${version}";
sha256 = "1xxad23a8zy6w850x5nrrf54db0x73lc9drmc5kpfk870fk2lmr0"; sha256 = "sha256-SEyyHekUCSkb5rOh7Ty8AhtT4S9KicTRbo9iWhijdGE=";
}; };
nativeBuildInputs = [ gnustep.make makeWrapper python2 ]; nativeBuildInputs = [ gnustep.make makeWrapper python2 ];
buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) ] buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkgconfig ]
++ optional (openldap != null) openldap; ++ optional (openldap != null) openldap;
patches = [ patches = [
# TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches
(fetchpatch { (fetchpatch {
url = "https://sources.debian.org/data/main/s/sogo/4.3.0-1/debian/patches/0005-Remove-build-date.patch"; url = "https://salsa.debian.org/debian/sogo/-/raw/120ac6390602c811908c7fcb212a79acbc7f7f28/debian/patches/0005-Remove-build-date.patch";
sha256 = "0lrh3bkfj3r0brahfkyb0g7zx7r2jjd5cxzjl43nqla0fs09wsh8"; sha256 = "151i8504kwdlcirgd0pbif7cxnb1q6jsp5j7dbh9p6zw2xgwkp25";
}) })
]; ];