[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
366/376: Rename files
From: |
Ludovic Courtès |
Subject: |
366/376: Rename files |
Date: |
Wed, 28 Jan 2015 22:06:13 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 9c830394ecb42870c58603d7b4d9f620649ad969
Author: Eelco Dolstra <address@hidden>
Date: Sun Dec 14 01:07:23 2014 +0100
Rename files
---
doc/manual/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(-)
diff --git a/doc/manual/advanced-topics/advanced-topics.xml
b/doc/manual/advanced-topics/advanced-topics.xml
new file mode 100644
index 0000000..338aa6f
--- /dev/null
+++ b/doc/manual/advanced-topics/advanced-topics.xml
@@ -0,0 +1,10 @@
+<part xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ version="5.0">
+
+<title>Advanced Topics</title>
+
+<xi:include href="distributed-builds.xml" />
+
+</part>
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 4b45812..70f396f 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'>
-<title>Enabling Distributed Builds</title>
+<title>Distributed Builds</title>
+
+<para>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
+<literal>powerpc-darwin</literal> on an <literal>i686-linux</literal>
+machine, Nix can automatically forward the build to a
+<literal>powerpc-darwin</literal> machine, if available.</para>
<para>You can enable distributed builds by setting the environment
variable <envar>NIX_BUILD_HOOK</envar> to point to a program that Nix
@@ -41,7 +50,7 @@ example configuration is shown in <xref
linkend='ex-remote-systems'
bits of information:
<orderedlist>
-
+
<listitem><para>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 <command>ssh</command>, so it can
@@ -73,9 +82,9 @@ bits of information:
<filename>build-remote.pl</filename> will only perform the
derivation on a machine that has the specified features. For
instance, the attribute
-
+
<programlisting>
-requiredSystemFeatures = [ "kvm" ];
+requiredSystemFeatures = [ "kvm" ];
</programlisting>
will cause the build to be performed on a machine that has the
@@ -103,4 +112,4 @@ running, they should use the same
<envar>NIX_CURRENT_LOAD</envar>
file. Maybe in the future <filename>build-remote.pl</filename> will
look at the actual remote load.</para>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/manual/builds/build-farm.xml b/doc/manual/builds/build-farm.xml
deleted file mode 100644
index e0e9f10..0000000
--- a/doc/manual/builds/build-farm.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<part xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- version="5.0"
- xml:id='chap-distributed-builds'>
-
-<title>Distributed Builds</title>
-
-<partintro>
-<para>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
-<literal>powerpc-darwin</literal> on an <literal>i686-linux</literal>
-machine, Nix can automatically forward the build to a
-<literal>powerpc-darwin</literal> machine, if available.</para>
-</partintro>
-
-<xi:include href="enabling-builds.xml" />
-
-</part>
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 5c46f30..b784bb5 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -41,7 +41,7 @@
<xi:include href="installation/installation.xml" />
<xi:include href="packages/package-management.xml" />
<xi:include href="expressions/writing-nix-expressions.xml" />
- <xi:include href="builds/build-farm.xml" />
+ <xi:include href="advanced-topics/advanced-topics.xml" />
<xi:include href="command-ref/command-ref.xml" />
<xi:include href="troubleshooting/troubleshooting.xml" />
<xi:include href="glossary/glossary.xml" />
- 349/376: Remove tabs, (continued)
- 349/376: Remove tabs, Ludovic Courtès, 2015/01/28
- 355/376: Fix some memory leaks, Ludovic Courtès, 2015/01/28
- 357/376: Silence some warnings on GCC 4.9, Ludovic Courtès, 2015/01/28
- 358/376: Install cacert before running nix-channel, Ludovic Courtès, 2015/01/28
- 359/376: Better error message, Ludovic Courtès, 2015/01/28
- 362/376: Undocument nix-generate-patches, Ludovic Courtès, 2015/01/28
- 367/376: Fix image in PDF, Ludovic Courtès, 2015/01/28
- 354/376: Ensure we're writing to stderr in the builder, Ludovic Courtès, 2015/01/28
- 360/376: Style, Ludovic Courtès, 2015/01/28
- 365/376: Update .nixpkg description, Ludovic Courtès, 2015/01/28
- 366/376: Rename files,
Ludovic Courtès <=
- 371/376: Merge commit '36c67860363c93eb00cf5b8e2ad34f6f775e6901', Ludovic Courtès, 2015/01/28
- 363/376: Style, Ludovic Courtès, 2015/01/28
- 376/376: Grmbl, Ludovic Courtès, 2015/01/28
- 372/376: Merge branch 'cygwin-master' of https://github.com/ternaris/nix, Ludovic Courtès, 2015/01/28
- 364/376: ReiserFS -> ext4, Ludovic Courtès, 2015/01/28
- 375/376: Add a section on nix-serve, Ludovic Courtès, 2015/01/28
- 361/376: Document channel format and excise most mentions of manifests and nix-pull, Ludovic Courtès, 2015/01/28
- 370/376: Delete the stdenv section, Ludovic Courtès, 2015/01/28
- 374/376: Add section on SSH substituter, Ludovic Courtès, 2015/01/28
- 373/376: Pedantry, Ludovic Courtès, 2015/01/28