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

Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv

Browse Source 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
This commit is contained in:
Eelco Dolstra
2014-10-09 10:57:57 +02:00
parent c34932ef86 a2c7804903
commit 811de3bfaa
1015 changed files with 20126 additions and 5810 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/apache-httpd/2.2.nix
+2 -2
View File
@@ -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";
};
buildInputs = [perl apr aprutil pcre] ++
pkgs/servers/http/couchdb/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
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
pkgs/servers/http/mini-httpd/default.nix
+2 -2
View File
@@ -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;
pkgs/servers/http/nginx/default.nix
+38 -31
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat
{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
, gd, geoip, luajit
, rtmp ? false
, fullWebDAV ? false
@@ -10,52 +10,59 @@
with stdenv.lib;
let
version = "1.6.1";
version = "1.6.2";
mainSrc = fetchurl {
url = "http://nginx.org/download/nginx-${version}.tar.gz";
sha256 = "0rv0hds8dhanh8fz8qv5jj7p96q4sl158w6aq814dvxfl61fdkzm";
sha256 = "060s77qxhkn02fjkcndsr0xppj2bppjzkj0gn84svrykb4lqqq5m";
};
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;
rev = "3ca5ba65541637f74467038aa032e2586321d0cb";
sha256 = "15z9r17lx42fdcw8lalddc86wpabgmc1rqi7f90v4mcirjzrpgyi";
syslog-ext = fetchFromGitHub {
owner = "yaoweibin";
repo = "nginx_syslog_patch";
rev = "v0.25";
sha256 = "0734f884838wcjyrrddn8wzj834wid1zffrk093jrx18447cryxl";
};
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 = fetchgit {
url = https://github.com/simpl/ngx_devel_kit.git;
rev = "refs/tags/v0.2.19";
sha256 = "169m6gsa5b6zh1ws8qx2k7dbswld1zmhm4dh57qka0h07gs5dqjg";
develkit-ext = fetchFromGitHub {
owner = "simpl";
repo = "ngx_devel_kit";
rev = "v0.2.19";
sha256 = "1cqcasp4lc6yq5pihfcdw4vp4wicngvdc3nqg3bg52r63c1qrz76";
};
lua-ext = fetchgit {
url = https://github.com/openresty/lua-nginx-module.git;
rev = "refs/tags/v0.9.11";
sha256 = "0y7238bvb907n7fsz5sivxbhfz2xnf4f0lzwk3k3h9j20fsyvwqq";
lua-ext = fetchFromGitHub {
owner = "openresty";
repo = "lua-nginx-module";
rev = "v0.9.12";
sha256 = "0r07q1n3nvi7m3l8zk7nfk0z9kjhqknav61ys9lshh2ylsmz1lf4";
};
in
pkgs/servers/http/openresty/default.nix
+7 -3
View File
@@ -7,11 +7,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "openresty-${version}";
version = "1.7.4.1rc1";
version = "1.7.4.1rc2";
src = fetchurl {
url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz";
sha256 = "1j976kmbdv07j3n7bwkpdrjs8hlm13mzzdmfbsfwyxpnk034v0j1";
sha256 = "1208snm0g1x2p9ybl8br7mmcl5c4g4xzhm80n5jfjprr85gb7ajx";
};
buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ];
@@ -41,8 +41,12 @@ 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 = ''