Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-07-21 00:56:43 +00:00
parent cc540843fe db7b4fb073
commit 1f04b4a566
226 changed files with 6549 additions and 1215 deletions
@@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null;
 assert enableMysql -> mysql != null;

 stdenv.mkDerivation rec {
-  name = "lighttpd-1.4.39";
+  name = "lighttpd-1.4.40";

  src = fetchurl {
    url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "0nrnhxl1ypzgsms0ky6zdf6ib94vf8x77c422s2xav9x7j2s3fby";
+    sha256 = "13agkmxii11kyary7pmv8kw4w1rp15swx800d98nqkb0yzy0sic0";
  };

  buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]