summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2017-02-13 22:43:40 +0100
committerRobin Gloster <mail@glob.in>2017-02-13 22:48:45 +0100
commit7e5424ac0913e1f890fb8227c8e4790dbf098cb0 (patch)
tree9de356b6b750166b707b4044d9424c3d21fea5f6
parent7b6a88c95e99c29e6d89ff4e34beac701c1f0681 (diff)
php: default to php71
-rw-r--r--nixos/doc/manual/release-notes/rl-1703.xml4
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 5 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 37173ccd7442..51de93db92f2 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -21,6 +21,10 @@ has the following highlights: </para>
<literal>ati_unfree</literal> keeps forcing 1.17
and <literal>amdgpu-pro</literal> starts forcing 1.18.</para>
</listitem>
+
+ <listitem>
+ <para>PHP now defaults to PHP 7.1</para>
+ </listitem>
</itemizedlist>
<para>The following new services were added since the last release:</para>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30694dc8740d..33273481cd47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5792,7 +5792,7 @@ with pkgs;
pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
- php = php70;
+ php = php71;
phpPackages = php70Packages;