Merge branch 'master' into closure-size

5 files changed, 24 insertions, 14 deletions

diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/servers/http/webfs/default.nix
index b306c73f4a50..3fb3890f9c4e 100644
--- a/pkgs/servers/http/webfs/default.nix
+++ b/pkgs/servers/http/webfs/default.nix
@@ -1,4 +1,11 @@
-{ stdenv, fetchurl, openssl, shared_mime_info }:
+{ stdenv, fetchurl, openssl }:
+let
+  # Let's not pull the whole apache httpd package
+  mime_file = fetchurl {
+    url = https://raw.githubusercontent.com/apache/httpd/906e419c1f703360e2e8ec077b393347f993884f/docs/conf/mime.types;
+    sha256 = "ef972fc545cbff4c0daa2b2e6b440859693b3c10435ee90f10fa6fffad800c16";
+  };
+in
 stdenv.mkDerivation rec {
   name = "webfs-${version}";
   version = "1.21";
@@ -13,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl ];
 
   makeFlags = [
-    "mimefile=${shared_mime_info}/share/mime/globs"
+    "mimefile=${mime_file}"
     "prefix=$(out)"
   ];
 
diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix
index be671b7f0e7b..2d38f3f5cef3 100644
--- a/pkgs/servers/mail/dovecot/2.2.x.nix
+++ b/pkgs/servers/mail/dovecot/2.2.x.nix
@@ -2,14 +2,14 @@
 , inotify-tools, clucene_core_2, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.2.16";
+  name = "dovecot-2.2.19";
 
-  buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2 sqlite]
+  buildInputs = [ perl openssl bzip2 zlib openldap clucene_core_2 sqlite ]
     ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotify-tools ];
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
-    sha256 = "1w6gg4h9mxg3i8faqpmgj19imzyy001b0v8ihch8ma3zl63i5kjn";
+    sha256 = "17sf5aancad4pg1vx1606k99389wg76blpqzmnmxlz4hklzix7km";
   };
 
   preConfigure = ''
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 34de9c3674ba..03367c7b50d9 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   name = "opensmtpd-${version}";
-  version = "5.7.1p1";
+  version = "5.7.3p1";
 
   nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ libasr libevent zlib openssl db pam ];
 
   src = fetchurl {
     url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "67e9dd9682ca8c181e84e66c76245a4a8f6205834f915a2c021cdfeb22049e3a";
+    sha256 = "848a3c72dd22b216bb924b69dc356fc297e8b3671ec30856978950208cba74dd";
   };
 
   patches = [ ./proc_path.diff ];
diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix
index ea5214c7bb44..150bf196b0dd 100644
--- a/pkgs/servers/p910nd/default.nix
+++ b/pkgs/servers/p910nd/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
     sed -e "s|/usr||g" -i Makefile
   '';
 
-  makeFlags = "DESTDIR=$(out) BINDIR=/bin";
+  makeFlags = [ "DESTDIR=$(out)" "BINDIR=/bin" ];
 
   postInstall = ''
     # Match the man page:
diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix
index 1e476cb2301a..447d63c731dc 100644
--- a/pkgs/servers/prayer/default.nix
+++ b/pkgs/servers/prayer/default.nix
@@ -6,17 +6,12 @@ let
 in
 stdenv.mkDerivation rec {
   name = "prayer-1.3.5";
-  
+
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${name}.tar.gz";
     sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda";
   };
 
-  buildInputs = [ openssl db zlib uwimap html-tidy pam ];
-  nativeBuildInputs = [ perl ];
-
-  NIX_LDFLAGS = "-lpam";
-
   patches = [ ./install.patch ];
   postPatch = ''
     sed -i -e s/gmake/make/ -e 's/LDAP_ENABLE.*= true/LDAP_ENABLE=false/' \
@@ -26,8 +21,16 @@ stdenv.mkDerivation rec {
       Config
     sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \
       templates/src/*.pl
+  '' + /* html-tidy updates */ ''
+    substituteInPlace ./session/html_secure_tidy.c \
+      --replace buffio.h tidybuffio.h
   '';
 
+  buildInputs = [ openssl db zlib uwimap html-tidy pam ];
+  nativeBuildInputs = [ perl ];
+
+  NIX_LDFLAGS = "-lpam";
+
   meta = {
     homepage = http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/;
     description = "Yet another Webmail interface for IMAP servers on Unix systems written in C";