From fecad91b67ee3523a6d8c0ea16ab71925ab6ab6e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Sep 2013 11:21:30 +0200
Subject: [PATCH] Update release notes

---
 doc/manual/release-notes.xml | 38 +++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml
index 6620ef26c..6a0ba68fe 100644
--- a/doc/manual/release-notes.xml
+++ b/doc/manual/release-notes.xml
@@ -8,7 +8,7 @@
 
 <!--==================================================================-->
 
-<section xml:id="ssec-relnotes-1.6.0"><title>Release 1.6.0 (TBA)</title>
+<section xml:id="ssec-relnotes-1.6.0"><title>Release 1.6.0 (September 10, 2013)</title>
 
 <para>In addition to the usual bug fixes, this release has several new
 features:</para>
@@ -41,6 +41,38 @@ features:</para>
     from your regular shells.</para>
   </listitem>
 
+  <listitem>
+    <para><command>nix-env</command> no longer requires a
+    <literal>*</literal> argument to match all packages, so
+    <literal>nix-env -qa</literal> is equivalent to <literal>nix-env
+    -qa '*'</literal>.</para>
+  </listitem>
+
+  <listitem>
+    <para><command>nix-env -i</command> has a new flag
+    <option>--remove-all</option> (<option>-r</option>) to remove all
+    previous packages from the profile.  This makes it easier to do
+    declarative package management similar to NixOS’s
+    <option>environment.systemPackages</option>.  For instance, if you
+    have a specification <filename>my-packages.nix</filename> like this:
+
+<programlisting>
+with import &lt;nixpkgs> {};
+[ thunderbird
+  geeqie
+  ...
+]
+</programlisting>
+
+    then after any change to this file, you can run:
+
+<screen>
+$ nix-env -f my-packages.nix -ir
+</screen>
+
+    to update your profile to match the specification.</para>
+  </listitem>
+
   <listitem>
     <para>The ‘<literal>with</literal>’ language construct is now more
     lazy.  It only evaluates its argument if a variable might actually
@@ -92,6 +124,10 @@ in pkgs.bar
 
 </itemizedlist>
 
+<para>This release has contributions from Domen Kožar, Eelco Dolstra,
+Florian Friesdorf, Gergely Risko, Ivan Kozik, Ludovic Courtès and Shea
+Levy.</para>
+
 </section>