diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml
index 3ac07da19f12..879a31e32c59 100644
--- a/nixos/doc/manual/development/sources.xml
+++ b/nixos/doc/manual/development/sources.xml
@@ -24,6 +24,9 @@ $ mkdir -p /my/sources
$ cd /my/sources
$ nix-env -i git
$ git clone git://github.com/NixOS/nixpkgs.git
+$ cd nixpkgs
+$ git remote add channels git://github.com/NixOS/nixpkgs-channels.git
+$ git remote update channels
This will check out the latest NixOS sources to
@@ -31,7 +34,12 @@ This will check out the latest NixOS sources to
and the Nixpkgs sources to
/my/sources/nixpkgs.
(The NixOS source tree lives in a subdirectory of the Nixpkgs
-repository.)
+repository.) The remote channels refers to a
+read-only repository that tracks the Nixpkgs/NixOS channels (see for more information about channels). Thus,
+the Git branch channels/nixos-14.12 will contain
+the latest built and tested version available in the
+nixos-14.12 channel.
It’s often inconvenient to develop directly on the master
branch, since if somebody has just committed (say) a change to GCC,
@@ -40,28 +48,32 @@ rebuild everything from source. So you may want to create a local
branch based on your current NixOS version:
-$ /my/sources/nixpkgs/maintainers/scripts/update-channel-branches.sh
-Fetching channels from https://nixos.org/channels:
- * [new branch] cbe467e -> channels/remotes/nixos-unstable
-Fetching channels from nixos-version:
- * [new branch] 9ff4738 -> channels/current-system
-Fetching channels from ~/.nix-defexpr:
- * [new branch] 0d4acad -> channels/root/nixos
-$ git checkout -b local channels/current-system
+$ nixos-version
+14.04.273.ea1952b (Baboon)
+
+$ git checkout -b local ea1952b
-Or, to base your local branch on the latest version available in the
+Or, to base your local branch on the latest version available in a
NixOS channel:
-$ /my/sources/nixpkgs/maintainers/scripts/update-channel-branches.sh
-$ git checkout -b local channels/remotes/nixos-unstable
+$ git remote update channels
+$ git checkout -b local channels/nixos-14.12
-You can then use git rebase to sync your local
-branch with the upstream branch, and use git
-cherry-pick to copy commits from your local branch to the
-upstream branch.
+(Replace nixos-14.12 with the name of the channel
+you want to use.) You can use git merge or
+git rebase to keep your local branch in sync with
+the channel, e.g.
+
+
+$ git remote update channels
+$ git merge channels/nixos-14.12
+
+
+You can use git cherry-pick to copy commits from
+your local branch to the upstream branch.
If you want to rebuild your system using your (modified)
sources, you need to tell nixos-rebuild about them