[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
306/376: Update installation section
From: |
Ludovic Courtès |
Subject: |
306/376: Update installation section |
Date: |
Wed, 28 Jan 2015 22:05:48 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 215745415e7c1e31cdb9747a02d217a884484c51
Author: Eelco Dolstra <address@hidden>
Date: Mon Nov 24 15:34:17 2014 +0100
Update installation section
---
doc/manual/installation/installing-binary.xml | 27 ++++++++++++-----------
doc/manual/installation/supported-platforms.xml | 4 +-
doc/manual/troubleshooting/troubleshooting.xml | 4 +-
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/doc/manual/installation/installing-binary.xml
b/doc/manual/installation/installing-binary.xml
index a5f9ac8..f9ee98c 100644
--- a/doc/manual/installation/installing-binary.xml
+++ b/doc/manual/installation/installing-binary.xml
@@ -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 <(curl https://nixos.org/nix/install)
@@ -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
@@ -40,7 +41,7 @@ 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>
@@ -48,21 +49,21 @@ $ rpm -U nix-1.7-1.i386.rpm</screen>
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>
@@ -78,4 +79,4 @@ $ rm -rf /nix</screen>
</para>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/manual/installation/supported-platforms.xml
b/doc/manual/installation/supported-platforms.xml
index 3f76d08..cbe5286 100644
--- a/doc/manual/installation/supported-platforms.xml
+++ b/doc/manual/installation/supported-platforms.xml
@@ -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>
diff --git a/doc/manual/troubleshooting/troubleshooting.xml
b/doc/manual/troubleshooting/troubleshooting.xml
index 3618d90..1e973a1 100644
--- a/doc/manual/troubleshooting/troubleshooting.xml
+++ b/doc/manual/troubleshooting/troubleshooting.xml
@@ -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" />
- 239/376: Add readDir primop, (continued)
- 239/376: Add readDir primop, Ludovic Courtès, 2015/01/28
- 224/376: add manpage for nix-generate-patches, Ludovic Courtès, 2015/01/28
- 246/376: Typo, Ludovic Courtès, 2015/01/28
- 245/376: Get rid of some unnecessary ExprConcatStrings nodes in dynamic attrs, Ludovic Courtès, 2015/01/28
- 243/376: Add primop ‘catAttrs’, Ludovic Courtès, 2015/01/28
- 249/376: nix-copy-closure: Use strict, Ludovic Courtès, 2015/01/28
- 241/376: Tweak, Ludovic Courtès, 2015/01/28
- 304/376: Combine introduction / quick start parts, Ludovic Courtès, 2015/01/28
- 250/376: Remove unused @sshOpts flag, Ludovic Courtès, 2015/01/28
- 305/376: Update quick start section, Ludovic Courtès, 2015/01/28
- 306/376: Update installation section,
Ludovic Courtès <=
- 308/376: Build derivations in a more predictable order, Ludovic Courtès, 2015/01/28
- 307/376: Don't create unnecessary substitution goals for derivations, Ludovic Courtès, 2015/01/28
- 309/376: More build-cache-failures -> build-cache-failure, Ludovic Courtès, 2015/01/28
- 310/376: forceString(): Accept pos argument, Ludovic Courtès, 2015/01/28
- 311/376: Add a primop for regular expression pattern matching, Ludovic Courtès, 2015/01/28
- 312/376: Rely on XML catalogs to find the DocBook schemas and stylesheets, Ludovic Courtès, 2015/01/28
- 313/376: Intro: Mention binary caches, Ludovic Courtès, 2015/01/28
- 303/376: Manual: Bump date, Ludovic Courtès, 2015/01/28
- 315/376: Make all ExternalValueBase functions const, Ludovic Courtès, 2015/01/28
- 318/376: Shut up a warning, Ludovic Courtès, 2015/01/28