From 9a1320af29f60ed23839aaabfbf81ead5e1c3758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 10 Aug 2016 18:41:51 +0200 Subject: [PATCH] s/powerpc-darwin/x86_64-darwin/ Let's step in line with time and document more realistic values. --- doc/manual/advanced-topics/distributed-builds.xml | 8 ++++---- doc/manual/command-ref/conf-file.xml | 6 +++--- doc/manual/expressions/builtins.xml | 2 +- doc/manual/expressions/derivations.xml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/manual/advanced-topics/distributed-builds.xml b/doc/manual/advanced-topics/distributed-builds.xml index 1f8d98f5d..f85837003 100644 --- a/doc/manual/advanced-topics/distributed-builds.xml +++ b/doc/manual/advanced-topics/distributed-builds.xml @@ -11,9 +11,9 @@ forward Nix builds to other machines over the network. This allows multiple builds to be performed in parallel (thus improving performance) and allows Nix to perform multi-platform builds in a semi-transparent way. For instance, if you perform a build for a -powerpc-darwin on an i686-linux +x86_64-darwin on an i686-linux machine, Nix can automatically forward the build to a -powerpc-darwin machine, if available. +x86_64-darwin machine, if available. You can enable distributed builds by setting the environment variable NIX_BUILD_HOOK to point to a program that Nix @@ -30,7 +30,7 @@ variable. Remote machine configuration: <filename>remote-systems.conf</filename> -nix@mcflurry.labs.cs.uu.nl powerpc-darwin /home/nix/.ssh/id_quarterpounder_auto 2 +nix@mcflurry.labs.cs.uu.nl x86_64-darwin /home/nix/.ssh/id_quarterpounder_auto 2 nix@scratchy.labs.cs.uu.nl i686-linux /home/nix/.ssh/id_scratchy_auto 8 1 kvm nix@itchy.labs.cs.uu.nl i686-linux /home/nix/.ssh/id_scratchy_auto 8 2 nix@poochie.labs.cs.uu.nl i686-linux /home/nix/.ssh/id_scratchy_auto 8 2 kvm perf @@ -59,7 +59,7 @@ bits of information: ~/.ssh/config. A comma-separated list of Nix platform type - identifiers, such as powerpc-darwin. It is + identifiers, such as x86_64-darwin. It is possible for a machine to support multiple platform types, e.g., i686-linux,x86_64-linux. diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml index 4c8f3d9d3..fb7bdf573 100644 --- a/doc/manual/command-ref/conf-file.xml +++ b/doc/manual/command-ref/conf-file.xml @@ -430,15 +430,15 @@ flag, e.g. --option gc-keep-outputs false. This option specifies the canonical Nix system name of the current installation, such as i686-linux or - powerpc-darwin. Nix can only build derivations + x86_64-darwin. Nix can only build derivations whose system attribute equals the value specified here. In general, it never makes sense to modify this value from its default, since you can use it to ‘lie’ about the platform you are building on (e.g., perform a Mac OS build on a Linux machine; the result would obviously be wrong). It only makes sense if the Nix binaries can run on multiple platforms, - e.g., ‘universal binaries’ that run on powerpc-darwin and - i686-darwin. + e.g., ‘universal binaries’ that run on x86_64-linux and + i686-linux. It defaults to the canonical Nix system name detected by configure at build time. diff --git a/doc/manual/expressions/builtins.xml b/doc/manual/expressions/builtins.xml index eae5f5a02..5fd93c831 100644 --- a/doc/manual/expressions/builtins.xml +++ b/doc/manual/expressions/builtins.xml @@ -142,7 +142,7 @@ if builtins ? getEnv then builtins.getEnv "PATH" else "" evaluates to the Nix platform identifier for the Nix installation on which the expression is being evaluated, such as "i686-linux" or - "powerpc-darwin". + "x86_64-darwin". diff --git a/doc/manual/expressions/derivations.xml b/doc/manual/expressions/derivations.xml index f2a73dccf..5efe2213e 100644 --- a/doc/manual/expressions/derivations.xml +++ b/doc/manual/expressions/derivations.xml @@ -16,7 +16,7 @@ of which specify the inputs of the build. There must be an attribute named system whose value must be a string specifying a Nix platform identifier, such as "i686-linux" or - "powerpc-darwin"To figure out + "x86_64-darwin"To figure out your platform identifier, look at the line Checking for the canonical Nix system name in the output of Nix's configure script. The build