From 14483c0bf9326fda1c592da53b3df43081d3f159 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Fri, 14 Dec 2012 18:24:41 +0100
Subject: [PATCH] update nixos channel path

---
 doc/manual/installation.xml                           | 2 +-
 maintainers/scripts/ec2/create-ebs-amis.py            | 2 +-
 modules/installer/cd-dvd/system-tarball-pc-readme.txt | 2 +-
 modules/programs/bash/profile.sh                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 0a69ce0ecba..6f19cc1a0b8 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -326,7 +326,7 @@ packages.</para>
 some reason this is not the case, just do
 
 <screen>
-$ nix-channel --add http://nixos.org/releases/nixos/channels/nixos-unstable
+$ nix-channel --add http://nixos.org/channels/nixos-unstable
 </screen>
 
 You can then upgrade NixOS to the latest version in the channel by
diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index 939bd30942d..4dfaa9f3b12 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -52,7 +52,7 @@ m.run_command("mkdir -p /mnt")
 m.run_command("mount {0} /mnt".format(device))
 m.run_command("touch /mnt/.ebs")
 m.run_command("mkdir -p /mnt/etc/nixos")
-m.run_command("nix-channel --add http://nixos.org/releases/nixos/channels/nixos-unstable")
+m.run_command("nix-channel --add http://nixos.org/channels/nixos-unstable")
 m.run_command("nix-channel --update")
 m.run_command("nixos-rebuild switch")
 version = m.run_command("nixos-version", capture_stdout=True).replace('"', '').rstrip()
diff --git a/modules/installer/cd-dvd/system-tarball-pc-readme.txt b/modules/installer/cd-dvd/system-tarball-pc-readme.txt
index c4a0a111cd3..8f0a8d355c6 100644
--- a/modules/installer/cd-dvd/system-tarball-pc-readme.txt
+++ b/modules/installer/cd-dvd/system-tarball-pc-readme.txt
@@ -80,7 +80,7 @@ had booted this nixos. Run:
 *  `grep local-cmds run/current-system/init`
 
 Then you can proceed normally subscribing to a nixos channel:
-  nix-channel --add http://nixos.org/releases/nixos/channels/nixos-unstable
+  nix-channel --add http://nixos.org/channels/nixos-unstable
   nix-channel --update
 
 Testing:
diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 1eef2a9e84a..5393a88d5ff 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -87,7 +87,7 @@ fi
 
 # Subscribe the root user to the NixOS channel by default.
 if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
-    echo "http://nixos.org/releases/nixos/channels/nixos-unstable nixos" > $HOME/.nix-channels
+    echo "http://nixos.org/channels/nixos-unstable nixos" > $HOME/.nix-channels
 fi
 
 # Create the per-user garbage collector roots directory.