diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-09-24 00:09:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-24 00:09:23 -0400 |
| commit | ebf041d4bd3d63006ac4b0a5a3baa21b68110db4 (patch) | |
| tree | e6e5eb954cd98b20b39f24adac8d8ad92c700768 /nixos/doc | |
| parent | 2162bebb85d55c5af81cbe0c2b3b0bc28921089c (diff) | |
| parent | 0f3b89bbedc1a33cc1fc3c142e235da2c64614c3 (diff) | |
Merge pull request #46193 from oxij/nixos/manual-to-doc
nixos: doc: implement #12542
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/default.nix | 7 | ||||
| -rw-r--r-- | nixos/doc/manual/development/building-parts.xml | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index aaa6e0da545f9..faae4f205443f 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -252,7 +252,7 @@ in rec { ''; # */ # Generate the NixOS manual. - manual = runCommand "nixos-manual" + manualHTML = runCommand "nixos-manual-html" { inherit sources; nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; meta.description = "The NixOS manual in HTML format"; @@ -281,6 +281,11 @@ in rec { echo "doc manual $dst" >> $out/nix-support/hydra-build-products ''; # */ + # Alias for backward compatibility. TODO(@oxij): remove eventually. + manual = manualHTML; + + # Index page of the NixOS manual. + manualHTMLIndex = "${manualHTML}/share/doc/nixos/index.html"; manualEpub = runCommand "nixos-manual-epub" { inherit sources; diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml index eaffc0ef47c2f..b4791b72970f6 100644 --- a/nixos/doc/manual/development/building-parts.xml +++ b/nixos/doc/manual/development/building-parts.xml @@ -34,7 +34,7 @@ $ nix-build -A system</screen> </varlistentry> <varlistentry> <term> - <varname>system.build.manual.manual</varname> + <varname>system.build.manual.manualHTML</varname> </term> <listitem> <para> |