Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
Merge pull request #82338 from etu/php-package-updates
Browse files Browse the repository at this point in the history
 php73: 7.3.14 -> 7.3.15, php72: 7.2.27 -> 7.2.28, php: php73 -> php74
  • Loading branch information
Ma27 committed Mar 11, 2020
2 parents bb3c4c8 + a04010b commit eebe76f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
5 changes: 5 additions & 0 deletions nixos/doc/manual/release-notes/rl-2009.xml
Expand Up @@ -23,6 +23,11 @@
Support is planned until the end of April 2021, handing over to 21.03.
</para>
</listitem>
<listitem>
<para>
PHP now defaults to PHP 7.4, updated from 7.3.
</para>
</listitem>
</itemizedlist>
</section>

Expand Down
8 changes: 4 additions & 4 deletions pkgs/development/interpreters/php/default.nix
Expand Up @@ -295,16 +295,16 @@ let

in {
php72 = generic' {
version = "7.2.27";
sha256 = "0jbhc8x2i6xx6p7zc30ahg9xplsqlz334m1w13mhr1qv2xdnkh2v";
version = "7.2.28";
sha256 = "18sjvl67z5a2x5s2a36g6ls1r3m4hbrsw52hqr2qsgfvg5dkm5bw";

# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
};

php73 = generic' {
version = "7.3.14";
sha256 = "0wn2qsfrnch90l8nxbpcjd2q0ijzdiiyhvcpbycngki9r6xwppxr";
version = "7.3.15";
sha256 = "0g84hws15s8gh8iq4h6q747dyfazx47vh3da3whz8d80x83ibgld";

# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
Expand Down
10 changes: 5 additions & 5 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -9293,8 +9293,8 @@ in

pachyderm = callPackage ../applications/networking/cluster/pachyderm { };

php = php73;
phpPackages = php73Packages;
php = php74;
phpPackages = php74Packages;

php72Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
php = php72;
Expand All @@ -9308,7 +9308,7 @@ in
php = php74;
});

phpPackages-unit = php72Packages-unit;
phpPackages-unit = php74Packages-unit;

php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
php = php72-unit;
Expand All @@ -9329,7 +9329,7 @@ in
php73
php72;

php-embed = php73-embed;
php-embed = php74-embed;

php72-embed = php72.override {
config.php.embed = true;
Expand All @@ -9346,7 +9346,7 @@ in
config.php.apxs2 = false;
};

php-unit = php73-unit;
php-unit = php74-unit;

php72-unit = php72.override {
config.php.embed = true;
Expand Down

0 comments on commit eebe76f

Please sign in to comment.