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

Merge pull request #82338 from etu/php-package-updates

Browse Source 
php73: 7.3.14 -> 7.3.15, php72: 7.2.27 -> 7.2.28, php: php73 -> php74
This commit is contained in:
Maximilian Bosch 2020-03-11 21:15:58 +01:00 committed by GitHub
commit eebe76f1e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/doc/manual/release-notes/rl-2009.xml
View File

@ -23,6 +23,11 @@
Support is planned until the end of April 2021, handing over to 21.03. Support is planned until the end of April 2021, handing over to 21.03.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
PHP now defaults to PHP 7.4, updated from 7.3.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

8
pkgs/development/interpreters/php/default.nix
View File

@ -295,16 +295,16 @@ let
in { in {
php72 = generic' { php72 = generic' {
version = "7.2.27"; version = "7.2.28";
sha256 = "0jbhc8x2i6xx6p7zc30ahg9xplsqlz334m1w13mhr1qv2xdnkh2v"; sha256 = "18sjvl67z5a2x5s2a36g6ls1r3m4hbrsw52hqr2qsgfvg5dkm5bw";
# https://bugs.php.net/bug.php?id=76826 # https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
}; };
php73 = generic' { php73 = generic' {
version = "7.3.14"; version = "7.3.15";
sha256 = "0wn2qsfrnch90l8nxbpcjd2q0ijzdiiyhvcpbycngki9r6xwppxr"; sha256 = "0g84hws15s8gh8iq4h6q747dyfazx47vh3da3whz8d80x83ibgld";
# https://bugs.php.net/bug.php?id=76826 # https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;

10
pkgs/top-level/all-packages.nix
View File

@ -9293,8 +9293,8 @@ in
pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
php = php73; php = php74;
phpPackages = php73Packages; phpPackages = php74Packages;
php72Packages = recurseIntoAttrs (callPackage ./php-packages.nix { php72Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
php = php72; php = php72;
@ -9308,7 +9308,7 @@ in
php = php74; php = php74;
}); });
phpPackages-unit = php72Packages-unit; phpPackages-unit = php74Packages-unit;
php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
php = php72-unit; php = php72-unit;
@ -9329,7 +9329,7 @@ in
php73 php73
php72; php72;
php-embed = php73-embed; php-embed = php74-embed;
php72-embed = php72.override { php72-embed = php72.override {
config.php.embed = true; config.php.embed = true;
@ -9346,7 +9346,7 @@ in
config.php.apxs2 = false; config.php.apxs2 = false;
}; };
php-unit = php73-unit; php-unit = php74-unit;
php72-unit = php72.override { php72-unit = php72.override {
config.php.embed = true; config.php.embed = true;