diff options
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2009.xml | 5 | ||||
-rw-r--r-- | pkgs/development/interpreters/php/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
3 files changed, 14 insertions, 9 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 892208b01d7d..e236b230332f 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -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> diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 77d27dfd42aa..b3a92893a6c2 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07e5c1df68cb..144fb202596e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; @@ -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; @@ -9329,7 +9329,7 @@ in php73 php72; - php-embed = php73-embed; + php-embed = php74-embed; php72-embed = php72.override { config.php.embed = true; @@ -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; |