Merge pull request #216 from ivan/hacking-on-nixos

"Hacking on NixOS": Explain how to use /my/sources with nix-env

doc/manual/development.xml

@@ -48,6 +48,25 @@ $ nixos-rebuild switch -I <replaceable>/my/sources</replaceable>
 
 </para>
 
+<para><command>nixos-rebuild</command> affects only the system profile.
+To install packages to your user profile from expressions in
+<replaceable>/my/sources</replaceable>, use
+<command>nix-env -f <replaceable>/my/sources</replaceable>/nixpkgs</command>,
+or change the default by replacing the symlink in
+<filename>~/.nix-defexpr</filename>:
+
+<screen>
+$ rm -f ~/.nix-defexpr/channels
+$ ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs
+</screen>
+
+</para>
+
+<para>You should not pass the base directory
+<filename><replaceable>/my/sources</replaceable></filename>
+to <command>nix-env</command>, as it will break after interpreting expressions
+in <filename>nixos/</filename> as packages.</para>
+
 </section>
 
 

doc/manual/installation.xml

@@ -152,7 +152,7 @@ $ nixos-option --install</screen>
 $ nixos-checkout</screen>
 
   to make the installer use the latest NixOS/Nixpkgs sources from the
-  Subversion repository, rather than the sources on CD.</para></listitem>
+  Git repository, rather than the sources on CD.</para></listitem>
   -->
 
   <listitem><para>Do the installation:
@@ -315,7 +315,7 @@ available.</para>
 use the <literal>nixos-unstable</literal> channel.  (A channel is a
 Nix mechanism for distributing Nix expressions and associated
 binaries.)  The NixOS channel is updated automatically from NixOS’s
-Subversion repository after running certain tests and building most
+Git repository after running certain tests and building most
 packages.</para>
 
 <para>NixOS automatically subscribes you to the NixOS channel.  If for