diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-09-24 18:54:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-24 18:54:31 +0200 |
| commit | fffc7638cda106c4864e0b986ff498b4f939a847 (patch) | |
| tree | 12b83c1bc7d39a65df8dbff46390c8465347f202 /doc | |
| parent | d2965a7d85f7ce3f5ce265ca8dc3b73feaae226f (diff) | |
| parent | e2a9617185321c38482cab343e5d4a6a182b7ce9 (diff) | |
| download | nixlib-fffc7638cda106c4864e0b986ff498b4f939a847.tar nixlib-fffc7638cda106c4864e0b986ff498b4f939a847.tar.gz nixlib-fffc7638cda106c4864e0b986ff498b4f939a847.tar.bz2 nixlib-fffc7638cda106c4864e0b986ff498b4f939a847.tar.lz nixlib-fffc7638cda106c4864e0b986ff498b4f939a847.tar.xz nixlib-fffc7638cda106c4864e0b986ff498b4f939a847.tar.zst nixlib-fffc7638cda106c4864e0b986ff498b4f939a847.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/default.nix | 4 | ||||
| -rw-r--r-- | doc/languages-frameworks/index.xml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/default.nix b/doc/default.nix index f4f467b1f5a0..03134cf4cc86 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -61,6 +61,10 @@ pkgs.stdenv.mkDerivation { outputFile = "languages-frameworks/idris.xml"; } + toDocbook { + inputFile = ../pkgs/development/node-packages/README.md; + outputFile = "languages-frameworks/node.xml"; + } + + toDocbook { inputFile = ../pkgs/development/r-modules/README.md; outputFile = "languages-frameworks/r.xml"; } diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 8076c33f1b3f..81352ec2a9a6 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -21,6 +21,7 @@ such as Perl or Haskell. These are described in this chapter.</para> <xi:include href="idris.xml" /> <!-- generated from ../../pkgs/development/idris-modules/README.md --> <xi:include href="java.xml" /> <xi:include href="lua.xml" /> +<xi:include href="node.xml" /> <!-- generated from ../../pkgs/development/node-packages/README.md --> <xi:include href="perl.xml" /> <xi:include href="python.xml" /> <xi:include href="qt.xml" /> |