update nginx to 1.1.7
svn path=/nixpkgs/trunk/; revision=30144
This commit is contained in:
parent
bd5e996e20
commit
edbae5f6c3
@ -1,15 +1,12 @@
|
|||||||
a :
|
{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt }:
|
||||||
let
|
stdenv.mkDerivation rec {
|
||||||
s = import ./src-for-default.nix;
|
name = "nginx-1.1.7";
|
||||||
buildInputs = with a; [
|
src = fetchurl {
|
||||||
openssl zlib pcre libxml2 libxslt
|
url = "http://nginx.org/download/${name}.tar.gz";
|
||||||
];
|
sha256 = "1y0bzmrgnyqw8ghc508nipy5k46byrxc2sycqp35fdx0jmjz3h51";
|
||||||
in
|
};
|
||||||
rec {
|
buildInputs = [ openssl zlib pcre libxml2 libxslt ];
|
||||||
src = a.fetchUrlFromSrcInfo s;
|
|
||||||
|
|
||||||
inherit (s) name;
|
|
||||||
inherit buildInputs;
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-http_ssl_module"
|
"--with-http_ssl_module"
|
||||||
"--with-http_xslt_module"
|
"--with-http_xslt_module"
|
||||||
@ -21,18 +18,16 @@ rec {
|
|||||||
# "--with-http_perl_module"
|
# "--with-http_perl_module"
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = a.fullDepEntry ''
|
preConfigure = ''
|
||||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libxml2}/include/libxml2"
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2"
|
||||||
'' [];
|
'';
|
||||||
|
|
||||||
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "nginx - 'engine x' - reverse proxy and lightweight webserver";
|
description = "nginx - 'engine x' - reverse proxy and lightweight webserver";
|
||||||
maintainers = [
|
maintainers = [
|
||||||
a.lib.maintainers.raskin
|
stdenv.lib.maintainers.raskin
|
||||||
];
|
];
|
||||||
platforms = with a.lib.platforms;
|
platforms = with stdenv.lib.platforms;
|
||||||
all;
|
all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
rec {
|
|
||||||
version="1.0.0";
|
|
||||||
name="nginx-1.0.0";
|
|
||||||
hash="00f0fjkdqi0xl1kcg6d91zmvj82n8w1znp5w9v152rymxv5ddqrx";
|
|
||||||
url="http://sysoev.ru/nginx/nginx-${version}.tar.gz";
|
|
||||||
advertisedUrl="http://sysoev.ru/nginx/nginx-1.0.0.tar.gz";
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
@ -1,4 +0,0 @@
|
|||||||
{
|
|
||||||
downloadPage = "http://sysoev.ru/nginx/download.html";
|
|
||||||
baseName = "nginx";
|
|
||||||
}
|
|
@ -4929,9 +4929,7 @@ let
|
|||||||
|
|
||||||
myserver = callPackage ../servers/http/myserver { };
|
myserver = callPackage ../servers/http/myserver { };
|
||||||
|
|
||||||
nginx = builderDefsPackage (import ../servers/http/nginx) {
|
nginx = callPackage ../servers/http/nginx { };
|
||||||
inherit openssl pcre zlib libxml2 libxslt;
|
|
||||||
};
|
|
||||||
|
|
||||||
postfix = callPackage ../servers/mail/postfix { };
|
postfix = callPackage ../servers/mail/postfix { };
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user