Browse files

* URL updates.

svn path=/nixos/trunk/; revision=11801
  • Loading branch information...
1 parent c612af3 commit cc7f3c7aaaee4745fe56d199decfc88329d71e94 @edolstra edolstra committed May 9, 2008
Showing with 12 additions and 12 deletions.
  1. +1 −1 README
  2. +6 −6 doc/manual/installation.xml
  3. +1 −1 installer/nixos-checkout.sh
  4. +4 −4 system/options.nix
View
2 README
@@ -2,4 +2,4 @@
NixOS is a Linux distribution based on the purely functional package
management system Nix. More information can be found at
-http://nix.cs.uu.nl/nixos and in the manual in doc/manual.
+http://nixos.org/nixos and in the manual in doc/manual.
View
12 doc/manual/installation.xml
@@ -11,14 +11,14 @@
<title>Building the installation CD</title>
<para>Instead of building an installation CD, you could just download
-one from <link xlink:href="http://nix.cs.uu.nl/nixos/"/>. If you want
+one from <link xlink:href="http://nixos.org/nixos/"/>. If you want
(or need) to build it yourself:
<orderedlist>
<listitem><para>Make sure that you have a <emphasis>very</emphasis>
recent pre-release version of Nix installed (<link
- xlink:href="http://nix.cs.uu.nl/dist/nix/nix-unstable-latest/"/>).
+ xlink:href="http://nixos.org/releases/nix/nix-unstable/"/>).
The NixOS Nix expressions frequently use bleeding-edge features. If
you get any kind of expression evaluation error, try to upgrade your
Nix.</para></listitem>
@@ -29,18 +29,18 @@ one from <link xlink:href="http://nix.cs.uu.nl/nixos/"/>. If you want
channel to speed up building, i.e.,
<screen>
-$ nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
+$ nix-channel --add http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable
$ nix-channel --update</screen>
</para></listitem>
<listitem><para>Check out NixOS from <link
- xlink:href="https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk"/> as
+ xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk"/> as
<literal>nixos</literal>.</para></listitem>
<listitem><para>If you don’t already have Nixpkgs checkout, Check
out Nixpkgs from <link
- xlink:href="https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk"/> as
+ xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk"/> as
<literal>nixpkgs</literal>.</para></listitem>
<listitem><para>In the directory <literal>nixos</literal>, make a
@@ -174,7 +174,7 @@ $ nixos-hardware-scan > /mnt/etc/nixos/configuration.nix</screen>
<para>More examples of NixOS configurations for some actual
machines can be found at <link
- xlink:href="https://svn.cs.uu.nl:12443/repos/trace/configurations/trunk/"/>.</para>
+ xlink:href="https://svn.nixos.org/repos/nix/configurations/trunk/"/>.</para>
<note><para>It is very important that you specify in the option
<option>boot.initrd.extraKernelModules</option> all kernel modules
View
2 installer/nixos-checkout.sh
@@ -16,7 +16,7 @@ fi
# Obtain Subversion.
if test -z "$(type -tp svn)"; then
- #nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
+ #nix-channel --add http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable
#nix-channel --update
nix-env -i subversion
fi
View
8 system/options.nix
@@ -2014,18 +2014,18 @@
nixpkgsURL = mkOption {
default = "";
- example = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7577;
+ example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
description = "
URL of the Nixpkgs distribution to use when building the
installation CD.
";
};
manifests = mkOption {
- default = [http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable/MANIFEST];
+ default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST];
example =
- [ http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable/MANIFEST
- http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-stable/MANIFEST
+ [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
+ http://nixos.org/releases/nixpkgs/channels/nixpkgs-stable/MANIFEST
];
description = "
URLs of manifests to be downloaded when you run

0 comments on commit cc7f3c7

Please sign in to comment.