JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update channel URLs

Browse Source
This commit is contained in:
Eelco Dolstra 2012-11-12 09:18:59 +01:00
parent d5aae18587
commit 08e6c0cb7c
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/manual/installation.xml
View File

@ -322,7 +322,7 @@ packages.</para>
some reason this is not the case, just do some reason this is not the case, just do
<screen> <screen>
$ nix-channel --add http://nixos.org/releases/nixos/channels/nixos-unstable $ nix-channel --add http://nixos.org/channels/nixos-unstable
</screen> </screen>
You can then upgrade NixOS to the latest version in the channel by You can then upgrade NixOS to the latest version in the channel by

2
maintainers/scripts/ec2/create-ebs-amis.py
View File

@ -52,7 +52,7 @@ m.run_command("mkdir -p /mnt")
m.run_command("mount {0} /mnt".format(device)) m.run_command("mount {0} /mnt".format(device))
m.run_command("touch /mnt/.ebs") m.run_command("touch /mnt/.ebs")
m.run_command("mkdir -p /mnt/etc/nixos") 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("nix-channel --update")
m.run_command("nixos-rebuild switch") m.run_command("nixos-rebuild switch")
version = m.run_command("nixos-version", capture_stdout=True).replace('"', '').rstrip() version = m.run_command("nixos-version", capture_stdout=True).replace('"', '').rstrip()

10
modules/installer/tools/tools.nix
View File

@ -84,8 +84,9 @@ in
{ {
options = { options = {
# FIXME: remove this option once we're using Nix 1.2.
installer.nixosURL = pkgs.lib.mkOption { 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; example = http://nixos.org/releases/nixos/nixos-0.1pre1234;
description = '' description = ''
URL of the Nixpkgs distribution to use when building the URL of the Nixpkgs distribution to use when building the
@ -93,11 +94,12 @@ in
''; '';
}; };
# FIXME: idem.
installer.manifests = pkgs.lib.mkOption { installer.manifests = pkgs.lib.mkOption {
default = [ http://nixos.org/releases/nixos/channels/nixos-unstable/MANIFEST ]; default = [ http://nixos.org/channels/nixos-unstable/MANIFEST ];
example = example =
[ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST [ http://nixos.org/channels/nixpkgs-unstable/MANIFEST
http://nixos.org/releases/nixos/channels/nixos-stable/MANIFEST http://nixos.org/channels/nixos-stable/MANIFEST
]; ];
description = '' description = ''
URLs of manifests to be downloaded when you run URLs of manifests to be downloaded when you run

2
modules/programs/bash/profile.sh
View File

@ -87,7 +87,7 @@ fi
# Subscribe the root user to the NixOS channel by default. # Subscribe the root user to the NixOS channel by default.
if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then 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 fi
# Create the per-user garbage collector roots directory. # Create the per-user garbage collector roots directory.

4
tests/installer.nix
View File

@ -79,7 +79,7 @@ let
{ services.httpd.enable = true; { services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org"; services.httpd.adminAddr = "foo@example.org";
services.httpd.servedDirs = singleton services.httpd.servedDirs = singleton
{ urlPath = "/releases/nixos/channels/nixos-unstable"; { urlPath = "/channels/nixos-unstable";
dir = "/tmp/channel"; dir = "/tmp/channel";
}; };
@ -114,7 +114,7 @@ let
$webserver->succeed("mkdir /tmp/channel"); $webserver->succeed("mkdir /tmp/channel");
$webserver->succeed( $webserver->succeed(
"nix-push file:///tmp/channel " . "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"); "file:///tmp/channel/MANIFEST ${toString channelContents} >&2");
''} ''}