From 824e94cf0ad4bb1c37267185034813cf640d9d8a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Oct 2009 23:47:50 +0000 Subject: [PATCH] * Fix hyperlink generation, but now in XSLT instead of sed. svn path=/nixos/trunk/; revision=17660 --- doc/manual/default.nix | 25 ++++--------------------- doc/manual/options-to-docbook.xsl | 17 ++++++++++++++++- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/doc/manual/default.nix b/doc/manual/default.nix index 1e9581e8dd4..f0e6b64103c 100644 --- a/doc/manual/default.nix +++ b/doc/manual/default.nix @@ -11,30 +11,13 @@ let options // { system = removeAttrs options.system ["path"]; }; - optionsXML_ = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext + optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext (builtins.toXML (pkgs.lib.optionAttrSetToDocList "" options_))); - optionsXML = pkgs.runCommand "options2.xml" {} '' - sed ' - \,, { - n # fetch the next line - : rewriteLinks - n # fetch the next line - \,, b # leave if this is the end of the list - ${if revision == "local" then "" else '' - # redirect nixos internals to the repository - s,,, #" - t rewriteLinks # jump to rewriteLinks if done - ''} - # redirect local file to their locations - s,,, #" - b rewriteLinks # jump to rewriteLinks - } - ' ${optionsXML_} > $out - ''; - optionsDocBook = pkgs.runCommand "options-db.xml" {} '' - ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${optionsXML_} + ${pkgs.libxslt}/bin/xsltproc \ + --stringparam revision '${revision}' \ + -o $out ${./options-to-docbook.xsl} ${optionsXML} ''; manual = pkgs.stdenv.mkDerivation { diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl index d8cd057ac29..68c3590d45d 100644 --- a/doc/manual/options-to-docbook.xsl +++ b/doc/manual/options-to-docbook.xsl @@ -10,6 +10,8 @@ + + @@ -140,7 +142,20 @@ - + + + + + https://svn.nixos.org/viewvc/nix/nixos/trunk/modules/?revision= + + + file:// + + + +