Merge 'staging' into closure-size
- there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now.
This commit is contained in:
Vladimír Čunát
@@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
|
||||
assert mpm == "prefork" || mpm == "worker" || mpm == "event";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.2.27";
|
||||
version = "2.2.29";
|
||||
name = "apache-httpd-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
|
||||
sha256 = "0iw19y6knijinqwvv4q16fgq5xq8nwxdg14wrrbc0mfasvg76n90";
|
||||
sha1 = "1d6a8fbc1391d358cc6fe430edc16222b97258d5";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "doc" ];
|
||||
@@ -42,6 +42,10 @@ stdenv.mkDerivation rec {
|
||||
${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""}
|
||||
${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""}
|
||||
--with-mpm=${mpm}
|
||||
--enable-cache
|
||||
--enable-disk-cache
|
||||
--enable-file-cache
|
||||
--enable-mem-cache
|
||||
'';
|
||||
|
||||
preConfigure =
|
||||
|
||||
@@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
|
||||
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.4.10";
|
||||
version = "2.4.12";
|
||||
name = "apache-httpd-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
|
||||
sha256 = "0slwcqw9f7fnb3kyz27hlsgh8j4wiza4yzqyp6vhfpvl3an4sv0p";
|
||||
sha256 = "1r7a63ka41vlswrqbb21vall6sc7svwgd497kb6dh8a6zvnkjvdd";
|
||||
};
|
||||
|
||||
buildInputs = [perl] ++
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ stdenv, fetchurl, apacheHttpd }:
|
||||
{ lib, stdenv, fetchurl, apacheHttpd }:
|
||||
|
||||
if lib.versionAtLeast (lib.getVersion apacheHttpd) "2.4" then
|
||||
|
||||
throw "mod_evasive is not supported on Apache httpd 2.4"
|
||||
|
||||
else
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "mod_evasive-1.10.1";
|
||||
|
||||
@@ -1,13 +1,21 @@
|
||||
{ stdenv, fetchurl, apacheHttpd }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mod_fastcgi-2.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.fastcgi.com/dist/mod_fastcgi-2.4.6.tar.gz";
|
||||
url = "http://www.fastcgi.com/dist/${name}.tar.gz";
|
||||
sha256 = "12g6vcfl9jl8rqf8lzrkdxg2ngca310d3d6an563xqcgrkp8ga55";
|
||||
};
|
||||
|
||||
patches =
|
||||
[ (fetchurl {
|
||||
name = "compile-against-apache24.diff";
|
||||
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42";
|
||||
sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ apacheHttpd ];
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -1,29 +1,26 @@
|
||||
{stdenv, fetchurl, apacheHttpd, python}:
|
||||
{ stdenv, fetchurl, apacheHttpd, python }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "mod_python-3.3.1";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mod_python-3.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://apache/httpd/modpython/mod_python-3.3.1.tgz;
|
||||
sha256 = "0sss2xi6l1a2z8y6ji0cp8vgyvnhq8zrg0ilkvpj1mygbzyk28xd";
|
||||
url = "http://dist.modpython.org/dist/${name}.tgz";
|
||||
sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./install.patch
|
||||
|
||||
# See http://bugs.gentoo.org/show_bug.cgi?id=230211
|
||||
(fetchurl {
|
||||
url = "http://bugs.gentoo.org/attachment.cgi?id=160400";
|
||||
sha256 = "0yx6x9c5rg5kn6y8vsi4xj3nvg016rrfk553ca1bw796v383xkyj";
|
||||
})
|
||||
];
|
||||
patches = [ ./install.patch ];
|
||||
|
||||
preInstall = ''
|
||||
installFlags="LIBEXECDIR=$out/modules $installFlags"
|
||||
mkdir -p $out/modules
|
||||
mkdir -p $out/modules $out/bin
|
||||
'';
|
||||
|
||||
passthru = { inherit apacheHttpd; };
|
||||
|
||||
buildInputs = [apacheHttpd python];
|
||||
|
||||
buildInputs = [ apacheHttpd python ];
|
||||
|
||||
meta = {
|
||||
homepage = http://modpython.org/;
|
||||
description = "An Apache module that embeds the Python interpreter within the server";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,20 +1,12 @@
|
||||
diff -rc mod_python-3.1.4-orig/dist/Makefile.in mod_python-3.1.4/dist/Makefile.in
|
||||
*** mod_python-3.1.4-orig/dist/Makefile.in 2005-01-29 22:25:28.000000000 +0100
|
||||
--- mod_python-3.1.4/dist/Makefile.in 2006-01-15 12:07:40.000000000 +0100
|
||||
***************
|
||||
*** 34,40 ****
|
||||
install_py_lib: mod_python src
|
||||
@cd src; $(MAKE) psp_parser.c
|
||||
if test -z "$(DESTDIR)" ; then \
|
||||
! $(PYTHON_BIN) setup.py install --optimize 2 --force ; \
|
||||
else \
|
||||
$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
|
||||
fi
|
||||
--- 34,40 ----
|
||||
install_py_lib: mod_python src
|
||||
@cd src; $(MAKE) psp_parser.c
|
||||
if test -z "$(DESTDIR)" ; then \
|
||||
! $(PYTHON_BIN) setup.py install --optimize 2 --force --prefix $(out) ; \
|
||||
else \
|
||||
$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
|
||||
fi
|
||||
diff -ru -x '*~' mod_python-3.5.0-orig/dist/Makefile.in mod_python-3.5.0/dist/Makefile.in
|
||||
--- mod_python-3.5.0-orig/dist/Makefile.in 2013-11-12 04:21:34.000000000 +0100
|
||||
+++ mod_python-3.5.0/dist/Makefile.in 2014-11-07 11:28:24.466377733 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
install_py_lib: mod_python src
|
||||
@cd src; $(MAKE) psp_parser.c
|
||||
if test -z "$(DESTDIR)" ; then \
|
||||
- $(PYTHON_BIN) setup.py install --optimize 2 --force ; \
|
||||
+ $(PYTHON_BIN) setup.py install --optimize 2 --force --prefix $(out) ; \
|
||||
else \
|
||||
$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
|
||||
fi
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
{ stdenv, fetchurl, apacheHttpd, python }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "mod_wsgi-3.4";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mod_wsgi-${version}";
|
||||
version = "3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://modwsgi.googlecode.com/files/mod_wsgi-3.4.tar.gz";
|
||||
sha256 = "1s5nnjssvcl6lzy7kxmrk47yz6sgfzk90i1y7jml0s0lks7ck1df";
|
||||
url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz";
|
||||
sha256 = "14xz422jlakdhxzsl8xs9if86yf1fnkwdg0havjyqs7my0w4qrzh";
|
||||
};
|
||||
|
||||
buildInputs = [ apacheHttpd python ];
|
||||
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://code.google.com/p/modwsgi/";
|
||||
homepage = http://code.google.com/p/modwsgi/;
|
||||
description = "Host Python applications in Apache through the WSGI interface";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
tar xfvz $src
|
||||
cd tomcat-connectors-*-src/native
|
||||
./configure --with-apxs=$apacheHttpd/bin/apxs --with-java-home=$jdk
|
||||
make
|
||||
mkdir -p $out/modules
|
||||
cp apache-2.0/mod_jk.so $out/modules
|
||||
@@ -1,14 +1,21 @@
|
||||
{stdenv, fetchurl, apacheHttpd, jdk}:
|
||||
{ stdenv, fetchurl, apacheHttpd, jdk }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "tomcat-connectors-1.2.32";
|
||||
builder = ./builder.sh;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tomcat-connectors-1.2.40";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.32-src.tar.gz;
|
||||
sha256 = "1dim62warzy1hqvc7cvnqsbq475sr6vpgwd6gfmddmkgw155saji";
|
||||
url = "http://www.apache.si/tomcat/tomcat-connectors/jk/${name}-src.tar.gz";
|
||||
sha256 = "0pbh6s19ba5k2kahiiqgx8lz8v4fjllzn0w6hjd08x7z9my38pl9";
|
||||
};
|
||||
|
||||
inherit apacheHttpd;
|
||||
buildInputs = [apacheHttpd jdk];
|
||||
configureFlags = "--with-apxs=${apacheHttpd}/bin/apxs --with-java-home=${jdk}";
|
||||
|
||||
sourceRoot = "${name}-src/native";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/modules
|
||||
cp apache-2.0/mod_jk.so $out/modules
|
||||
'';
|
||||
|
||||
buildInputs = [ apacheHttpd jdk ];
|
||||
}
|
||||
|
||||
@@ -3,16 +3,28 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "couchdb-${version}";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
|
||||
sha256 = "0m4k7i3gibzzcabssysv42rmdr89myppc6765xr0jggwkwdxgxmx";
|
||||
sha256 = "09w6ijj9l5jzh81nvc3hrlqp345ajg3haj353g9kxkik6wbinq2s";
|
||||
};
|
||||
|
||||
buildInputs = [ erlang icu openssl spidermonkey curl help2man sphinx which
|
||||
file pkgconfig ];
|
||||
|
||||
/* This patch removes the `-Werror` flag as there are warnings due to
|
||||
* _BSD_SOURCE being deprecated in glibc >= 2.20
|
||||
*/
|
||||
patchPhase = ''
|
||||
patch src/couchdb/priv/Makefile.in <<EOF
|
||||
392c392
|
||||
< couchjs_CFLAGS = -g -Wall -Werror -D_BSD_SOURCE \$(CURL_CFLAGS) \$(JS_CFLAGS)
|
||||
---
|
||||
> couchjs_CFLAGS = -g -Wall -D_BSD_SOURCE \$(CURL_CFLAGS) \$(JS_CFLAGS)
|
||||
EOF
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb
|
||||
'';
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jetty-9.2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/jetty-distribution-9.2.5.v20141112.tar.gz&r=1";
|
||||
name = "jetty-distribution-9.2.5.v20141112.tar.gz";
|
||||
sha256 = "1azqhvvqm9il5n07vms5vv27vr3qhmsy44nmqcgsaggq7p37swf1";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
mv etc lib modules start.jar $out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A Web server and javax.servlet container";
|
||||
|
||||
homepage = http://www.eclipse.org/jetty/;
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.shlevy ];
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ];
|
||||
};
|
||||
}
|
||||
@@ -8,6 +8,6 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/jetty/jetty-5.1.4.zip;
|
||||
md5 = "5d16bb1ea4a62dff93c0b7f7de00430f";
|
||||
sha256 = "1lzvsrlybrf3zzzv4hi2v82qzpkfkib3xbwwlya8c08gf0360mrk";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,9 +2,9 @@ x@{builderDefsPackage
|
||||
, unzip
|
||||
, ...}:
|
||||
builderDefsPackage
|
||||
(a :
|
||||
let
|
||||
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
||||
(a :
|
||||
let
|
||||
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
||||
[];
|
||||
|
||||
buildInputs = map (n: builtins.getAttr n x)
|
||||
@@ -47,13 +47,13 @@ rec {
|
||||
phaseNames = ["doDeploy" "fixScripts"];
|
||||
|
||||
fixScripts = a.doPatchShebangs ''$TARGET/bin'';
|
||||
|
||||
|
||||
doDeploy = a.fullDepEntry (''
|
||||
${a.lib.concatStringsSep ";" (map (y : "unzip ${y}") tarballFiles)}
|
||||
for i in */; do cp -rTf $i merged; done
|
||||
cd merged
|
||||
|
||||
for i in "lib/"jsp-*/*.jar; do
|
||||
|
||||
for i in "lib/"jsp-*/*.jar; do
|
||||
ln -s "''${i#lib/}" "lib" || true
|
||||
done
|
||||
|
||||
@@ -67,7 +67,7 @@ rec {
|
||||
ls "lib/"tdb-[0-9]*.jar | sort | tac | tail -n +2
|
||||
ls "lib/"jetty-[0-9]*.jar | sort | tac | tail -n +2
|
||||
ls "lib/"jetty-util-[0-9]*.jar | sort | tac | tail -n +2
|
||||
) |
|
||||
) |
|
||||
xargs -I @@ mv @@ lib/obsolete
|
||||
|
||||
mv lib/slf4j-simple-*.jar lib/obsolete
|
||||
@@ -106,8 +106,7 @@ rec {
|
||||
raskin
|
||||
];
|
||||
hydraPlatforms = []; # Builder is just unpacking/mixing what is needed
|
||||
license = "free"; # mix of packages under different licenses
|
||||
license = a.lib.licenses.free; # mix of packages under different licenses
|
||||
homepage = "http://openjena.org/";
|
||||
};
|
||||
}) x
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchurl, pkgconfig, pcre, libxml2, zlib, attr, bzip2, which, file
|
||||
, openssl, enableMagnet ? false, lua5 ? null
|
||||
, openssl, enableMagnet ? false, lua5_1 ? null
|
||||
, enableMysql ? false, mysql ? null
|
||||
}:
|
||||
|
||||
assert enableMagnet -> lua5 != null;
|
||||
assert enableMagnet -> lua5_1 != null;
|
||||
assert enableMysql -> mysql != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]
|
||||
++ stdenv.lib.optional enableMagnet lua5
|
||||
++ stdenv.lib.optional enableMysql mysql;
|
||||
++ stdenv.lib.optional enableMagnet lua5_1
|
||||
++ stdenv.lib.optional enableMysql mysql.lib;
|
||||
|
||||
configureFlags = [ "--with-openssl" ]
|
||||
++ stdenv.lib.optional enableMagnet "--with-lua"
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Lightweight high-performance web server";
|
||||
homepage = http://www.lighttpd.net/;
|
||||
license = "BSD";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, boostHeaders }:
|
||||
{ stdenv, fetchurl, boost }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mini-httpd-1.4";
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1i46klkx2ca1cgmlilajkx8gf7b7d7c2sj58llxfllh184pb6cpd";
|
||||
};
|
||||
|
||||
buildInputs = [ boostHeaders ];
|
||||
buildInputs = [ boost ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -1,49 +1,79 @@
|
||||
{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat
|
||||
, gd, geoip
|
||||
{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
|
||||
, gd, geoip, luajit
|
||||
, rtmp ? false
|
||||
, fullWebDAV ? false
|
||||
, syslog ? false
|
||||
, moreheaders ? false
|
||||
, echo ? false }:
|
||||
, echo ? false
|
||||
, ngx_lua ? false
|
||||
, set_misc ? false
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "1.6.1";
|
||||
version = "1.6.3";
|
||||
mainSrc = fetchurl {
|
||||
url = "http://nginx.org/download/nginx-${version}.tar.gz";
|
||||
sha256 = "0rv0hds8dhanh8fz8qv5jj7p96q4sl158w6aq814dvxfl61fdkzm";
|
||||
sha256 = "0mz7nx1ffw4f024yb4w9kpjd33z1f16zmq9iyd160kbf6rdyk60a";
|
||||
};
|
||||
|
||||
rtmp-ext = fetchgit {
|
||||
url = https://github.com/arut/nginx-rtmp-module.git;
|
||||
rev = "8c2229cce5d4d4574e8fb7b130281497f746f0fa";
|
||||
sha256 = "6caea2a13161345c3fc963679730be54cebebddf1406ac7d4ef4ce72ac0b90b0";
|
||||
rtmp-ext = fetchFromGitHub {
|
||||
owner = "arut";
|
||||
repo = "nginx-rtmp-module";
|
||||
rev = "v1.1.5";
|
||||
sha256 = "1d9ws4prxz22yq3nhh5h18jrs331zivrdh784l6wznc1chg3gphn";
|
||||
};
|
||||
|
||||
dav-ext = fetchgit {
|
||||
url = "https://github.com/arut/nginx-dav-ext-module";
|
||||
rev = "89d582d31ab624ff1c6a4cec0c1a52839507b323";
|
||||
sha256 = "2175f83a291347504770d2a4bb5069999e9f7408697bd49464b6b54e994493e1";
|
||||
dav-ext = fetchFromGitHub {
|
||||
owner = "arut";
|
||||
repo = "nginx-dav-ext-module";
|
||||
rev = "v0.0.3";
|
||||
sha256 = "1qck8jclxddncjad8yv911s9z7lrd58bp96jf13m0iqk54xghx91";
|
||||
};
|
||||
|
||||
syslog-ext = fetchgit {
|
||||
url = https://github.com/yaoweibin/nginx_syslog_patch.git;
|
||||
syslog-ext = fetchFromGitHub {
|
||||
owner = "yaoweibin";
|
||||
repo = "nginx_syslog_patch";
|
||||
rev = "3ca5ba65541637f74467038aa032e2586321d0cb";
|
||||
sha256 = "15z9r17lx42fdcw8lalddc86wpabgmc1rqi7f90v4mcirjzrpgyi";
|
||||
sha256 = "0y8dxkx8m1jw4v5zsvw1gfah9vh3ryq0hfmrcbjzcmwp5b5lb1i8";
|
||||
};
|
||||
|
||||
moreheaders-ext = fetchgit {
|
||||
url = https://github.com/openresty/headers-more-nginx-module.git;
|
||||
rev = "0c6e05d3125a97892a250e9ba8b7674163ba500b";
|
||||
sha256 = "e121d97fd3c81c64e6cbf6902bbcbdb01be9ac985c6832d40434379d5e998eaf";
|
||||
moreheaders-ext = fetchFromGitHub {
|
||||
owner = "openresty";
|
||||
repo = "headers-more-nginx-module";
|
||||
rev = "v0.25";
|
||||
sha256 = "1d71y1i0smi4gkzz731fhn58gr03b3s6jz6ipnfzxxaizmgxm3rb";
|
||||
};
|
||||
|
||||
echo-ext = fetchgit {
|
||||
url = https://github.com/openresty/echo-nginx-module.git;
|
||||
rev = "refs/tags/v0.53";
|
||||
sha256 = "90d4e3a49c678019f4f335bc18529aa108fcc9cfe0747ea4e2f6084a70da2868";
|
||||
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.12";
|
||||
sha256 = "0r07q1n3nvi7m3l8zk7nfk0z9kjhqknav61ys9lshh2ylsmz1lf4";
|
||||
};
|
||||
|
||||
set-misc-ext = fetchFromGitHub {
|
||||
owner = "openresty";
|
||||
repo = "set-misc-nginx-module";
|
||||
rev = "v0.27";
|
||||
sha256 = "1bd1isacsiay73nc2jlp0wky32l42a3sjskvfa1082l12g0p1x39";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -52,7 +82,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs =
|
||||
[ openssl zlib pcre libxml2 libxslt gd geoip
|
||||
] ++ optional fullWebDAV expat;
|
||||
] ++ 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 [];
|
||||
|
||||
@@ -83,10 +117,12 @@ stdenv.mkDerivation rec {
|
||||
++ 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}"
|
||||
++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio";
|
||||
|
||||
|
||||
additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations";
|
||||
additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";
|
||||
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
|
||||
|
||||
@@ -0,0 +1,132 @@
|
||||
{ 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 }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "1.7.11";
|
||||
mainSrc = fetchurl {
|
||||
url = "http://nginx.org/download/nginx-${version}.tar.gz";
|
||||
sha256 = "15cnlrhiqklqfzwfspkp0i6g04zdhc092dh593yqnqqf450dgnfs";
|
||||
};
|
||||
|
||||
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.12";
|
||||
sha256 = "0r07q1n3nvi7m3l8zk7nfk0z9kjhqknav61ys9lshh2ylsmz1lf4";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nginx-${version}";
|
||||
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 [];
|
||||
|
||||
configureFlags = [
|
||||
"--with-http_ssl_module"
|
||||
"--with-http_spdy_module"
|
||||
"--with-http_realip_module"
|
||||
"--with-http_addition_module"
|
||||
"--with-http_xslt_module"
|
||||
"--with-http_image_filter_module"
|
||||
"--with-http_geoip_module"
|
||||
"--with-http_sub_module"
|
||||
"--with-http_dav_module"
|
||||
"--with-http_flv_module"
|
||||
"--with-http_mp4_module"
|
||||
"--with-http_gunzip_module"
|
||||
"--with-http_gzip_static_module"
|
||||
"--with-http_auth_request_module"
|
||||
"--with-http_random_index_module"
|
||||
"--with-http_secure_link_module"
|
||||
"--with-http_degradation_module"
|
||||
"--with-http_stub_status_module"
|
||||
"--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 (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio";
|
||||
|
||||
|
||||
additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations";
|
||||
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mv $out/sbin $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A reverse proxy and lightweight webserver";
|
||||
homepage = http://nginx.org;
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ thoughtpolice raskin ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
url http://nginx.org/en/download.html
|
||||
version_link '.*-([0-9]+[.][0-9]+([.][0-9]+)*)[.]tar[.][a-z0-9]*$'
|
||||
|
||||
do_overwrite() {
|
||||
ensure_hash
|
||||
set_var_value version "$CURRENT_VERSION"
|
||||
set_var_value sha256 "$CURRENT_HASH"
|
||||
}
|
||||
@@ -39,6 +39,10 @@ parse_opts () {
|
||||
echo "PORT=$1"
|
||||
shift;
|
||||
;;
|
||||
--ipv6)
|
||||
shift;
|
||||
echo "USE_IPV6=enable"
|
||||
;;
|
||||
--help)
|
||||
cat <<EOF >&2
|
||||
"$0": start the Nix binary cache serving the Nix store dynamically.
|
||||
@@ -57,6 +61,8 @@ Recognized options:
|
||||
--nix-remote 'daemon' or empty string '' - whether to use daemon for store
|
||||
operations
|
||||
|
||||
--ipv6 enable ipv6
|
||||
|
||||
--help show help and exit
|
||||
EOF
|
||||
exit 1;
|
||||
@@ -82,6 +88,12 @@ cgi.assign = ( \".cgi\" => \"@shell@\" )
|
||||
setenv.add-request-header = ( \"NIX_BINARY_CACHE_CONFIG\" => \"$workingdir/nix-binary-cache.conf\" )
|
||||
" > lighttpd.conf
|
||||
|
||||
test -n "$USE_IPV6" && echo "
|
||||
\$SERVER[\"socket\"] == \"[::]:$PORT\" {
|
||||
server.use-ipv6 = \"enable\"
|
||||
}
|
||||
" >> lighttpd.conf
|
||||
|
||||
cp @out@/nix-binary-cache.cgi .
|
||||
cp @out@/nix-binary-cache.cgi ./nix-bc.cgi
|
||||
|
||||
|
||||
@@ -10,13 +10,18 @@ KEYNAME=na
|
||||
export NIX_REMOTE=daemon
|
||||
|
||||
config="${NIX_BINARY_CACHE_CONFIG:-${HTTP_NIX_BINARY_CACHE_CONFIG:-/etc/nix/nix-binary-cache.cgi.conf}}"
|
||||
config="$(cd "$(@coreutils@/dirname "$config")";
|
||||
config="$(cd "$(@coreutils@/dirname "$config")";
|
||||
@coreutils@/pwd)/$(@coreutils@/basename "$config")"
|
||||
@coreutils@/test -e "$config" && . "$config"
|
||||
|
||||
header(){
|
||||
echo "Content-Type: text/plain; charset=utf-8"
|
||||
echo
|
||||
echo
|
||||
}
|
||||
|
||||
header404(){
|
||||
echo "Status: 404 Not Found"
|
||||
echo
|
||||
}
|
||||
|
||||
clean_path() {
|
||||
@@ -28,12 +33,12 @@ storeq(){
|
||||
}
|
||||
|
||||
sign(){
|
||||
test -n "$1" &&
|
||||
@coreutils@/sha256sum | @gnused@/sed -e 's/ .*//' |
|
||||
test -n "$1" &&
|
||||
@coreutils@/sha256sum | @gnused@/sed -e 's/ .*//' |
|
||||
@openssl@/openssl rsautl -sign -inkey "$@" | @coreutils@/base64 -w 0
|
||||
}
|
||||
|
||||
case "$QUERY_STRING" in
|
||||
case "$QUERY_STRING" in
|
||||
"")
|
||||
header
|
||||
echo "Hello, this is a dynamically-generated Nix binary cache"
|
||||
@@ -51,7 +56,7 @@ case "$QUERY_STRING" in
|
||||
*.narinfo)
|
||||
hash=${QUERY_STRING%.narinfo}
|
||||
hash=${hash#/}
|
||||
path="$(echo "$STORE_DIR/$hash-"* )"
|
||||
path="$(echo "$STORE_DIR/$hash-"* | @coreutils@/sort | @coreutils@/head -n 1)"
|
||||
if [ -n "$path" ] && [ -e "$path" ]; then
|
||||
header
|
||||
info="$(
|
||||
@@ -61,9 +66,9 @@ case "$QUERY_STRING" in
|
||||
echo "Compression: $COMPRESSION"
|
||||
echo "NarHash: $(storeq --hash "$path")"
|
||||
echo "NarSize: $(storeq --size "$path")"
|
||||
echo "References: $(storeq --references "$path" |
|
||||
echo "References: $(storeq --references "$path" |
|
||||
@coreutils@/tac | clean_path )"
|
||||
echo "Deriver: $(storeq --deriver "$path" |
|
||||
echo "Deriver: $(storeq --deriver "$path" |
|
||||
clean_path )"
|
||||
)"
|
||||
signature="$(echo "$info" | sign "$KEY")"
|
||||
@@ -72,6 +77,7 @@ case "$QUERY_STRING" in
|
||||
echo "Signature: 1;$KEYNAME;$signature"
|
||||
|
||||
else
|
||||
header404
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
@@ -81,6 +87,7 @@ case "$QUERY_STRING" in
|
||||
header
|
||||
@nix@/nix-store --dump "$path" | @xz@/xz
|
||||
else
|
||||
header404
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
@@ -91,6 +98,7 @@ case "$QUERY_STRING" in
|
||||
header
|
||||
@nix@/nix-store --dump "$path" | @bzip2@/bzip2
|
||||
else
|
||||
header404
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
|
||||
@@ -7,11 +7,11 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openresty-${version}";
|
||||
version = "1.7.4.1rc1";
|
||||
version = "1.7.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz";
|
||||
sha256 = "1j976kmbdv07j3n7bwkpdrjs8hlm13mzzdmfbsfwyxpnk034v0j1";
|
||||
sha256 = "1m541k2lys3155f0r94abgcmm2hgvv56q0i4fk58w6fa8n4h62z0";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ];
|
||||
@@ -41,13 +41,17 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = ''
|
||||
mv $out/nginx/sbin $out/bin
|
||||
ln -s $out/bin/nginx $out/bin/openresty
|
||||
mv $out/bin/sbin $out/sbin
|
||||
|
||||
mv $out/luajit/bin/luajit-2.1.0-alpha $out/bin/luajit-openresty
|
||||
ln -s $out/sbin/nginx $out/sbin/openresty
|
||||
ln -s $out/sbin/nginx $out/bin/openresty
|
||||
ln -s $out/sbin/nginx $out/bin/nginx
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
|
||||
export PATH="$PATH:${stdenv.gcc.libc}/sbin"
|
||||
export PATH="$PATH:${stdenv.cc.libc}/sbin"
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libevent, file, qrencode }:
|
||||
|
||||
let
|
||||
version = "0.2.6";
|
||||
in stdenv.mkDerivation {
|
||||
name = "pshs-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.bitbucket.org/mgorny/pshs/downloads/pshs-${version}.tar.bz2";
|
||||
sha256 = "0n8l5sjnwjqjmw0jzg3hb93n6npg2wahmdg1zrpsw8fyh9ggjg4g";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig libevent file qrencode ];
|
||||
|
||||
# TODO: enable ssl once dependencies
|
||||
# (libssl libcrypto libevent >= 2.1 libevent_openssl) can be met
|
||||
configureFlags = "--disable-ssl";
|
||||
|
||||
meta = {
|
||||
description = "Pretty small HTTP server - a command-line tool to share files";
|
||||
homepage = "https://bitbucket.org/mgorny/pshs/";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = [ stdenv.lib.maintainers.eduarrrd ];
|
||||
};
|
||||
}
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "thttpd-${version}";
|
||||
version = "2.25b";
|
||||
version = "2.26";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://acme.com/software/thttpd/${name}.tar.gz";
|
||||
sha256 = "0q13sfkh6amn5wk0ccbmxq3mnhlm8g5pnyk910fa5xngn449nw87";
|
||||
sha256 = "1dybhpyfrly0m285cdn9jah397bqzylrwzi26gin2h451z3gdcqm";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@@ -1,23 +1,6 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
let version = "6.0.39"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "apache-tomcat-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz";
|
||||
import ./recent.nix
|
||||
{
|
||||
versionMajor = "6";
|
||||
versionMinor = "0.39";
|
||||
sha256 = "19qix6affhc252n03smjf482drg3nxd27shni1gvhphgj3zfmgfy";
|
||||
};
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir $out
|
||||
mv * $out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://tomcat.apache.org/;
|
||||
description = "An implementation of the Java Servlet and JavaServer Pages technologies";
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
import ./recent.nix
|
||||
{
|
||||
versionMajor = "7";
|
||||
versionMinor = "0.55";
|
||||
sha256 = "c20934fda63bc7311e2d8e067d67f886890c8be72280425c5f6f8fdd7a376c15";
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
import ./recent.nix
|
||||
{
|
||||
versionMajor = "8";
|
||||
versionMinor = "0.9";
|
||||
sha256 = "5ea3c8260088ee4fd223a532a4b0c23a10e549c34705e2f190279a1a7f1f83d9";
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
{ versionMajor, versionMinor, sha256 }:
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
let version = "${versionMajor}.${versionMinor}"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "apache-tomcat-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${name}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir $out
|
||||
mv * $out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://tomcat.apache.org/;
|
||||
description = "An implementation of the Java Servlet and JavaServer Pages technologies";
|
||||
platforms = with stdenv.lib.platforms; all;
|
||||
};
|
||||
}
|
||||
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://winstone.sourceforge.net/";
|
||||
description = "A simple Java Servlet container.";
|
||||
homepage = http://winstone.sourceforge.net/;
|
||||
description = "A simple Java Servlet container";
|
||||
license = stdenv.lib.licenses.cddl;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [ stdenv.lib.maintainers.rickynils ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yaws-${version}";
|
||||
version = "1.98";
|
||||
version = "1.99";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://yaws.hyber.org/download/${name}.tar.gz";
|
||||
sha256 = "0c88da7gxha7an3c82j5a3r1y0j7cjq66zqfrzjihg8pwp618zfl";
|
||||
sha256 = "057ymg84ji4pfi3xai6kis3mk8zks2ynbiam0x68cb4cb1yfzwcl";
|
||||
};
|
||||
|
||||
# The tarball includes a symlink yaws -> yaws-1.95, which seems to be
|
||||
|
||||
Reference in New Issue
Block a user