public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into multiple-outputs

Browse Source
This commit is contained in:
Mathijs Kwik
2013-11-01 08:29:09 +01:00
parent 1a55c4b89f b6519f08da
commit db83d9a35b
1631 changed files with 72442 additions and 10896 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/apache-modules/mod_evasive/default.nix
+1 -2
View File
@@ -23,8 +23,7 @@ stdenv.mkDerivation {
meta = {
homepage = "http://www.zdziarski.com/blog/?page_id=442";
description = "mod_evasive is an evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack.";
description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack";
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/servers/http/lighttpd/default.nix
+9 -3
View File
@@ -1,4 +1,8 @@
{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2, which, file, openssl }:
{ stdenv, fetchurl, pkgconfig, pcre, libxml2, zlib, attr, bzip2, which, file
, openssl, enableMagnet ? false, lua5 ? null
}:
assert enableMagnet -> lua5 != null;
stdenv.mkDerivation {
name = "lighttpd-1.4.32";
@@ -8,9 +12,11 @@ stdenv.mkDerivation {
sha256 = "1hgd9bi4mrak732h57na89lqg58b1kkchnddij9gawffd40ghs0k";
};
buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ];
buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]
++ stdenv.lib.optional enableMagnet lua5;
configureFlags = "--with-openssl --with-openssl-libs=${openssl}";
configureFlags = [ "--with-openssl" ]
++ stdenv.lib.optional enableMagnet "--with-lua";
preConfigure = ''
sed -i "s:/usr/bin/file:${file}/bin/file:g" configure
pkgs/servers/http/nginx/default.nix
+13 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat, fullWebDAV ? false }:
{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat, fullWebDAV ? false, syslog ? false }:
let
dav-ext = fetchgit {
@@ -6,6 +6,12 @@ let
rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d";
sha256 = "1dvpq1fg5rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq";
};
syslog-ext = fetchgit {
url = https://github.com/yaoweibin/nginx_syslog_patch.git;
rev = "165affd9741f0e30c4c8225da5e487d33832aca3";
sha256 = "14dkkafjnbapp6jnvrjg9ip46j00cr8pqc2g7374z9aj7hrvdvhs";
};
in
stdenv.mkDerivation rec {
@@ -13,11 +19,13 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://nginx.org/download/${name}.tar.gz";
sha256 = "06ficmjiya3m8mdlyq3bgqx604h475n77qc5c502kfjijzld39dw";
sha256 = "116yfy0k65mwxdkld0w7c3gly77jdqlvga5hpbsw79i3r62kh4mf";
};
buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat;
patches = if syslog then [ "${syslog-ext}/syslog_1.4.0.patch" ] else [];
configureFlags = [
"--with-http_ssl_module"
"--with-http_xslt_module"
@@ -27,7 +35,8 @@ stdenv.mkDerivation rec {
"--with-http_secure_link_module"
# Install destination problems
# "--with-http_perl_module"
] ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}";
] ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}"
++ stdenv.lib.optional syslog "--add-module=${syslog-ext}";
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2"
@@ -41,6 +50,6 @@ stdenv.mkDerivation rec {
description = "A reverse proxy and lightweight webserver";
maintainers = [ stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.all;
version = "1.4.1";
version = "1.4.3";
};
}