Merge branch 'lighttpd' of git://github.com/bjornfor/nixpkgs into upstream-master

Still builds, trivial update, contains a security fix.

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-04-01 13:06:03 -04:00
commit 63291bcc9f

View File

@ -1,14 +1,18 @@
{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2 }:
{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2, which, file }:
stdenv.mkDerivation {
name = "lighttpd-1.4.30";
name = "lighttpd-1.4.32";
src = fetchurl {
url = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.30.tar.xz;
sha256 = "c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b";
url = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.32.tar.xz;
sha256 = "1hgd9bi4mrak732h57na89lqg58b1kkchnddij9gawffd40ghs0k";
};
buildInputs = [ pcre libxml2 zlib attr bzip2 ];
buildInputs = [ pcre libxml2 zlib attr bzip2 which file ];
preConfigure = ''
sed -i "s:/usr/bin/file:${file}/bin/file:g" configure
'';
meta = {
description = "Lightweight high-performance web server";