summary refs log tree commit diff
path: root/pkgs/servers/mail
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-10-17 08:36:28 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-10-17 08:36:28 +0200
commit89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e (patch)
treea6d9edb3c73ada52a6207e8a5ad2d32cad77600c /pkgs/servers/mail
parent7b2ed00ef62476080fe439ce91219376ab8c8a2e (diff)
parent18fcc337affa09238a42e9a0ca21e08363c65eeb (diff)
downloadnixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar
nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.gz
nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.bz2
nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.lz
nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.xz
nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.zst
nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/mail')
-rw-r--r--pkgs/servers/mail/mailman/default.nix4
-rw-r--r--pkgs/servers/mail/postfix/default.nix2
-rw-r--r--pkgs/servers/mail/rspamd/default.nix4
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index a38c0b277dae..87e0d219c9c6 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mailman-${version}";
-  version = "2.1.24";
+  version = "2.1.29";
 
   src = fetchurl {
     url = "mirror://gnu/mailman/${name}.tgz";
-    sha256 = "1r6sjapjmbav45xibjzc2a8y1xf4ikz09470ma1kw7iz174wn8z7";
+    sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243";
   };
 
   buildInputs = [ python2 python2.pkgs.dnspython ];
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index d88b9f8b0dbc..796d5696ebfa 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -1,9 +1,9 @@
 { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl
 , coreutils, findutils, gnugrep, gawk, icu, pcre
+, withLDAP ? true, openldap
 , withPgSQL ? false, postgresql
 , withMySQL ? false, mysql
 , withSQLite ? false, sqlite
-, withLDAP ? false, openldap
 }:
 
 let
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index c8da0ea630e1..02e14f3b5aca 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -6,13 +6,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "rspamd-${version}";
-  version = "1.7.9";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rspamd";
     rev = version;
-    sha256 = "1qfkmcrcswh7k7bvr1ki1n83lnjmfd9h0281qgia0dlam7y81bcy";
+    sha256 = "02q1id9kv5d6w1b1ifa2m6qrnbsja787dn0ywwi0yrsaqwk63wk7";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];