diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-21 11:39:46 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-21 11:39:46 +0200 |
| commit | 2b9713c2815aafaa410acca8600da5dbf7ca6821 (patch) | |
| tree | 759dd16f4124a48897cf6ddbc4f28712b8312f4d | |
| parent | 24b1ef51337cc8267955eedda818cfccb222f2ea (diff) | |
doc: move fhs and mkShell under builders/special
In my opinion Functions should only contain pure functions. These are
both meant to provide derivations so I put them under Builders. Don't
know exactly *where* to put them so "special" it is...
| -rw-r--r-- | doc/builders/special.xml | 12 | ||||
| -rw-r--r-- | doc/builders/special/fhs-environments.xml (renamed from doc/functions/fhs-environments.xml) | 0 | ||||
| -rw-r--r-- | doc/builders/special/mkshell.xml (renamed from doc/functions/shell.xml) | 0 | ||||
| -rw-r--r-- | doc/functions.xml | 2 | ||||
| -rw-r--r-- | doc/manual.xml | 1 |
5 files changed, 13 insertions, 2 deletions
diff --git a/doc/builders/special.xml b/doc/builders/special.xml new file mode 100644 index 000000000000..56d98f025278 --- /dev/null +++ b/doc/builders/special.xml @@ -0,0 +1,12 @@ +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="chap-special"> + <title>Special builders</title> + <para> + This chapter describes several special builders. + </para> + <xi:include href="special/fhs-environments.xml" /> + <xi:include href="special/mkshell.xml" /> +</chapter> + + diff --git a/doc/functions/fhs-environments.xml b/doc/builders/special/fhs-environments.xml index e7b81e97a23f..e7b81e97a23f 100644 --- a/doc/functions/fhs-environments.xml +++ b/doc/builders/special/fhs-environments.xml diff --git a/doc/functions/shell.xml b/doc/builders/special/mkshell.xml index cef65d06b882..cef65d06b882 100644 --- a/doc/functions/shell.xml +++ b/doc/builders/special/mkshell.xml diff --git a/doc/functions.xml b/doc/functions.xml index 970367870eed..5a9240ec800e 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -9,8 +9,6 @@ <xi:include href="functions/library.xml" /> <xi:include href="functions/generators.xml" /> <xi:include href="functions/debug.xml" /> - <xi:include href="functions/fhs-environments.xml" /> - <xi:include href="functions/shell.xml" /> <xi:include href="functions/prefer-remote-fetch.xml" /> <xi:include href="functions/nix-gitignore.xml" /> </chapter> diff --git a/doc/manual.xml b/doc/manual.xml index 31c507178a8a..de2c70eaf352 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -25,6 +25,7 @@ <title>Builders</title> <xi:include href="builders/fetchers.xml" /> <xi:include href="builders/trivial-builders.xml" /> + <xi:include href="builders/special.xml" /> <xi:include href="builders/images.xml" /> <xi:include href="languages-frameworks/index.xml" /> <xi:include href="packages/index.xml" /> |