From 540e3a63e493ff0178cbc8e31f9247d7b9fcabfa Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 6 Feb 2015 01:41:58 +0300
Subject: [PATCH 1/2] manual/release-notes: add unstable release notes with
 first entries

---
 .../manual/release-notes/release-notes.xml    |  4 +-
 .../doc/manual/release-notes/rl-unstable.xml  | 41 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 nixos/doc/manual/release-notes/rl-unstable.xml

diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 231a3b4c2e2..a988a5b0199 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -7,9 +7,11 @@
 <title>Release Notes</title>
 
 <partintro>
-<para>This section lists the release notes for each stable version of NixOS.</para>
+<para>This section lists the release notes for each stable version of NixOS
+and current unstable revision.</para>
 </partintro>
 
+<xi:include href="rl-unstable.xml" />
 <xi:include href="rl-1412.xml" />
 <xi:include href="rl-1404.xml" />
 <xi:include href="rl-1310.xml" />
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
new file mode 100644
index 00000000000..34ffe1d6d32
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -0,0 +1,41 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-release-unstable">
+
+<title>Unstable revision</title>
+
+<para>In addition to numerous new and upgraded packages, this release has the following highlights:
+
+<!--<itemizedlist>
+
+</itemizedlist>-->
+</para>
+
+<para>Following new services were added since the last release:
+
+<!--<itemizedlist>
+
+</itemizedlist>-->
+</para>
+
+<para>When upgrading from a previous release, please be aware of the
+following incompatible changes:
+
+<itemizedlist>
+
+<listitem><para>Steam now doesn't need root rights to work. Instead of using
+<literal>*-steam-chrootenv</literal>, you should now just run <literal>steam</literal>.
+<literal>steamChrootEnv</literal> package was renamed to <literal>steam</literal>,
+and old <literal>steam</literal> package -- to <literal>steamOriginal</literal>.
+</para></listitem>
+
+<listitem><para>CMPlayer has been renamed to bomi upstream. Package <literal>cmplayer</literal>
+was accordingly renamed to <literal>bomi</literal>
+</para></listitem>
+
+</itemizedlist>
+</para>
+
+</chapter>

From 4b1a60b7b157f28685b5faee131dfd52552842d4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 6 Feb 2015 01:42:50 +0300
Subject: [PATCH 2/2] remove old aliases of some packages

---
 pkgs/top-level/all-packages.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36dd0f295b9..8c630ef430f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9619,7 +9619,6 @@ let
     stdenv = overrideCC stdenv gcc49;
     pulseSupport = config.pulseaudio or false;
   };
-  cmplayer = bomi;
 
   cmus = callPackage ../applications/audio/cmus { };
 
@@ -12166,14 +12165,6 @@ let
 
   steam = callPackage ../games/steam/chrootenv.nix { };
 
-  steamChrootEnv = steam.overrideDerivation (args: {
-    buildCommand = ''
-      ${args.buildCommand}
-      echo >&2 "'steamChrootEnv' is replaced with 'steam' now"
-      echo >&2 "You now need just to run 'steam' without root rights"
-    '';
-  });
-
   stuntrally = callPackage ../games/stuntrally { };
 
   superTux = callPackage ../games/super-tux { };