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

Merge staging into closure-size

Browse Source 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
This commit is contained in:
Vladimír Čunát
2015-11-20 14:32:58 +01:00
parent bdbbfa0d42 b809f886c0
commit 333d69a5f0
1278 changed files with 105731 additions and 30012 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/apache-httpd/2.4.nix
+5 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, zlib, apr, aprutil, pcre
{ stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv
, proxySupport ? true
, sslSupport ? true, openssl
, ldapSupport ? true, openldap
@@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
stdenv.mkDerivation rec {
version = "2.4.16";
version = "2.4.17";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha256 = "0hrpy6gjwma0kba7p7m61vwh82qcnkf08123lrwpg257m93hnrmc";
sha256 = "165p5qgwyk1dwjypgcx5vb47xadiszs3dw28n2axplw1xifh67ik";
};
# FIXME: -dev depends on -doc
@@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
buildInputs = [perl] ++
optional sslSupport openssl ++
optional ldapSupport openldap ++ # there is no --with-ldap flag
optional libxml2Support libxml2;
optional libxml2Support libxml2 ++
optional stdenv.isDarwin libiconv;
patchPhase = ''
sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
pkgs/servers/http/gatling/default.nix
+32
View File
@@ -0,0 +1,32 @@
{ stdenv, fetchurl, libowfat, zlib, openssl, polarssl }:
let
version = "0.13";
in
stdenv.mkDerivation rec {
name = "gatling-${version}";
src = fetchurl {
url = "http://dl.fefe.de/${name}.tar.bz2";
sha256 = "0icjx20ws8gqxgpm77dx7p9zcwi1fv162in6igx04rmnyzyla8dl";
};
buildInputs = [ libowfat zlib openssl polarssl ];
configurePhase = ''
substituteInPlace Makefile --replace "/usr/local" "$out"
substituteInPlace GNUmakefile --replace "/opt/diet" "$out"
'';
buildPhase = ''
make gatling
'';
meta = with stdenv.lib; {
description = "A high performance web server";
homepage = http://www.fefe.de/gatling/;
license = stdenv.lib.licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.the-kenny ];
};
}
pkgs/servers/http/mini-httpd/default.nix
+2 -6
View File
@@ -1,21 +1,17 @@
{ stdenv, fetchurl, boost }:
stdenv.mkDerivation rec {
name = "mini-httpd-1.4";
name = "mini-httpd-1.5";
src = fetchurl {
url = "mirror://savannah/mini-httpd/${name}.tar.gz";
sha256 = "1i46klkx2ca1cgmlilajkx8gf7b7d7c2sj58llxfllh184pb6cpd";
sha256 = "1x4b6x40ymbaamqqq9p97lc0mnah4q7bza04fjs35c8agpm19zir";
};
buildInputs = [ boost ];
enableParallelBuilding = true;
# Fixes compat with boost 1.59
# Please attempt removing when updating
CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
meta = {
homepage = "http://mini-httpd.nongnu.org/";
description = "a minimalistic high-performance web server";
pkgs/servers/http/nginx/default.nix
+8 -105
View File
@@ -1,16 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
, gd, geoip, luajit
, curl, apr, aprutil, apacheHttpd, yajl, libcap, modsecurity_standalone
, rtmp ? false
, fullWebDAV ? false
, syslog ? false
, moreheaders ? false
, echo ? false
, modsecurity ? false
, ngx_lua ? modsecurity || false
, set_misc ? false
, fluent ? false
, extraModules ? []
, gd, geoip
, modules ? []
}:
with stdenv.lib;
@@ -22,72 +12,6 @@ let
sha256 = "1mgkkmmwkhmpn68sdvbd73ssv6lpqhh864fsyvc1ij4hk4is3k13";
};
rtmp-ext = fetchFromGitHub {
owner = "arut";
repo = "nginx-rtmp-module";
rev = "v1.1.7";
sha256 = "0i0fa1znkj7cipy5nlkw4k40klhp9jzk28wxy2vrvd2jvh91x3ma";
};
dav-ext = fetchFromGitHub {
owner = "arut";
repo = "nginx-dav-ext-module";
rev = "v0.0.3";
sha256 = "1qck8jclxddncjad8yv911s9z7lrd58bp96jf13m0iqk54xghx91";
};
syslog-ext = fetchFromGitHub {
owner = "yaoweibin";
repo = "nginx_syslog_patch";
rev = "3ca5ba65541637f74467038aa032e2586321d0cb";
sha256 = "0y8dxkx8m1jw4v5zsvw1gfah9vh3ryq0hfmrcbjzcmwp5b5lb1i8";
};
moreheaders-ext = fetchFromGitHub {
owner = "openresty";
repo = "headers-more-nginx-module";
rev = "v0.26";
sha256 = "01wkqhk8mk8jgmzi7jbzmg5kamffx3lmhj5yfwryvnvs6xqs74wn";
};
modsecurity-ext = modsecurity_standalone.nginx;
echo-ext = fetchFromGitHub {
owner = "openresty";
repo = "echo-nginx-module";
rev = "v0.57";
sha256 = "1q0f0zprcn0ypl2qh964cq186l3f40p0z7n7x22m8cxj367vf000";
};
lua-ext = fetchFromGitHub {
owner = "openresty";
repo = "lua-nginx-module";
rev = "v0.9.16";
sha256 = "0dvdam228jhsrayb22ishljdkgib08bakh8ygn84sq0c2xbidzlp";
};
set-misc-ext = fetchFromGitHub {
owner = "openresty";
repo = "set-misc-nginx-module";
rev = "v0.28";
sha256 = "1vixj60q0liri7k5ax85grj7q9vvgybkx421bwphbhai5xrjip96";
};
fluentd = fetchFromGitHub {
owner = "fluent";
repo = "nginx-fluentd-module";
rev = "8af234043059c857be27879bc547c141eafd5c13";
sha256 = "1ycb5zd9sw60ra53jpak1m73zwrjikwhrrh9q6266h1mlyns7zxm";
};
develkit-ext = fetchFromGitHub {
owner = "simpl";
repo = "ngx_devel_kit";
rev = "v0.2.19";
sha256 = "1cqcasp4lc6yq5pihfcdw4vp4wicngvdc3nqg3bg52r63c1qrz76";
};
in
stdenv.mkDerivation rec {
@@ -95,15 +19,8 @@ stdenv.mkDerivation rec {
src = mainSrc;
buildInputs =
[ openssl zlib pcre libxml2 libxslt gd geoip
] ++ optional fullWebDAV expat
++ optional ngx_lua luajit
++ optionals modsecurity [ curl apr aprutil apacheHttpd yajl ];
LUAJIT_LIB = if ngx_lua then "${luajit}/lib" else "";
LUAJIT_INC = if ngx_lua then "${luajit}/include/luajit-2.0" else "";
patches = if syslog then [ "${syslog-ext}/syslog-1.5.6.patch" ] else [];
[ openssl zlib pcre libxml2 libxslt gd geoip ]
++ concatMap (mod: mod.inputs or []) modules;
configureFlags = [
"--with-select_module"
@@ -130,27 +47,13 @@ stdenv.mkDerivation rec {
"--with-ipv6"
# Install destination problems
# "--with-http_perl_module"
] ++ optional rtmp "--add-module=${rtmp-ext}"
++ optional fullWebDAV "--add-module=${dav-ext}"
++ optional syslog "--add-module=${syslog-ext}"
++ optional moreheaders "--add-module=${moreheaders-ext}"
++ optional echo "--add-module=${echo-ext}"
++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}"
++ optional set_misc "--add-module=${set-misc-ext}"
++ optionals (elem stdenv.system (with platforms; linux ++ freebsd))
] ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd))
[ "--with-file-aio" "--with-aio_module" ]
++ optional fluent "--add-module=${fluentd}"
++ optional modsecurity "--add-module=${modsecurity-ext}/nginx/modsecurity"
++ (map (m: "--add-module=${m}") extraModules);
++ 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";
additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";
NIX_CFLAGS_COMPILE = optionalString modsecurity "-I${aprutil}/include/apr-1 -I${apacheHttpd}/include -I${apr}/include/apr-1 -I${yajl}/include";
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2 $additionalFlags"
'';
preConfigure = concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
meta = {
description = "A reverse proxy and lightweight webserver";
pkgs/servers/http/nginx/modules.nix
+111
View File
@@ -0,0 +1,111 @@
{ fetchFromGitHub, pkgs }:
{
rtmp = {
src = fetchFromGitHub {
owner = "arut";
repo = "nginx-rtmp-module";
rev = "v1.1.7";
sha256 = "0i0fa1znkj7cipy5nlkw4k40klhp9jzk28wxy2vrvd2jvh91x3ma";
};
};
dav = {
src = fetchFromGitHub {
owner = "arut";
repo = "nginx-dav-ext-module";
rev = "v0.0.3";
sha256 = "1qck8jclxddncjad8yv911s9z7lrd58bp96jf13m0iqk54xghx91";
};
inputs = [ pkgs.expat ];
};
syslog = rec {
src = fetchFromGitHub {
owner = "yaoweibin";
repo = "nginx_syslog_patch";
rev = "3ca5ba65541637f74467038aa032e2586321d0cb";
sha256 = "0y8dxkx8m1jw4v5zsvw1gfah9vh3ryq0hfmrcbjzcmwp5b5lb1i8";
};
preConfigure = ''
patch -p1 < "${src}/syslog-1.7.0.patch"
'';
};
moreheaders = {
src = fetchFromGitHub {
owner = "openresty";
repo = "headers-more-nginx-module";
rev = "v0.26";
sha256 = "01wkqhk8mk8jgmzi7jbzmg5kamffx3lmhj5yfwryvnvs6xqs74wn";
};
};
modsecurity = {
src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity";
inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil}/include/apr-1 -I${pkgs.apacheHttpd}/include -I${pkgs.apr}/include/apr-1 -I${pkgs.yajl}/include"
'';
};
echo = {
src = fetchFromGitHub {
owner = "openresty";
repo = "echo-nginx-module";
rev = "v0.57";
sha256 = "1q0f0zprcn0ypl2qh964cq186l3f40p0z7n7x22m8cxj367vf000";
};
};
develkit = {
src = fetchFromGitHub {
owner = "simpl";
repo = "ngx_devel_kit";
rev = "v0.2.19";
sha256 = "1cqcasp4lc6yq5pihfcdw4vp4wicngvdc3nqg3bg52r63c1qrz76";
};
};
lua = {
src = fetchFromGitHub {
owner = "openresty";
repo = "lua-nginx-module";
rev = "v0.9.16";
sha256 = "0dvdam228jhsrayb22ishljdkgib08bakh8ygn84sq0c2xbidzlp";
};
inputs = [ pkgs.luajit ];
preConfigure = ''
export LUAJIT_LIB="${pkgs.luajit}/lib"
export LUAJIT_INC="${pkgs.luajit}/include/luajit-2.0"
'';
};
set-misc = {
src = fetchFromGitHub {
owner = "openresty";
repo = "set-misc-nginx-module";
rev = "v0.28";
sha256 = "1vixj60q0liri7k5ax85grj7q9vvgybkx421bwphbhai5xrjip96";
};
};
fluentd = {
src = fetchFromGitHub {
owner = "fluent";
repo = "nginx-fluentd-module";
rev = "8af234043059c857be27879bc547c141eafd5c13";
sha256 = "1ycb5zd9sw60ra53jpak1m73zwrjikwhrrh9q6266h1mlyns7zxm";
};
};
pam = {
src = fetchFromGitHub {
owner = "stogh";
repo = "ngx_http_auth_pam_module";
rev = "v1.4";
sha256 = "068zwyrc1dji55rlaj2kx6n0v2n5rpj7nz26ipvz26ida712md35";
};
inputs = [ pkgs.pam ];
};
}
pkgs/servers/http/nginx/unstable.nix
+11 -78
View File
@@ -1,12 +1,8 @@
{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
, gd, geoip, luajit
, rtmp ? false
, fullWebDAV ? false
, syslog ? false
, moreheaders ? false
, echo ? false
, ngx_lua ? false
, withStream ? false }:
, gd, geoip
, withStream ? false
, modules ? []
}:
with stdenv.lib;
@@ -17,55 +13,6 @@ let
sha256 = "1a1bixw2a4s5c3qzw3583s4a4y6i0sdzhihhlbab5rkyfh1hr6s7";
};
rtmp-ext = fetchFromGitHub {
owner = "arut";
repo = "nginx-rtmp-module";
rev = "v1.1.5";
sha256 = "1d9ws4prxz22yq3nhh5h18jrs331zivrdh784l6wznc1chg3gphn";
};
dav-ext = fetchFromGitHub {
owner = "arut";
repo = "nginx-dav-ext-module";
rev = "v0.0.3";
sha256 = "1qck8jclxddncjad8yv911s9z7lrd58bp96jf13m0iqk54xghx91";
};
syslog-ext = fetchFromGitHub {
owner = "yaoweibin";
repo = "nginx_syslog_patch";
rev = "v0.25";
sha256 = "0734f884838wcjyrrddn8wzj834wid1zffrk093jrx18447cryxl";
};
moreheaders-ext = fetchFromGitHub {
owner = "openresty";
repo = "headers-more-nginx-module";
rev = "v0.25";
sha256 = "1d71y1i0smi4gkzz731fhn58gr03b3s6jz6ipnfzxxaizmgxm3rb";
};
echo-ext = fetchFromGitHub {
owner = "openresty";
repo = "echo-nginx-module";
rev = "v0.56";
sha256 = "03vaf1ffhkj2s089f90h45n079h3zw47h6y5zpk752f4ydiagpgd";
};
develkit-ext = fetchFromGitHub {
owner = "simpl";
repo = "ngx_devel_kit";
rev = "v0.2.19";
sha256 = "1cqcasp4lc6yq5pihfcdw4vp4wicngvdc3nqg3bg52r63c1qrz76";
};
lua-ext = fetchFromGitHub {
owner = "openresty";
repo = "lua-nginx-module";
rev = "v0.9.16";
sha256 = "0dvdam228jhsrayb22ishljdkgib08bakh8ygn84sq0c2xbidzlp";
};
in
stdenv.mkDerivation rec {
@@ -73,14 +20,8 @@ stdenv.mkDerivation rec {
src = mainSrc;
buildInputs =
[ openssl zlib pcre libxml2 libxslt gd geoip
] ++ optional fullWebDAV expat
++ optional ngx_lua luajit;
LUAJIT_LIB = if ngx_lua then "${luajit}/lib" else "";
LUAJIT_INC = if ngx_lua then "${luajit}/include/luajit-2.0" else "";
patches = if syslog then [ "${syslog-ext}/syslog-1.5.6.patch" ] else [];
[ openssl zlib pcre libxml2 libxslt gd geoip ]
++ concatMap (mod: mod.inputs or []) modules;
configureFlags = [
"--with-http_ssl_module"
@@ -104,21 +45,13 @@ stdenv.mkDerivation rec {
"--with-ipv6"
# Install destination problems
# "--with-http_perl_module"
] ++ optional rtmp "--add-module=${rtmp-ext}"
++ optional fullWebDAV "--add-module=${dav-ext}"
++ optional syslog "--add-module=${syslog-ext}"
++ optional moreheaders "--add-module=${moreheaders-ext}"
++ optional echo "--add-module=${echo-ext}"
++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}"
++ optional withStream "--with-stream"
++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio";
] ++ optional withStream "--with-stream"
++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
++ map (mod: "--add-module=${mod.src}") modules;
NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations";
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2 $additionalFlags"
'';
preConfigure = concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
postInstall = ''
mv $out/sbin $out/bin
pkgs/servers/http/thttpd/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://acme.com/software/thttpd/${name}.tar.gz";
sha256 = "1dybhpyfrly0m285cdn9jah397bqzylrwzi26gin2h451z3gdcqm";
sha256 = "1idlpnwrd5fpmnfh477h1lzanavx8jxir2d8adax46zy472dg4s6";
};
prePatch = ''
pkgs/servers/http/tomcat/axis2/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, apacheAnt, jdk, unzip}:
stdenv.mkDerivation {
name = "axis2-1.6.2";
name = "axis2-1.6.3";
src = fetchurl {
url = http://apache.proserve.nl/axis/axis2/java/core/1.6.2/axis2-1.6.2-bin.zip;
sha256 = "02i6fv11ksd5ql81i501bcb11ib5gyhq3zxwrz5jm4ic80r097fp";
url = http://apache.proserve.nl/axis/axis2/java/core/1.6.3/axis2-1.6.3-bin.zip;
sha256 = "0a49m7g1gxb904d0az2kbkab8rg02wm8nzbyipiad9k028masr6r";
};
buildInputs = [ unzip apacheAnt jdk ];