diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml index ed5348829c8b..8bde2f6e0530 100644 --- a/doc/manual/installation.xml +++ b/doc/manual/installation.xml @@ -322,7 +322,7 @@ packages. some reason this is not the case, just do -$ nix-channel --add http://nixos.org/releases/nixos/channels/nixos-unstable +$ nix-channel --add http://nixos.org/channels/nixos-unstable 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 939bd30942dc..4dfaa9f3b129 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/tools/tools.nix b/modules/installer/tools/tools.nix index d7b8766143ac..c3bbfd953f39 100644 --- a/modules/installer/tools/tools.nix +++ b/modules/installer/tools/tools.nix @@ -84,8 +84,9 @@ in { options = { + # FIXME: remove this option once we're using Nix 1.2. installer.nixosURL = pkgs.lib.mkOption { - default = http://nixos.org/releases/nixos/channels/nixos-unstable; + default = http://nixos.org/channels/nixos-unstable; example = http://nixos.org/releases/nixos/nixos-0.1pre1234; description = '' URL of the Nixpkgs distribution to use when building the @@ -93,11 +94,12 @@ in ''; }; + # FIXME: idem. installer.manifests = pkgs.lib.mkOption { - default = [ http://nixos.org/releases/nixos/channels/nixos-unstable/MANIFEST ]; + default = [ http://nixos.org/channels/nixos-unstable/MANIFEST ]; example = - [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST - http://nixos.org/releases/nixos/channels/nixos-stable/MANIFEST + [ http://nixos.org/channels/nixpkgs-unstable/MANIFEST + http://nixos.org/channels/nixos-stable/MANIFEST ]; description = '' URLs of manifests to be downloaded when you run diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh index 1eef2a9e84a8..5393a88d5ffe 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. diff --git a/tests/installer.nix b/tests/installer.nix index ad126c128b59..8b695ae5a180 100644 --- a/tests/installer.nix +++ b/tests/installer.nix @@ -79,7 +79,7 @@ let { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; services.httpd.servedDirs = singleton - { urlPath = "/releases/nixos/channels/nixos-unstable"; + { urlPath = "/channels/nixos-unstable"; dir = "/tmp/channel"; }; @@ -114,7 +114,7 @@ let $webserver->succeed("mkdir /tmp/channel"); $webserver->succeed( "nix-push file:///tmp/channel " . - "http://nixos.org/releases/nixos/channels/nixos-unstable " . + "http://nixos.org/channels/nixos-unstable " . "file:///tmp/channel/MANIFEST ${toString channelContents} >&2"); ''}