diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-09-06 19:17:44 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-09-23 20:47:58 +0000 |
commit | fe744d3fb1d61e6f7f7c2f40217364f9577390ca (patch) | |
tree | 522c9fc8d568e238399b376f00e74dbc4056b4a4 /nixos/doc/manual/default.nix | |
parent | 56853dc6d83a861050bbc02041dbe65f7b1b6f63 (diff) | |
download | nixpkgs-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.tar nixpkgs-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.tar.gz nixpkgs-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.tar.bz2 nixpkgs-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.tar.lz nixpkgs-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.tar.xz nixpkgs-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.tar.zst nixpkgs-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.zip |
nixos: doc: rename `manual` to `manualHTML`, cleanup references
Because when I see "config.system.build.manual.manual" after I forgot what it means I ask "Why do I need that second `.manual` there again?". Doesn't happen with `config.system.build.manual.manualHTML`.
Diffstat (limited to 'nixos/doc/manual/default.nix')
-rw-r--r-- | nixos/doc/manual/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index aaa6e0da545..faae4f20544 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; |