puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Updated some URLs (did this a long time ago but forgot to

Browse source 
commit...).
This commit is contained in:
Eelco Dolstra 2008-06-09 13:42:13 +00:00
parent c41a3ec3a9
commit 4ed01ed791
4 changed files with 30 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/manual/build-farm.xml
View file

@ -56,7 +56,7 @@ build farm, since:
<para>TODO</para> <para>TODO</para>
<para>The sources of the Nix build farm are at <link <para>The sources of the Nix build farm are at <link
xlink:href='https://svn.cs.uu.nl:12443/repos/trace/release/trunk'/>.</para> xlink:href='https://svn.nixos.org/repos/nix/release/trunk'/>.</para>
</section> </section>
@ -85,7 +85,7 @@ nix@scratchy.labs.cs.uu.nl i686-linux /home/nix/.ssh/id_scratchy_auto
<para>An example build hook can be found in the Nix build farm <para>An example build hook can be found in the Nix build farm
sources: <link sources: <link
xlink:href='https://svn.cs.uu.nl:12443/repos/trace/release/trunk/common/distributed/build-remote.pl' xlink:href='https://svn.nixos.org/repos/nix/release/trunk/common/distributed/build-remote.pl'
/>. It should be suitable for most purposes, with maybe some minor />. It should be suitable for most purposes, with maybe some minor
adjustments. It uses <command>ssh</command> and adjustments. It uses <command>ssh</command> and
<command>rsync</command> to copy the build inputs and outputs and <command>rsync</command> to copy the build inputs and outputs and

21
doc/manual/installation.xml
View file

@ -42,25 +42,22 @@ platforms as well.</para>
<section><title>Obtaining Nix</title> <section><title>Obtaining Nix</title>
<para>The easiest way to obtain Nix is to download a <link <para>The easiest way to obtain Nix is to download a <link
xlink:href="http://nix.cs.uu.nl/">source distribution</link>. RPMs xlink:href="http://nixos.org/">source distribution</link>. RPMs
for Red Hat, SuSE, and Fedora Core are also available.</para> for Red Hat, SuSE, and Fedora Core are also available.</para>
<para>Alternatively, the most recent sources of Nix can be obtained <para>Alternatively, the most recent sources of Nix can be obtained
from its <link from its <link
xlink:href="https://svn.cs.uu.nl:12443/repos/trace/nix/trunk">Subversion xlink:href="https://svn.nixos.org/repos/nix/nix/trunk">Subversion
repository</link>. For example, the following command will check out repository</link>. For example, the following command will check out
the latest revision into a directory called the latest revision into a directory called
<filename>nix</filename>:</para> <filename>nix</filename>:</para>
<screen> <screen>
$ svn checkout https://svn.cs.uu.nl:12443/repos/trace/nix/trunk nix</screen> $ svn checkout https://svn.nixos.org/repos/nix/nix/trunk nix</screen>
<para>Likewise, specific releases can be obtained from the <link <para>Likewise, specific releases can be obtained from the <link
xlink:href="https://svn.cs.uu.nl:12443/repos/trace/nix/tags">tags xlink:href="https://svn.nixos.org/repos/nix/nix/tags">tags
directory</link> of the repository. If you don't have Subversion, you directory</link> of the repository.</para>
can also download an automatically generated <link
xlink:href="https://svn.cs.uu.nl:12443/dist/trace/">compressed
tar-file</link> of the head revision of the trunk.</para>
</section> </section>
@ -161,7 +158,7 @@ options.</para>
<section><title>Installing from RPMs</title> <section><title>Installing from RPMs</title>
<para>RPM packages of Nix can be downloaded from <link <para>RPM packages of Nix can be downloaded from <link
xlink:href="http://nix.cs.uu.nl/" />. These RPMs should work for most xlink:href="http://nixos.org/" />. These RPMs should work for most
fairly recent releases of SuSE and Red Hat Linux. They have been fairly recent releases of SuSE and Red Hat Linux. They have been
known to work work on SuSE Linux 8.1 and 9.0, and Red Hat 9.0. In known to work work on SuSE Linux 8.1 and 9.0, and Red Hat 9.0. In
fact, it should work on any RPM-based Linux distribution based on fact, it should work on any RPM-based Linux distribution based on
@ -193,12 +190,12 @@ $ rm -rf /nix/var</screen>
<para>You can install the latest stable version of Nix through Nix <para>You can install the latest stable version of Nix through Nix
itself by subscribing to the channel <link itself by subscribing to the channel <link
xlink:href="http://nix.cs.uu.nl/dist/nix/channels-v3/nix-stable" />, xlink:href="http://nixos.org/releases/nix/channels/nix-stable" />,
or the latest unstable version by subscribing to the channel <link or the latest unstable version by subscribing to the channel <link
xlink:href="http://nix.cs.uu.nl/dist/nix/channels-v3/nix-unstable" />. xlink:href="http://nixos.org/releases/nix/channels/nix-unstable" />.
You can also do a <link linkend="sec-one-click">one-click You can also do a <link linkend="sec-one-click">one-click
installation</link> by clicking on the package links at <link installation</link> by clicking on the package links at <link
xlink:href="http://nix.cs.uu.nl/dist/nix/" />.</para> xlink:href="http://nixos.org/releases/full-index-nix.html" />.</para>
</section> </section>

35
doc/manual/package-management.xml
View file

@ -38,7 +38,7 @@ to end-user applications like Mozilla Firefox. (Nix is however not
tied to the Nix Package collection; you could write your own Nix tied to the Nix Package collection; you could write your own Nix
expressions based on it, or completely new ones.) You can download expressions based on it, or completely new ones.) You can download
the latest version from <link the latest version from <link
xlink:href='http://nix.cs.uu.nl/dist/nix' />.</para> xlink:href='http://nixos.org/releases/full-index-nixpkgs.html' />.</para>
<para>Assuming that you have downloaded and unpacked a release of Nix <para>Assuming that you have downloaded and unpacked a release of Nix
Packages, you can view the set of available packages in the release: Packages, you can view the set of available packages in the release:
@ -118,15 +118,15 @@ available somewhere. This is done using the
containing a <emphasis>manifest</emphasis> describing what binaries containing a <emphasis>manifest</emphasis> describing what binaries
are available. This URL should correspond to the Nix Packages release are available. This URL should correspond to the Nix Packages release
that you’re using. For instance, if you obtained a release from <link that you’re using. For instance, if you obtained a release from <link
xlink:href='http://nix.cs.uu.nl/dist/nix/nixpkgs-0.6pre1554/' />, then xlink:href='http://nixos.org/releases/nixpkgs/nixpkgs-0.12pre11712-4lrp7j8x'
you should do: />, then you should do:
<screen> <screen>
$ nix-pull http://nix.cs.uu.nl/dist/nix/nixpkgs-0.6pre1554/MANIFEST</screen> $ nix-pull http://nixos.org/releases/nixpkgs/nixpkgs-0.12pre11712-4lrp7j8x/MANIFEST</screen>
If you then issue the installation command, it should start If you then issue the installation command, it should start
downloading binaries from <systemitem downloading binaries from <systemitem
class='fqdomainname'>nix.cs.uu.nl</systemitem>, instead of building class='fqdomainname'>nixos.org</systemitem>, instead of building
them from source. This might still take a while since all them from source. This might still take a while since all
dependencies must be downloaded, but on a reasonably fast connection 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> such as an DSL line it’s on the order of a few minutes.</para>
@ -458,7 +458,7 @@ URL.</para>
<command>nix-channel --add</command>, e.g., <command>nix-channel --add</command>, e.g.,
<screen> <screen>
$ nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable</screen> $ nix-channel --add http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable</screen>
subscribes you to a channel that always contains that latest version subscribes you to a channel that always contains that latest version
of the Nix Packages collection. (Instead of of the Nix Packages collection. (Instead of
@ -496,20 +496,19 @@ available in the subscribed channels.</para>
<para>Often, when you want to install a specific package (e.g., from <para>Often, when you want to install a specific package (e.g., from
the <link the <link
xlink:href="http://nix.cs.uu.nl/dist/nix/nixpkgs-unstable-latest/">Nix xlink:href="http://nixos.org/releases/nixpkgs/nixpkgs-unstable/">Nix
Packages collection</link> or from our <link Packages collection</link>), subscribing to a channel is a bit
xlink:href='http://nix.cs.uu.nl/dist/'>release server</link>), cumbersome. And channels don’t help you at all if you want to install
subscribing to a channel is a bit cumbersome. And channels don’t help an older version of a package than the one provided by the current
you at all if you want to install an older version of a package than contents of the channel, or a package that has been removed from the
the one provided by the current contents of the channel, or a package channel. That’s when <emphasis>one-click installs</emphasis> come in
that has been removed from the channel. That’s when handy: you can just go to the web page that contains the package,
<emphasis>one-click installs</emphasis> come in handy: you can just go click on it, and it will be installed with all the necessary
to the web page that contains the package, click on it, and it will be dependencies.</para>
installed with all the necessary dependencies.</para>
<para>For instance, you can go to <link <para>For instance, you can go to <link
xlink:href="http://nix.cs.uu.nl/dist/nix/nixpkgs-unstable-latest/" /> xlink:href="http://nixos.org/releases/nixpkgs/nixpkgs-unstable/" /> —
— or to any older release of Nix Packages — and click on any link for or to any older release of Nix Packages — and click on any link for
the individual packages for your platform (say, <link the individual packages for your platform (say, <link
xlink:href='http://nix.cs.uu.nl/dist/nix/nixpkgs-0.10pre6622/pkgs/subversion-1.4.0-i686-linux.nixpkg'><literal>subversion-1.4.0</literal> xlink:href='http://nix.cs.uu.nl/dist/nix/nixpkgs-0.10pre6622/pkgs/subversion-1.4.0-i686-linux.nixpkg'><literal>subversion-1.4.0</literal>
for <literal>i686-linux</literal></link>). The first time you do for <literal>i686-linux</literal></link>). The first time you do

4
doc/manual/writing-nix-expressions.xml
View file

@ -731,9 +731,9 @@ stdenv.mkDerivation {
xlink:href='http://www.ietf.org/rfc/rfc2396.txt'>RFC 2396</link> xlink:href='http://www.ietf.org/rfc/rfc2396.txt'>RFC 2396</link>
can be written <emphasis>as is</emphasis>, without quotes. For can be written <emphasis>as is</emphasis>, without quotes. For
instance, the string instance, the string
<literal>"https://svn.cs.uu.nl:12443/dist/trace/trace-nix-trunk.tar.bz2"</literal> <literal>"http://example.org/foo.tar.bz2"</literal>
can also be written as can also be written as
<literal>https://svn.cs.uu.nl:12443/dist/trace/trace-nix-trunk.tar.bz2</literal>.</para> <literal>http://example.org/foo.tar.bz2</literal>.</para>
</listitem> </listitem>