From 40af20b4724f61a3b36b317a680594cdc6b1084c Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 9 Jun 2019 11:14:43 +0200
Subject: [PATCH] php: Upgrade to php73 as default php
---
nixos/doc/manual/release-notes/rl-1909.xml | 5 +++++
pkgs/top-level/all-packages.nix | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index cf3309a8f4e5..951040a0648f 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -23,6 +23,11 @@
End of support is planned for end of April 2020, handing over to 20.03.
</para>
</listitem>
+ <listitem>
+ <para>
+ PHP now defaults to PHP 7.3, updated from 7.2.
+ </para>
+ </listitem>
</itemizedlist>
</section>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84d917988b88..98a28d0318a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8391,8 +8391,8 @@ in
pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
- php = php72;
- phpPackages = php72Packages;
+ php = php73;
+ phpPackages = php73Packages;
php71Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
php = php71;
@@ -8427,7 +8427,7 @@ in
php72
php73;
- php-embed = php72-embed;
+ php-embed = php73-embed;
php71-embed = php71.override {
config.php.embed = true;
@@ -8444,7 +8444,7 @@ in
config.php.apxs2 = false;
};
- php-unit = php72-unit;
+ php-unit = php73-unit;
php71-unit = php71.override {
config.php.embed = true;