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

* Updated Apache-related packages. 

svn path=/nixpkgs/trunk/; revision=10502
This commit is contained in:
Eelco Dolstra 2008-02-05 11:41:49 +00:00
parent 937f8663ac
commit cb0c387ce2
4 changed files with 65 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
pkgs/development/interpreters/php_configurable/default.nix
View File

@ -9,6 +9,7 @@
| http://www.php.net/manual/security.php for more details. | | http://www.php.net/manual/security.php for more details. |
*/ */
let version = "5.2.5"; in
args: args:
( args.mkDerivationByConfiguration { ( args.mkDerivationByConfiguration {
@ -462,58 +463,57 @@ args:
extraAttrs = co : { extraAttrs = co : {
name = "php_configurable-5.2.4"; name = "php_configurable-${version}";
buildInputs = ( args.lib.getAttr [ "phpIncludes" ] [] args ) ++ co.buildInputs; buildInputs = ( args.lib.getAttr [ "phpIncludes" ] [] args ) ++ co.buildInputs;
configurePhase = configurePhase = ''
" iniFile=$out/etc/$name.ini
iniFile=\$out/etc/\$name.ini [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
[[ -z \"\$libxml2\" ]] || export PATH=\$PATH:\$libxml2/bin ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$iniFile --prefix=$out ${co.configureFlags}
./configure --with-config-file-scan-dir=/etc --with-config-file-path=\$iniFile --prefix=\$out " + co.configureFlags + "
echo configurePhase end echo configurePhase end
"; '';
installPhase = " installPhase = ''
unset installPhase; installPhase; unset installPhase; installPhase;
cp php.ini-recommended $\iniFile cp php.ini-recommended $iniFile
# Now Let's build xdebug if flag has been given # Now Let's build xdebug if flag has been given
# TODO I think there are better paths than the given below # TODO I think there are better paths than the given below
if [ -n \$flag_set_xdebug ]; then if [ -n $flag_set_xdebug ]; then
PATH=\$PATH:\$out/bin PATH=$PATH:$out/bin
tar xfz \$xdebug_src; tar xfz $xdebug_src;
cd xdebug* cd xdebug*
phpize phpize
./configure --prefix=\$out ./configure --prefix=$out
make make
ensureDir \$out/lib; cp modules/xdebug.so $out/lib ensureDir $out/lib; cp modules/xdebug.so $out/lib
cat >> $iniFile << EOF cat >> $iniFile << EOF
zend_extension=\"\$out/lib/xdebug.so\" zend_extension="$out/lib/xdebug.so"
zend_extension_ts=\"\$out/lib/xdebug.so\" zend_extension_ts="$out/lib/xdebug.so"
zend_extension_debug=\"\$out/lib/xdebug.so\" zend_extension_debug="$out/lib/xdebug.so"
xdebug.remote_enable=true xdebug.remote_enable=true
xdebug.remote_host=127.0.0.1 xdebug.remote_host=127.0.0.1
xdebug.remote_port=9000 xdebug.remote_port=9000
xdebug.remote_handler=dbgp xdebug.remote_handler=dbgp
xdebug.profiler_enable=0 xdebug.profiler_enable=0
xdebug.profiler_output_dir=\"/tmp/xdebug\" xdebug.profiler_output_dir="/tmp/xdebug"
xdebug.remote_mode=req xdebug.remote_mode=req
EOF EOF
fi fi
"; '';
src = args.fetchurl { src = args.fetchurl {
url = http://de.php.net/get/php-5.2.4.tar.bz2/from/this/mirror; url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
sha256 = "1h513j7crz08n7rlh8v7cvxfzisj87mvvyfrkiaa76v1wicm4bsh"; sha256 = "18xv961924rkk66gdjcmk1mzbzgp2srbiq5jvbgyn6ahvxq1xb2w";
name = "php-5.2.4.tar.bz2"; name = "php-${version}.tar.bz2";
}; };
meta = { meta = {
description = "The PHP language runtime engine"; # : CLI, CGI and Apache2 SAPIs ? as well TODO description = "The PHP language runtime engine"; # : CLI, CGI and Apache2 SAPIs ? as well TODO
homepage = http://www.php.net/; homepage = http://www.php.net/;
license = "PHP-3"; license = "PHP-3";
}; };
patches = [./fix.patch]; patches = [./fix.patch];
}; };

26
pkgs/development/libraries/apr-util/default.nix
View File

@ -4,14 +4,26 @@
assert bdbSupport -> db4 != null; assert bdbSupport -> db4 != null;
(stdenv.mkDerivation { stdenv.mkDerivation {
name = "apr-util-1.2.7"; name = "apr-util-1.2.12";
src = fetchurl { src = fetchurl {
url = http://archive.apache.org/dist/apr/apr-util-1.2.7.tar.bz2; url = http://archive.apache.org/dist/apr/apr-util-1.2.12.tar.bz2;
md5 = "a4c527f08ae2298e62a88472291bf066"; sha256 = "152xwaxikp22acz7ypqsvlyjxhak6p40805wwbw7hcg1gyg2scyl";
}; };
configureFlags = "
configureFlags = ''
--with-apr=${apr} --with-expat=${expat} --with-apr=${apr} --with-expat=${expat}
${if bdbSupport then "--with-berkeley-db=${db4}" else ""} ${if bdbSupport then "--with-berkeley-db=${db4}" else ""}
"; '';
}) // {inherit bdbSupport;}
passthru = {
inherit bdbSupport;
};
meta = {
homepage = http://apr.apache.org/;
description = "A companion library to APR, the Apache Portable Runtime";
};
}

12
pkgs/development/libraries/apr/default.nix
View File

@ -1,9 +1,15 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "apr-1.2.7"; name = "apr-1.2.12";
src = fetchurl { src = fetchurl {
url = http://archive.apache.org/dist/apr/apr-1.2.7.tar.bz2; url = http://archive.apache.org/dist/apr/apr-1.2.12.tar.bz2;
md5 = "e77887dbafc515c63feac84686bcb3bc"; sha256 = "0d11wa2hlhb5lnny5rcazca056b35kgccx94cd38bazw1d6b68nv";
};
meta = {
homepage = http://apr.apache.org/;
description = "The Apache Portable Runtime library";
}; };
} }

6
pkgs/servers/http/apache-modules/mod_python/default.nix
View File

@ -1,13 +1,13 @@
{stdenv, fetchurl, apacheHttpd, python}: {stdenv, fetchurl, apacheHttpd, python}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mod_python-3.2.10"; name = "mod_python-3.3.1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://apache.surfnet.nl/httpd/modpython/mod_python-3.2.10.tgz; url = http://archive.eu.apache.org/dist/httpd/modpython/mod_python-3.3.1.tgz;
md5 = "cc6439f546a6e70cfff7ca51b8c62541"; sha256 = "0sss2xi6l1a2z8y6ji0cp8vgyvnhq8zrg0ilkvpj1mygbzyk28xd";
}; };
patches = [./install.patch]; patches = [./install.patch];