Merge pull request #34705 from etu/php-upgrade

php: 7.1.14 -> 7.2.2
This commit is contained in:
Franz Pletz 2018-02-13 12:50:45 +00:00 committed by GitHub
commit 08d3754a89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions

View file

@ -38,6 +38,10 @@ has the following highlights: </para>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>PHP now defaults to PHP 7.2</para>
</listitem>
</itemizedlist>
</section>

View file

@ -6902,8 +6902,8 @@ with pkgs;
pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
php = php71;
phpPackages = php71Packages;
php = php72;
phpPackages = php72Packages;
php56Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
php = php56;
@ -6928,13 +6928,17 @@ with pkgs;
php71
php72;
php-embed = php71-embed;
php-embed = php72-embed;
php71-embed = php71.override {
config.php.embed = true;
config.php.apxs2 = false;
};
php72-embed = php72.override {
config.php.embed = true;
config.php.apxs2 = false;
};
picoc = callPackage ../development/interpreters/picoc {};