about summary refs log tree commit diff
path: root/nixos/doc/manual/release-notes
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-02-13 16:42:48 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-02-13 16:42:55 +0200
commit1a06373c0a9572791df7cbec9773aa79c620e2a5 (patch)
tree10a02dd501b12a43a4824eb7d20ef714514b9ce4 /nixos/doc/manual/release-notes
parenteb862c48ddc288243c5447e8decc623b10ef165c (diff)
parent68052b56195715185efed7ccb91733cb4ae5d5f2 (diff)
downloadnixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar
nixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.gz
nixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.bz2
nixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.lz
nixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.xz
nixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.zst
nixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.zip
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/libraries/libclc/default.nix
	pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixos/doc/manual/release-notes')
-rw-r--r--nixos/doc/manual/release-notes/rl-1803.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index 9121c21a8690..f2a1bde19c76 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>
@@ -207,6 +211,12 @@ following incompatible changes:</para>
       </listitem>
     </itemizedlist>
   </listitem>
+  <listitem>
+    <para>
+      The <literal>jid</literal> package has been removed, due to maintenance
+      overhead of a go package having non-versioned dependencies.
+    </para>
+  </listitem>
 </itemizedlist>
 
 </section>