Merge pull request #32305 from etu/php72

php: add 7.2.0

Changed files
+32 -4
pkgs
development
interpreters
top-level
+12 -1
pkgs/development/interpreters/php/default.nix
···
, mysql, libxml2, readline, zlib, curl, postgresql, gettext
, openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
-
, uwimap, pam, gmp, apacheHttpd, libiconv, systemd }:
let
···
calendar = {
configureFlags = ["--enable-calendar"];
};
};
cfg = {
···
mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin));
ztsSupport = config.php.zts or false;
calendarSupport = config.php.calendar or true;
};
hardeningDisable = [ "bindnow" ];
···
php71 = generic {
version = "7.1.11";
sha256 = "0ww5493w8w3jlks0xqlfm3v6mm53vpnv5vjy63inkj8zf3gdfikn";
};
}
···
, mysql, libxml2, readline, zlib, curl, postgresql, gettext
, openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
+
, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium }:
let
···
calendar = {
configureFlags = ["--enable-calendar"];
};
+
+
sodium = {
+
configureFlags = ["--with-sodium=${libsodium.dev}"];
+
buildInputs = [libsodium];
+
};
};
cfg = {
···
mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin));
ztsSupport = config.php.zts or false;
calendarSupport = config.php.calendar or true;
+
sodiumSupport = (lib.versionAtLeast version "7.2") && config.php.sodium or true;
};
hardeningDisable = [ "bindnow" ];
···
php71 = generic {
version = "7.1.11";
sha256 = "0ww5493w8w3jlks0xqlfm3v6mm53vpnv5vjy63inkj8zf3gdfikn";
+
};
+
+
php72 = generic {
+
version = "7.2.0";
+
sha256 = "0jn642bm4ah6a5cjavpz8mzw3ddxa270fcwxkj3rg6vb4bjgmzib";
};
}
+7 -1
pkgs/top-level/all-packages.nix
···
php = php71;
});
inherit (callPackages ../development/interpreters/php { })
php56
php70
-
php71;
php-embed = php71-embed;
···
php = php71;
});
+
php72Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
+
php = php72;
+
});
+
+
inherit (callPackages ../development/interpreters/php { })
php56
php70
+
php71
+
php72;
php-embed = php71-embed;
+13 -2
pkgs/top-level/php-packages.nix
···
};
isPhpOlder55 = pkgs.lib.versionOlder php.version "5.5";
isPhp7 = pkgs.lib.versionAtLeast php.version "7.0";
apcu = if isPhp7 then apcu51 else apcu40;
···
buildInputs = [ pkgs.spidermonkey_1_8_5 ];
};
-
xdebug = if isPhp7 then xdebug25 else xdebug23;
xdebug23 = assert !isPhp7; buildPecl {
name = "xdebug-2.3.1";
···
checkTarget = "test";
};
-
xdebug25 = buildPecl {
name = "xdebug-2.5.0";
sha256 = "03c9y25a3gc3kpav0cdgmhjixcaly6974hx7wgihi0wlchgavmlb";
doCheck = true;
checkTarget = "test";
···
};
isPhpOlder55 = pkgs.lib.versionOlder php.version "5.5";
isPhp7 = pkgs.lib.versionAtLeast php.version "7.0";
+
isPhp72 = pkgs.lib.versionAtLeast php.version "7.2";
+
isPhpOlder7 = pkgs.lib.versionOlder php.version "7.0";
apcu = if isPhp7 then apcu51 else apcu40;
···
buildInputs = [ pkgs.spidermonkey_1_8_5 ];
};
+
xdebug = if isPhp72 then xdebug26 else if isPhp7 then xdebug25 else xdebug23;
xdebug23 = assert !isPhp7; buildPecl {
name = "xdebug-2.3.1";
···
checkTarget = "test";
};
+
xdebug25 = assert !isPhp72; buildPecl {
name = "xdebug-2.5.0";
sha256 = "03c9y25a3gc3kpav0cdgmhjixcaly6974hx7wgihi0wlchgavmlb";
+
+
doCheck = true;
+
checkTarget = "test";
+
};
+
+
xdebug26 = assert !isPhpOlder7; buildPecl {
+
name = "xdebug-2.6.0beta1";
+
+
sha256 = "0zaj821jbpaqqcbr9a64sa27my9n980pmyy9kxrvvjqq3qg6dpj9";
doCheck = true;
checkTarget = "test";