diff options
author | Austin Seipp <aseipp@pobox.com> | 2015-07-19 16:57:42 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2015-07-19 16:57:42 -0500 |
commit | 22d5d780277b8964107830ec98aceb4fede30d4a (patch) | |
tree | 0c129bcb6623c8e1b4d21d9b5de85704384cd65c /pkgs/development/interpreters | |
parent | 6475be23bc593f2d7b5266fd827cb6444a0fb3f8 (diff) | |
parent | 5e7850f08838a7823d2a99c48f8f5f0acf61d9cb (diff) | |
download | nixpkgs-22d5d780277b8964107830ec98aceb4fede30d4a.tar nixpkgs-22d5d780277b8964107830ec98aceb4fede30d4a.tar.gz nixpkgs-22d5d780277b8964107830ec98aceb4fede30d4a.tar.bz2 nixpkgs-22d5d780277b8964107830ec98aceb4fede30d4a.tar.lz nixpkgs-22d5d780277b8964107830ec98aceb4fede30d4a.tar.xz nixpkgs-22d5d780277b8964107830ec98aceb4fede30d4a.tar.zst nixpkgs-22d5d780277b8964107830ec98aceb4fede30d4a.zip |
Merge pull request #8871 from mayflower/php7-beta1
php70: init at 7.0beta1
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/php/7.0.nix | 8 | ||||
-rw-r--r-- | pkgs/development/interpreters/php/fix-paths-php7.patch | 23 | ||||
-rw-r--r-- | pkgs/development/interpreters/php/generic.nix | 20 |
3 files changed, 45 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/php/7.0.nix b/pkgs/development/interpreters/php/7.0.nix new file mode 100644 index 00000000000..1369cf4a219 --- /dev/null +++ b/pkgs/development/interpreters/php/7.0.nix @@ -0,0 +1,8 @@ +{ callPackage, apacheHttpd }: +callPackage ./generic.nix { + phpVersion = "7.0.0beta1"; + url = "https://downloads.php.net/~ab/php-7.0.0beta1.tar.bz2"; + sha = "1pj3ysfhswg2r370ivp33fv9zbcl3yvhmxgnc731k08hv6hmd984"; + apacheHttpd = apacheHttpd; + php7 = true; +} diff --git a/pkgs/development/interpreters/php/fix-paths-php7.patch b/pkgs/development/interpreters/php/fix-paths-php7.patch new file mode 100644 index 00000000000..2b9e4ad0ebb --- /dev/null +++ b/pkgs/development/interpreters/php/fix-paths-php7.patch @@ -0,0 +1,23 @@ +--- php-7.0.0beta1/configure 2015-07-10 12:11:41.810045613 +0000 ++++ php-7.0.0beta1-new/configure 2015-07-17 16:10:21.775528267 +0000 +@@ -6172,7 +6172,7 @@ + as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5 + fi + +- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` ++ APXS_LIBEXECDIR="$prefix/modules" + if test -z `$APXS -q SYSCONFDIR`; then + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ +@@ -37303,9 +37303,7 @@ + + + if test "$PHP_GETTEXT" != "no"; then +- for i in $PHP_GETTEXT /usr/local /usr; do +- test -r $i/include/libintl.h && GETTEXT_DIR=$i && break +- done ++ GETTEXT_DIR=$PHP_GETTEXT + + if test -z "$GETTEXT_DIR"; then + as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5 + diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 10f40c4dd2f..e71b6238173 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -4,7 +4,8 @@ , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds , uwimap, pam, gmp -, phpVersion, apacheHttpd, sha }: +, phpVersion, apacheHttpd, sha +, php7 ? false, url ? null }: let libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; @@ -212,7 +213,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) imapSupport = config.php.imap or true; ldapSupport = config.php.ldap or true; mhashSupport = config.php.mhash or true; - mysqlSupport = config.php.mysql or true; + mysqlSupport = (!php7) && (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; @@ -220,7 +221,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) bcmathSupport = config.php.bcmath or true; socketsSupport = config.php.sockets or true; curlSupport = config.php.curl or true; - curlWrappersSupport = config.php.curlWrappers or true; + curlWrappersSupport = (!php7) && (config.php.curlWrappers or true); gettextSupport = config.php.gettext or true; pcntlSupport = config.php.pcntl or true; postgresqlSupport = config.php.postgresql or true; @@ -241,7 +242,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) ftpSupport = config.php.ftp or true; fpmSupport = config.php.fpm or true; gmpSupport = config.php.gmp or true; - mssqlSupport = config.php.mssql or (!stdenv.isDarwin); + mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin)); ztsSupport = config.php.zts or false; calendarSupport = config.php.calendar or true; }; @@ -267,7 +268,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) ''; src = fetchurl { - url = "http://www.php.net/distributions/php-${version}.tar.bz2"; + url = if url == null then + "http://www.php.net/distributions/php-${version}.tar.bz2" + else + url; sha256 = sha; }; @@ -278,6 +282,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) maintainers = with maintainers; [ globin ]; }; - patches = [ ./fix-paths.patch ]; + patches = if !php7 then + [ ./fix-paths.patch ] + else + [ ./fix-paths-php7.patch ] + ; }) |