From 9c830394ecb42870c58603d7b4d9f620649ad969 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 14 Dec 2014 01:07:23 +0100 Subject: [PATCH] Rename files --- .../advanced-topics/advanced-topics.xml | 10 +++++++++ .../distributed-builds.xml} | 21 +++++++++++++----- doc/manual/builds/build-farm.xml | 22 ------------------- doc/manual/manual.xml | 2 +- 4 files changed, 26 insertions(+), 29 deletions(-) create mode 100644 doc/manual/advanced-topics/advanced-topics.xml rename doc/manual/{builds/enabling-builds.xml => advanced-topics/distributed-builds.xml} (88%) delete mode 100644 doc/manual/builds/build-farm.xml diff --git a/doc/manual/advanced-topics/advanced-topics.xml b/doc/manual/advanced-topics/advanced-topics.xml new file mode 100644 index 000000000..338aa6f3a --- /dev/null +++ b/doc/manual/advanced-topics/advanced-topics.xml @@ -0,0 +1,10 @@ + + +Advanced Topics + + + + diff --git a/doc/manual/builds/enabling-builds.xml b/doc/manual/advanced-topics/distributed-builds.xml similarity index 88% rename from doc/manual/builds/enabling-builds.xml rename to doc/manual/advanced-topics/distributed-builds.xml index 4b45812ee..70f396f81 100644 --- a/doc/manual/builds/enabling-builds.xml +++ b/doc/manual/advanced-topics/distributed-builds.xml @@ -2,9 +2,18 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="ch-enabling-builds"> + xml:id='chap-distributed-builds'> -Enabling Distributed Builds +Distributed Builds + +Nix supports distributed builds, where a local Nix installation can +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 +machine, Nix can automatically forward the build to a +powerpc-darwin machine, if available. You can enable distributed builds by setting the environment variable NIX_BUILD_HOOK to point to a program that Nix @@ -41,7 +50,7 @@ example configuration is shown in - + The name of the remote machine, with optionally the user under which the remote build should be performed. This is actually passed as an argument to ssh, so it can @@ -73,9 +82,9 @@ bits of information: build-remote.pl will only perform the derivation on a machine that has the specified features. For instance, the attribute - + -requiredSystemFeatures = [ "kvm" ]; +requiredSystemFeatures = [ "kvm" ]; will cause the build to be performed on a machine that has the @@ -103,4 +112,4 @@ running, they should use the same NIX_CURRENT_LOAD file. Maybe in the future build-remote.pl will look at the actual remote load. - \ No newline at end of file + diff --git a/doc/manual/builds/build-farm.xml b/doc/manual/builds/build-farm.xml deleted file mode 100644 index e0e9f10f1..000000000 --- a/doc/manual/builds/build-farm.xml +++ /dev/null @@ -1,22 +0,0 @@ - - -Distributed Builds - - -Nix supports distributed builds, where a local Nix installation can -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 -machine, Nix can automatically forward the build to a -powerpc-darwin machine, if available. - - - - - diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml index 5c46f303a..b784bb5f3 100644 --- a/doc/manual/manual.xml +++ b/doc/manual/manual.xml @@ -41,7 +41,7 @@ - +