From a9a8baaccbe1c8291d0cfd42fe3c87377b105381 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Nov 2012 13:33:35 +0100
Subject: [PATCH] Use a shorter Nixpkgs channel URL

---
 doc/manual/nix-channel.xml        | 2 +-
 doc/manual/package-management.xml | 2 +-
 doc/manual/quick-start.xml        | 2 +-
 scripts/nix-profile.sh.in         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/manual/nix-channel.xml b/doc/manual/nix-channel.xml
index 68dcfd45d4..2c4e1151b0 100644
--- a/doc/manual/nix-channel.xml
+++ b/doc/manual/nix-channel.xml
@@ -103,7 +103,7 @@ respectively.</para>
 <para>To subscribe to the Nixpkgs channel and install the GNU Hello package:</para>
 
 <screen>
-$ nix-channel --add http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable
+$ nix-channel --add http://nixos.org/channels/nixpkgs-unstable
 $ nix-channel --update
 $ nix-env -iA nixpkgs.hello</screen>
 
diff --git a/doc/manual/package-management.xml b/doc/manual/package-management.xml
index 314218daf3..ca19b13258 100644
--- a/doc/manual/package-management.xml
+++ b/doc/manual/package-management.xml
@@ -443,7 +443,7 @@ URL.</para>
 <command>nix-channel --add</command>, e.g.,
 
 <screen>
-$ nix-channel --add http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable</screen>
+$ nix-channel --add http://nixos.org/channels/nixpkgs-unstable</screen>
 
 subscribes you to a channel that always contains that latest version
 of the Nix Packages collection.  (Instead of
diff --git a/doc/manual/quick-start.xml b/doc/manual/quick-start.xml
index bc43dea618..606a93ad56 100644
--- a/doc/manual/quick-start.xml
+++ b/doc/manual/quick-start.xml
@@ -41,7 +41,7 @@ file).</para></listitem>
 <listitem><para>Subscribe to the Nix Packages channel.
 
 <screen>
-$ nix-channel --add http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable</screen>
+$ nix-channel --add http://nixos.org/channels/nixpkgs-unstable</screen>
 
 </para></listitem>
 
diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
index ed49a892d9..16eb754c5d 100644
--- a/scripts/nix-profile.sh.in
+++ b/scripts/nix-profile.sh.in
@@ -10,7 +10,7 @@ if test -n "$HOME"; then
 
     # Subscribe the root user to the Nixpkgs channel by default.
     if [ ! -e $HOME/.nix-channels ]; then
-        echo "http://nixos.org/releases/nixos/channels/nixpkgs-unstable nixpkgs" > $HOME/.nix-channels
+        echo "http://nixos.org/channels/nixpkgs-unstable nixpkgs" > $HOME/.nix-channels
     fi
 
     export PATH=$NIX_LINK/bin:$PATH