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

Merge pull request #15195 from nckx/update-nginx

Browse Source 
Update nginx to 1.10.0
This commit is contained in:
zimbatm 2016-05-05 19:50:16 +01:00
commit 53d651d0f8
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/servers/http/nginx/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
, gd, geoip , gd, geoip
, withStream ? false
, modules ? [] , modules ? []
, hardening ? true , hardening ? true
}: }:
@ -7,10 +8,10 @@
with stdenv.lib; with stdenv.lib;
let let
version = "1.8.1"; version = "1.10.0";
mainSrc = fetchurl { mainSrc = fetchurl {
url = "http://nginx.org/download/nginx-${version}.tar.gz"; url = "http://nginx.org/download/nginx-${version}.tar.gz";
sha256 = "1dwpyw4pvhj68vxramqxm8f79pqz9lrm8mvifbn49h3615ikqjwg"; sha256 = "0kdyqa5xaxvhz6y75ixs05mzygk3kszzdq5h0gnlrg35vp1lgmlf";
}; };
in in
@ -24,11 +25,8 @@ stdenv.mkDerivation rec {
++ concatMap (mod: mod.inputs or []) modules; ++ concatMap (mod: mod.inputs or []) modules;
configureFlags = [ configureFlags = [
"--with-select_module"
"--with-poll_module"
"--with-threads"
"--with-http_ssl_module" "--with-http_ssl_module"
"--with-http_spdy_module" "--with-http_v2_module"
"--with-http_realip_module" "--with-http_realip_module"
"--with-http_addition_module" "--with-http_addition_module"
"--with-http_xslt_module" "--with-http_xslt_module"
@ -48,11 +46,11 @@ stdenv.mkDerivation rec {
"--with-ipv6" "--with-ipv6"
# Install destination problems # Install destination problems
# "--with-http_perl_module" # "--with-http_perl_module"
] ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd)) ] ++ optional withStream "--with-stream"
[ "--with-file-aio" "--with-aio_module" ] ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
++ map (mod: "--add-module=${mod.src}") modules; ++ map (mod: "--add-module=${mod.src}") modules;
NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized"; NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules) preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules)
+ optionalString (hardening && (stdenv.cc.cc.isGNU or false)) '' + optionalString (hardening && (stdenv.cc.cc.isGNU or false)) ''
@ -63,6 +61,10 @@ stdenv.mkDerivation rec {
'' ''
; ;
postInstall = ''
mv $out/sbin $out/bin
'';
meta = { meta = {
description = "A reverse proxy and lightweight webserver"; description = "A reverse proxy and lightweight webserver";
homepage = http://nginx.org; homepage = http://nginx.org;