Merge pull request #6187 from abbradar/notes-unstable

Add release-notes for unstable revision

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" />

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>

pkgs/top-level/all-packages.nix

@@ -9638,7 +9638,6 @@ let
     stdenv = overrideCC stdenv gcc49;
     pulseSupport = config.pulseaudio or false;
   };
-  cmplayer = bomi;
 
   cmus = callPackage ../applications/audio/cmus { };
 
@@ -12185,14 +12184,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 { };