Skip to content

Commit

Permalink
Update installation section
Browse files Browse the repository at this point in the history
  • Loading branch information
edolstra committed Nov 24, 2014
1 parent 103e4e4 commit 2157454
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 17 deletions.
27 changes: 14 additions & 13 deletions doc/manual/installation/installing-binary.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

<title>Installing a Binary Distribution</title>

<para>The easiest way to install Nix is to run the following command:
<para>If you are using Linux or Mac OS X, the easiest way to install
Nix is to run the following command:

<screen>
$ bash &lt;(curl https://nixos.org/nix/install)
Expand All @@ -18,7 +19,7 @@ run this under your usual user account, <emphasis>not</emphasis> as
root. The script will invoke <command>sudo</command> to create
<filename>/nix</filename> if it doesn’t already exist. If you don’t
have <command>sudo</command>, you should manually create
<command>/nix</command> first as root:
<command>/nix</command> first as root, e.g.:

<screen>
$ mkdir /nix
Expand All @@ -40,29 +41,29 @@ build system</link>.</para>
or upgraded using <command>rpm -U</command>. For example,

<screen>
$ rpm -U nix-1.7-1.i386.rpm</screen>
$ rpm -U nix-1.8-1.i386.rpm</screen>

</para>

<para>For Debian and Ubuntu, you can download a Deb package and
install it like this:

<screen>
$ dpkg -i nix_1.7-1_amd64.deb</screen>
$ dpkg -i nix_1.8-1_amd64.deb</screen>

</para>

<para>For other platforms, including Mac OS X (Darwin), FreeBSD and
other Linux distributions, you can download a binary tarball that
contains Nix and all its dependencies. (This is what the install
script at <uri>https://nixos.org/nix/install</uri> uses.) You should
unpack it somewhere (e.g. in <filename>/tmp</filename>), and then run
the script named <command>install</command> inside the binary tarball:
<para>For other platforms, including Mac OS X and other Linux
distributions, you can download a binary tarball that contains Nix and
all its dependencies. (This is what the install script at
<uri>https://nixos.org/nix/install</uri> uses.) You should unpack it
somewhere (e.g. in <filename>/tmp</filename>), and then run the script
named <command>install</command> inside the binary tarball:

<screen>
alice$ cd /tmp
alice$ tar xfj nix-1.7-x86_64-darwin.tar.bz2
alice$ cd nix-1.7-x86_64-darwin
alice$ tar xfj nix-1.8-x86_64-darwin.tar.bz2
alice$ cd nix-1.8-x86_64-darwin
alice$ ./install
</screen>

Expand All @@ -78,4 +79,4 @@ $ rm -rf /nix</screen>

</para>

</chapter>
</chapter>
4 changes: 2 additions & 2 deletions doc/manual/installation/supported-platforms.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

</para>

<para>Nix is pretty portable, so it should work on most other Unix
platforms as well.</para>
<para>Nix is fairly portable, so it should work on most platforms that
support POSIX threads and have a C++11 compiler.</para>

</chapter>
4 changes: 2 additions & 2 deletions doc/manual/troubleshooting/troubleshooting.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<title>Troubleshooting</title>

<para>This section provides solutions for some common problems. See
the <link xlink:href="http://bugs.strategoxt.org/browse/NIX">Nix
bug tracker</link> for a list of currently known issues.</para>
the <link xlink:href="https://github.com/NixOS/nix/issues">Nix bug
tracker</link> for a list of currently known issues.</para>

<xi:include href="collisions-nixenv.xml" />
<xi:include href="links-nix-store.xml" />
Expand Down

0 comments on commit 2157454

Please sign in to comment.