summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2017-04-03 15:33:32 +0200
committerGitHub <noreply@github.com>2017-04-03 15:33:32 +0200
commitb0d07aa894007a52466b06eced06c1eee469ee1c (patch)
tree768fafa664bf3d7aeb655d99c44baa58eaff1e34
parentc7453084ef71e286699b7414894178e5559f5563 (diff)
parent72070e6dfce2dfc4dcd1bd567eadc39878497db7 (diff)
downloadnixpkgs-b0d07aa894007a52466b06eced06c1eee469ee1c.tar
nixpkgs-b0d07aa894007a52466b06eced06c1eee469ee1c.tar.gz
nixpkgs-b0d07aa894007a52466b06eced06c1eee469ee1c.tar.bz2
nixpkgs-b0d07aa894007a52466b06eced06c1eee469ee1c.tar.lz
nixpkgs-b0d07aa894007a52466b06eced06c1eee469ee1c.tar.xz
nixpkgs-b0d07aa894007a52466b06eced06c1eee469ee1c.tar.zst
nixpkgs-b0d07aa894007a52466b06eced06c1eee469ee1c.zip
Merge pull request #24533 from Zimmi48/patch-1
[doc] improve "getting the sources" chapter
-rw-r--r--nixos/doc/manual/development/sources.xml10
1 files changed, 7 insertions, 3 deletions
diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml
index 0b2528e9a77..a2896cd7a13 100644
--- a/nixos/doc/manual/development/sources.xml
+++ b/nixos/doc/manual/development/sources.xml
@@ -8,7 +8,7 @@
 
 <para>By default, NixOS’s <command>nixos-rebuild</command> command
 uses the NixOS and Nixpkgs sources provided by the
-<literal>nixos-unstable</literal> channel (kept in
+<literal>nixos</literal> channel (kept in
 <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>).
 To modify NixOS, however, you should check out the latest sources from
 Git.  This is as follows:
@@ -41,7 +41,7 @@ branch based on your current NixOS version:
 $ nixos-version
 17.09pre104379.6e0b727 (Hummingbird)
 
-$ git checkout -b local e3938c8
+$ git checkout -b local 6e0b727
 </screen>
 
 Or, to base your local branch on the latest version available in a
@@ -87,7 +87,11 @@ $ ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs
 
 You may want to delete the symlink
 <filename>~/.nix-defexpr/channels_root</filename> to prevent root’s
-NixOS channel from clashing with your own tree.</para>
+NixOS channel from clashing with your own tree (this may break the
+command-not-found utility though). If you want to go back to the default
+state, you may just remove the <filename>~/.nix-defexpr</filename>
+directory completely, log out and log in again and it should have been
+recreated with a link to the root channels.</para>
 
 <!-- FIXME: not sure what this means.
 <para>You should not pass the base directory