use pkgs.nixosOptionsDoc if available for docbook

NixOS · Sep 17, 2019 · 2091290 · 2091290
1 parent d99ae2f
commit 2091290
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/doc/manual/default.nix b/doc/manual/default.nix
@@ -13,14 +13,19 @@ let
   options = pkgs.lib.filter (opt: opt.visible && !opt.internal)
     (pkgs.lib.optionAttrSetToDocList systemModule.options);
 
-  optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
-    (builtins.toXML options));
+  backwardsCompat = { options }: let
+    optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
+      (builtins.toXML options));
+  in {
+    optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
+      ${pkgs.libxslt.bin or pkgs.libxslt}/bin/xsltproc \
+        --stringparam revision '${revision}' \
+        --stringparam program 'nixops' \
+        -o intermediate.xml ${nixpkgs + "/nixos/doc/manual/options-to-docbook.xsl"} ${optionsXML}
+      ${pkgs.libxslt.bin or pkgs.libxslt}/bin/xsltproc \
+        -o $out ${nixpkgs + "/nixos/doc/manual/postprocess-option-descriptions.xsl"} intermediate.xml
+  ''; };
 
-  optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
-    ${pkgs.libxslt.bin or pkgs.libxslt}/bin/xsltproc \
-      --stringparam revision '${revision}' \
-      --stringparam program 'nixops' \
-      -o $out ${nixpkgs + /nixos/doc/manual/options-to-docbook.xsl} ${optionsXML}
-  '';
-
-in optionsDocBook
+in (pkgs.nixosOptionsDoc or backwardsCompat) {
+  inherit options;
+}
diff --git a/release.nix b/release.nix
@@ -32,7 +32,7 @@ rec {
     distPhase =
       ''
         # Generate the manual and the man page.
-        cp ${import ./doc/manual { revision = nixopsSrc.rev; inherit nixpkgs; }} doc/manual/machine-options.xml
+        cp ${(import ./doc/manual { revision = nixopsSrc.rev; inherit nixpkgs; }).optionsDocBook} doc/manual/machine-options.xml
 
         # IMPORTANT: when adding a file here, also populate doc/manual/manual.xml
         ${pkgs.lib.concatMapStrings (fn: ''