diff options
| author | Graham Christensen <graham@grahamc.com> | 2018-04-27 22:44:25 -0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2018-04-27 22:44:51 -0400 |
| commit | 59f8b1e844d679d1ae7d2a94cf02f9ca259f0dfa (patch) | |
| tree | 134842558c5d08b6e87edd8a95778aa721d49445 | |
| parent | 68d48cecf6944d74e25a0faeff14aaa4c4ddaf0a (diff) | |
| download | nixpkgs-59f8b1e844d679d1ae7d2a94cf02f9ca259f0dfa.tar nixpkgs-59f8b1e844d679d1ae7d2a94cf02f9ca259f0dfa.tar.gz nixpkgs-59f8b1e844d679d1ae7d2a94cf02f9ca259f0dfa.tar.bz2 nixpkgs-59f8b1e844d679d1ae7d2a94cf02f9ca259f0dfa.tar.lz nixpkgs-59f8b1e844d679d1ae7d2a94cf02f9ca259f0dfa.tar.xz nixpkgs-59f8b1e844d679d1ae7d2a94cf02f9ca259f0dfa.tar.zst nixpkgs-59f8b1e844d679d1ae7d2a94cf02f9ca259f0dfa.zip | |
nixos docs: Move generated XML in to a specific subdirectory to allow easier hacking
| -rw-r--r-- | nixos/doc/manual/configuration/configuration.xml | 3 | ||||
| -rw-r--r-- | nixos/doc/manual/default.nix | 11 | ||||
| -rw-r--r-- | nixos/doc/manual/man-configuration.xml | 2 | ||||
| -rw-r--r-- | nixos/doc/manual/manual.xml | 4 |
4 files changed, 12 insertions, 8 deletions
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 8677c13db40..f092c7e207f 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -25,9 +25,8 @@ effect after you run <command>nixos-rebuild</command>.</para> <xi:include href="networking.xml" /> <xi:include href="linux-kernel.xml" /> -<xi:include href="modules.xml" xpointer="xpointer(//section[@id='modules']/*)" /> +<xi:include href="../generated/modules.xml" xpointer="xpointer(//section[@id='modules']/*)" /> <!-- Apache; libvirtd virtualisation --> </part> - diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index ac22712baf8..c396c799c63 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -102,13 +102,18 @@ let </section> ''; + generatedSources = runCommand "generated-docbook" {} '' + mkdir $out + ln -s ${modulesDoc} $out/modules.xml + ln -s ${optionsDocBook} $out/options-db.xml + printf "%s" "${version}" > $out/version + ''; + copySources = '' cp -prd $sources/* . # */ + ln -s ${generatedSources} ./generated chmod -R u+w . - ln -s ${modulesDoc} configuration/modules.xml - ln -s ${optionsDocBook} options-db.xml - printf "%s" "${version}" > version ''; toc = builtins.toFile "toc.xml" diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml index 05531b3909a..89d321d6972 100644 --- a/nixos/doc/manual/man-configuration.xml +++ b/nixos/doc/manual/man-configuration.xml @@ -31,7 +31,7 @@ therein.</para> <para>You can use the following options in <filename>configuration.nix</filename>.</para> -<xi:include href="options-db.xml" /> +<xi:include href="./generated/options-db.xml" /> </refsection> diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index 9aa332f026d..a7825579e03 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -6,7 +6,7 @@ <info> <title>NixOS Manual</title> - <subtitle>Version <xi:include href="version" parse="text" /></subtitle> + <subtitle>Version <xi:include href="./generated/version" parse="text" /></subtitle> </info> <preface> @@ -39,7 +39,7 @@ <appendix xml:id="ch-options"> <title>Configuration Options</title> - <xi:include href="options-db.xml" /> + <xi:include href="./generated/options-db.xml" /> </appendix> <xi:include href="release-notes/release-notes.xml" /> |