diff options
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1803.xml | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 8391c550afa..886124b49aa 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -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> diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22ce05089f8..a9b1f04058c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6861,8 +6861,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; @@ -6887,13 +6887,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 {}; |