diff options
Diffstat (limited to 'doc/manual')
| -rw-r--r-- | doc/manual/nix-pull.xml | 2 | ||||
| -rw-r--r-- | doc/manual/package-management.xml | 15 | ||||
| -rw-r--r-- | doc/manual/quick-start.xml | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/doc/manual/nix-pull.xml b/doc/manual/nix-pull.xml index 2e0723c10877..448ab0065eee 100644 --- a/doc/manual/nix-pull.xml +++ b/doc/manual/nix-pull.xml @@ -36,7 +36,7 @@ <title>Examples</title> <screen> -$ nix-pull http://catamaran.labs.cs.uu.nl/dist/nix/nixpkgs-0.5pre753/MANIFEST</screen> +$ nix-pull http://nix.cs.uu.nl/dist/nix/nixpkgs-0.5pre753/MANIFEST</screen> </refsection> diff --git a/doc/manual/package-management.xml b/doc/manual/package-management.xml index d225b41ee778..7127dd34ead6 100644 --- a/doc/manual/package-management.xml +++ b/doc/manual/package-management.xml @@ -32,8 +32,8 @@ components ranging from basic development stuff such as GCC and Glibc, to end-user applications like Mozilla Firefox. (Nix is however not tied to the Nix Package collection; you could write your own Nix expressions based on it, or completely new ones.) You can download -the latest version from <ulink -url='http://catamaran.labs.cs.uu.nl/dist/nix' />.</para> +the latest version from <ulink url='http://nix.cs.uu.nl/dist/nix' +/>.</para> <para>Assuming that you have downloaded and unpacked a release of Nix Packages, you can view the set of available components in the release: @@ -97,16 +97,15 @@ available somewhere. This is done using the containing a <emphasis>manifest</emphasis> describing what binaries are available. This URL should correspond to the Nix Packages release that you’re using. For instance, if you obtained a release from -<ulink -url='http://catamaran.labs.cs.uu.nl/dist/nix/nixpkgs-0.6pre1554/' />, -then you should do: +<ulink url='http://nix.cs.uu.nl/dist/nix/nixpkgs-0.6pre1554/' />, then +you should do: <screen> -$ nix-pull http://catamaran.labs.cs.uu.nl/dist/nix/nixpkgs-0.6pre1554/MANIFEST</screen> +$ nix-pull http://nix.cs.uu.nl/dist/nix/nixpkgs-0.6pre1554/MANIFEST</screen> If you then issue the installation command, it should start downloading binaries from <systemitem -class='fqdomainname'>catamaran.labs.cs.uu.nl</systemitem>, instead of +class='fqdomainname'>nix.cs.uu.nl</systemitem>, instead of building them from source. This might still take a while since all dependencies must be downloaded, but on a reasonably fast connection such as an DSL line it’s on the order of a few minutes.</para> @@ -425,7 +424,7 @@ URL.</para> <command>nix-channel --add</command>, e.g., <screen> -$ nix-channel --add http://catamaran.labs.cs.uu.nl/dist/nix/channels/nixpkgs-unstable</screen> +$ nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/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 a6433ae42fe9..3ebc49d3b42a 100644 --- a/doc/manual/quick-start.xml +++ b/doc/manual/quick-start.xml @@ -27,7 +27,7 @@ file).</para></listitem> <listitem><para>Subscribe to the Nix Packages channel. <screen> -$ nix-channel --add http://catamaran.labs.cs.uu.nl/dist/nix/channels/nixpkgs-unstable</screen> +$ nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable</screen> </para></listitem> |