diff options
author | Eric Sagnes <eric.sagnes@gmail.com> | 2016-05-22 18:05:37 +0900 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2016-05-22 10:05:37 +0100 |
commit | 96a4e1f80d1692965d3c4eb8152c00cc64b3216a (patch) | |
tree | 14a6a748795c70aa85eb05970ee5a69ef96a87b0 /doc | |
parent | cc41cb30e33a071e4e5e86d277579fc02d0bf7de (diff) | |
download | nixlib-96a4e1f80d1692965d3c4eb8152c00cc64b3216a.tar nixlib-96a4e1f80d1692965d3c4eb8152c00cc64b3216a.tar.gz nixlib-96a4e1f80d1692965d3c4eb8152c00cc64b3216a.tar.bz2 nixlib-96a4e1f80d1692965d3c4eb8152c00cc64b3216a.tar.lz nixlib-96a4e1f80d1692965d3c4eb8152c00cc64b3216a.tar.xz nixlib-96a4e1f80d1692965d3c4eb8152c00cc64b3216a.tar.zst nixlib-96a4e1f80d1692965d3c4eb8152c00cc64b3216a.zip |
nixpkgs manual: cleanup (#15611)
Diffstat (limited to 'doc')
-rw-r--r-- | doc/default.nix | 5 | ||||
-rw-r--r-- | doc/languages-frameworks/beam.xml (renamed from doc/beam-users-guide.xml) | 10 | ||||
-rw-r--r-- | doc/languages-frameworks/haskell.md (renamed from doc/haskell-users-guide.md) | 2 | ||||
-rw-r--r-- | doc/languages-frameworks/index.xml | 17 | ||||
-rw-r--r-- | doc/manual.xml | 2 |
5 files changed, 17 insertions, 19 deletions
diff --git a/doc/default.nix b/doc/default.nix index ddbee65f1ac4..a9f22267584b 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -52,9 +52,8 @@ stdenv.mkDerivation { outputFile = "./languages-frameworks/python.xml"; } + toDocbook { - inputFile = ./haskell-users-guide.md; - outputFile = "haskell-users-guide.xml"; - useChapters = true; + inputFile = ./languages-frameworks/haskell.md; + outputFile = "./languages-frameworks/haskell.xml"; } + toDocbook { inputFile = ./../pkgs/development/idris-modules/README.md; diff --git a/doc/beam-users-guide.xml b/doc/languages-frameworks/beam.xml index c1a4c90bc27c..2dc5aa63e458 100644 --- a/doc/beam-users-guide.xml +++ b/doc/languages-frameworks/beam.xml @@ -1,10 +1,10 @@ -<chapter xmlns="http://docbook.org/ns/docbook" +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:id="users-guide-to-the-erlang-infrastructure"> + xml:id="sec-beam"> - <title>User's Guide to the Beam Infrastructure</title> + <title>Beam Languages (Erlang & Elixir)</title> <section xml:id="beam-introduction"> - <title>Beam Languages (Erlang & Elixir) on Nix</title> + <title>Introduction</title> <para> In this document and related Nix expressions we use the term <emphasis>Beam</emphasis> to describe the environment. Beam is @@ -373,4 +373,4 @@ $ nix-build -A beamPackages that. </para> </section> -</chapter> +</section> diff --git a/doc/haskell-users-guide.md b/doc/languages-frameworks/haskell.md index b981466bf2e0..ef10ea583697 100644 --- a/doc/haskell-users-guide.md +++ b/doc/languages-frameworks/haskell.md @@ -3,7 +3,7 @@ title: User's Guide for Haskell in Nixpkgs author: Peter Simons date: 2015-06-01 --- -# User's Guide to the Haskell Infrastructure +# Haskell ## How to install Haskell packages diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 395d46880217..8076c33f1b3f 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -13,19 +13,20 @@ in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter.</para> -<xi:include href="perl.xml" /> -<xi:include href="python.xml" /> -<xi:include href="ruby.xml" /> +<xi:include href="beam.xml" /> +<xi:include href="bower.xml" /> +<xi:include href="coq.xml" /> <xi:include href="go.xml" /> +<xi:include href="haskell.xml" /> +<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="coq.xml" /> -<xi:include href="idris.xml" /> <!-- generated from ../../pkgs/development/idris-modules/README.md --> -<xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md --> +<xi:include href="perl.xml" /> +<xi:include href="python.xml" /> <xi:include href="qt.xml" /> +<xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md --> +<xi:include href="ruby.xml" /> <xi:include href="texlive.xml" /> -<xi:include href="bower.xml" /> </chapter> - diff --git a/doc/manual.xml b/doc/manual.xml index 1045d0d4f815..32e94e8e59c5 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -20,8 +20,6 @@ <xi:include href="package-notes.xml" /> <xi:include href="coding-conventions.xml" /> <xi:include href="submitting-changes.xml" /> - <xi:include href="haskell-users-guide.xml" /> - <xi:include href="beam-users-guide.xml" /> <xi:include href="contributing.xml" /> </book> |