Merge branch 'staging'

Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
parent 60a890e35b dc13593b9f
commit e4832c7541
234 changed files with 444 additions and 533 deletions
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    "--sysconfdir=/etc"
    "--localstatedir=/var"
    "--with-privsep-user=smtpd"
-    "--with-libevent-dir=${libevent}"
+    "--with-libevent-dir=${libevent.dev}"

    "--with-filter-clamav"
    "--with-filter-dkim-signer"