forked from mirrors/nixpkgs
php: Update to 5.3.17
Also remove unsupported PHP 5.2 (which doesn't build anymore). http://hydra.nixos.org/build/3131326
This commit is contained in:
Eelco Dolstra
parent
9663c37534
commit
873595ee6d
|
|
@ -1,172 +0,0 @@
|
|||
args: with args;
|
||||
|
||||
let
|
||||
|
||||
inherit (args.composableDerivation) composableDerivation edf wwf;
|
||||
|
||||
in
|
||||
|
||||
composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
|
||||
|
||||
version = "5.2.17";
|
||||
|
||||
name = "php-${version}";
|
||||
|
||||
buildInputs = ["flex" "bison" "pkgconfig"];
|
||||
|
||||
flags = {
|
||||
|
||||
# much left to do here...
|
||||
|
||||
# SAPI modules:
|
||||
|
||||
apxs2 = {
|
||||
configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
|
||||
buildInputs = [apacheHttpd];
|
||||
};
|
||||
|
||||
# Extensions
|
||||
|
||||
curl = {
|
||||
configureFlags = ["--with-curl=${args.curl}" "--with-curlwrappers"];
|
||||
buildInputs = [curl openssl];
|
||||
};
|
||||
|
||||
zlib = {
|
||||
configureFlags = ["--with-zlib=${args.zlib}"];
|
||||
buildInputs = [zlib];
|
||||
};
|
||||
|
||||
libxml2 = {
|
||||
configureFlags = [
|
||||
"--with-libxml-dir=${libxml2}"
|
||||
"--with-iconv-dir=${libiconv}"
|
||||
];
|
||||
buildInputs = [ libxml2 ];
|
||||
};
|
||||
|
||||
readline = {
|
||||
configureFlags = ["--with-readline=${readline}"];
|
||||
buildInputs = [ readline ];
|
||||
};
|
||||
|
||||
sqlite = {
|
||||
configureFlags = ["--with-pdo-sqlite=${sqlite}"];
|
||||
buildInputs = [ sqlite ];
|
||||
};
|
||||
|
||||
postgresql = {
|
||||
configureFlags = ["--with-pgsql=${postgresql}"];
|
||||
buildInputs = [ postgresql ];
|
||||
};
|
||||
|
||||
mysql = {
|
||||
configureFlags = ["--with-mysql=${mysql}"];
|
||||
buildInputs = [ mysql ];
|
||||
};
|
||||
|
||||
mysqli = {
|
||||
configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"];
|
||||
buildInputs = [ mysql];
|
||||
};
|
||||
|
||||
mysqli_embedded = {
|
||||
configureFlags = ["--enable-embedded-mysqli"];
|
||||
depends = "mysqli";
|
||||
assertion = fixed.mysqliSupport;
|
||||
};
|
||||
|
||||
pdo_mysql = {
|
||||
configureFlags = ["--with-pdo-mysql=${mysql}"];
|
||||
buildInputs = [ mysql ];
|
||||
};
|
||||
|
||||
bcmath = {
|
||||
configureFlags = ["--enable-bcmath"];
|
||||
};
|
||||
|
||||
gd = {
|
||||
configureFlags = ["--with-gd=${args.gd}"];
|
||||
buildInputs = [gd libpng libjpeg ];
|
||||
};
|
||||
|
||||
soap = {
|
||||
configureFlags = ["--enable-soap"];
|
||||
};
|
||||
|
||||
sockets = {
|
||||
configureFlags = ["--enable-sockets"];
|
||||
};
|
||||
|
||||
openssl = {
|
||||
configureFlags = ["--with-openssl=${args.openssl}"];
|
||||
buildInputs = ["openssl"];
|
||||
};
|
||||
|
||||
mbstring = {
|
||||
configureFlags = ["--enable-mbstring"];
|
||||
};
|
||||
|
||||
/*
|
||||
php is build within this derivation in order to add the xdebug lines to the php.ini.
|
||||
So both Apache and command line php both use xdebug without having to configure anything.
|
||||
Xdebug could be put in its own derivation.
|
||||
* /
|
||||
meta = {
|
||||
description = "debugging support for PHP";
|
||||
homepage = http://xdebug.org;
|
||||
license = "based on the PHP license - as is";
|
||||
};
|
||||
*/
|
||||
};
|
||||
|
||||
cfg = {
|
||||
mysqlSupport = config.php.mysql or true;
|
||||
mysqliSupport = config.php.mysqli or true;
|
||||
pdo_mysqlSupport = config.php.pdo_mysql or true;
|
||||
libxml2Support = config.php.libxml2 or true;
|
||||
apxs2Support = config.php.apxs2 or true;
|
||||
bcmathSupport = config.php.bcmath or true;
|
||||
socketsSupport = config.php.sockets or true;
|
||||
curlSupport = config.php.curl or true;
|
||||
gettextSupport = config.php.gettext or true;
|
||||
postgresqlSupport = config.php.postgresql or true;
|
||||
readlineSupport = config.php.readline or true;
|
||||
sqliteSupport = config.php.sqlite or true;
|
||||
soapSupport = config.php.soap or true;
|
||||
zlibSupport = config.php.zlib or true;
|
||||
opensslSupport = config.php.openssl or true;
|
||||
mbstringSupport = config.php.mbstring or true;
|
||||
gdSupport = config.php.gd or true;
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
iniFile=$out/etc/php-recommended.ini
|
||||
[[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
|
||||
./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
|
||||
echo configurePhase end
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
unset installPhase; installPhase;
|
||||
cp php.ini-${ if builtins.lessThan (builtins.compareVersions version "5.3") 0
|
||||
then "recommended" /* < PHP 5.3 */
|
||||
else "production" /* >= PHP 5.3 */
|
||||
} $iniFile
|
||||
'';
|
||||
|
||||
src = args.fetchurl {
|
||||
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
|
||||
sha256 = "0v0i7zjp1a2c60imn58xjqcczmiglnfnwdkgwl0bfai4xh9yn6z8";
|
||||
name = "php-${version}.tar.bz2";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "The PHP language runtime engine";
|
||||
homepage = http://www.php.net/;
|
||||
license = "PHP-3";
|
||||
};
|
||||
|
||||
patches = [./fix.patch];
|
||||
|
||||
})
|
||||
|
|
@ -1,22 +1,20 @@
|
|||
args: with args;
|
||||
{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
|
||||
, apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql
|
||||
, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng }:
|
||||
|
||||
let
|
||||
composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
|
||||
|
||||
inherit (args.composableDerivation) composableDerivation edf wwf;
|
||||
|
||||
in
|
||||
|
||||
composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
|
||||
|
||||
version = "5.3.15";
|
||||
version = "5.3.17";
|
||||
|
||||
name = "php-${version}";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = ["flex" "bison" "pkgconfig"];
|
||||
|
||||
flags = {
|
||||
|
||||
# much left to do here...
|
||||
# much left to do here...
|
||||
|
||||
# SAPI modules:
|
||||
|
||||
|
|
@ -28,12 +26,12 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
|
|||
# Extensions
|
||||
|
||||
curl = {
|
||||
configureFlags = ["--with-curl=${args.curl}" "--with-curlwrappers"];
|
||||
configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"];
|
||||
buildInputs = [curl openssl];
|
||||
};
|
||||
|
||||
zlib = {
|
||||
configureFlags = ["--with-zlib=${args.zlib}"];
|
||||
configureFlags = ["--with-zlib=${zlib}"];
|
||||
buildInputs = [zlib];
|
||||
};
|
||||
|
||||
|
|
@ -86,7 +84,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
|
|||
};
|
||||
|
||||
gd = {
|
||||
configureFlags = ["--with-gd=${args.gd}"];
|
||||
configureFlags = ["--with-gd=${gd}"];
|
||||
buildInputs = [gd libpng libjpeg ];
|
||||
};
|
||||
|
||||
|
|
@ -99,7 +97,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
|
|||
};
|
||||
|
||||
openssl = {
|
||||
configureFlags = ["--with-openssl=${args.openssl}"];
|
||||
configureFlags = ["--with-openssl=${openssl}"];
|
||||
buildInputs = ["openssl"];
|
||||
};
|
||||
|
||||
|
|
@ -152,9 +150,9 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
|
|||
cp php.ini-production $iniFile
|
||||
'';
|
||||
|
||||
src = args.fetchurl {
|
||||
src = fetchurl {
|
||||
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
|
||||
sha256 = "1vzij845n2akh2lkpacgdc5r0f7nw6pk9l9vi1h8l8k4krjjbdzr";
|
||||
sha256 = "02bmjlznnfhxhyd4wvk8ky9vpqwl9rbyng803r7ygf84sibyi1dd";
|
||||
name = "php-${version}.tar.bz2";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2750,21 +2750,7 @@ let
|
|||
|
||||
perl = if system != "i686-cygwin" then perl514 else sysPerl;
|
||||
|
||||
php = php5_3;
|
||||
|
||||
php5_2 = makeOverridable (import ../development/interpreters/php/5.2.nix) {
|
||||
inherit
|
||||
stdenv fetchurl lib composableDerivation autoconf automake
|
||||
flex bison apacheHttpd mysql libxml2 readline
|
||||
zlib curl gd postgresql openssl pkgconfig sqlite config libiconv libjpeg libpng;
|
||||
};
|
||||
|
||||
php5_3 = makeOverridable (import ../development/interpreters/php/5.3.nix) {
|
||||
inherit
|
||||
stdenv fetchurl lib composableDerivation autoconf automake
|
||||
flex bison apacheHttpd mysql libxml2 readline
|
||||
zlib curl gd postgresql openssl pkgconfig sqlite config libiconv libjpeg libpng;
|
||||
};
|
||||
php = callPackage ../development/interpreters/php/5.3.nix { };
|
||||
|
||||
php_apc = callPackage ../development/libraries/php-apc { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue