Merge master into closure-size

The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
parent f306e67e15 0ee75214f3
commit 09af15654f
1276 changed files with 78548 additions and 29166 deletions
@@ -4,14 +4,14 @@

 stdenv.mkDerivation rec {
  name = "opensmtpd-${version}";
-  version = "5.7.3p1";
+  version = "5.7.3p2";

  nativeBuildInputs = [ autoconf automake libtool bison ];
  buildInputs = [ libasr libevent zlib openssl db pam ];

  src = fetchurl {
    url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "848a3c72dd22b216bb924b69dc356fc297e8b3671ec30856978950208cba74dd";
+    sha256 = "0d2973008d0f66bebb84bed516be6c32617735241cc54dd26643529281a8e52b";
  };

  patches = [ ./proc_path.diff ];