summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-02-27 16:22:37 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-02-27 16:22:37 +0100
commitd10c2012523a365e3cfe4547fac01aed3facc317 (patch)
tree9835890e8c4a324559465866d4b2712fc80bc50d /nixos
parentf3abbf32b06e8ac772316771f2a3a065d9030243 (diff)
parent91426ac23b254408748409f85601173ff40d13e3 (diff)
downloadnixlib-d10c2012523a365e3cfe4547fac01aed3facc317.tar
nixlib-d10c2012523a365e3cfe4547fac01aed3facc317.tar.gz
nixlib-d10c2012523a365e3cfe4547fac01aed3facc317.tar.bz2
nixlib-d10c2012523a365e3cfe4547fac01aed3facc317.tar.lz
nixlib-d10c2012523a365e3cfe4547fac01aed3facc317.tar.xz
nixlib-d10c2012523a365e3cfe4547fac01aed3facc317.tar.zst
nixlib-d10c2012523a365e3cfe4547fac01aed3facc317.zip
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/release-notes/rl-1803.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index db19e27bb6f6..29b252753830 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -290,6 +290,12 @@ following incompatible changes:</para>
       </itemizedlist>
     </para>
   </listitem>
+  <listitem>
+    <para>
+      <literal>nodejs-4_x</literal> is end-of-life.
+      <literal>nodejs-4_x</literal>, <literal>nodejs-slim-4_x</literal> and <literal>nodePackages_4_x</literal> are removed.
+    </para>
+  </listitem>
 </itemizedlist>
 
 </section>