From 4ec4c59c10fd985d11c881ce5451ec158955c4cf Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Sat, 1 Jul 2006 02:02:35 +0000
Subject: [PATCH] Updated docbook-xsl to 1.70.1, which improves the docbook 5
 support.

Added docbook 5.0b6, which replaces docbook-ng.


svn path=/nixpkgs/trunk/; revision=5550
---
 .../sgml+xml/schemas/xml-dtd/docbook-5.0/builder.sh    |  8 ++++++++
 .../sgml+xml/schemas/xml-dtd/docbook-5.0/default.nix   | 10 ++++++++++
 .../data/sgml+xml/stylesheets/xslt/docbook/default.nix |  6 +++---
 .../stylesheets/xslt/docbook/docbook-xsl-1.69.1.nix    | 10 ++++++++++
 pkgs/top-level/all-packages.nix                        |  4 ++--
 pkgs/top-level/build-for-release.nix                   |  2 +-
 6 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/data/sgml+xml/schemas/xml-dtd/docbook-5.0/builder.sh
 create mode 100644 pkgs/data/sgml+xml/schemas/xml-dtd/docbook-5.0/default.nix
 create mode 100644 pkgs/data/sgml+xml/stylesheets/xslt/docbook/docbook-xsl-1.69.1.nix

diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-5.0/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-5.0/builder.sh
new file mode 100644
index 00000000000..24befb28c74
--- /dev/null
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-5.0/builder.sh
@@ -0,0 +1,8 @@
+source $stdenv/setup
+
+ensureDir $out/xml/dtd/docbook
+
+cd $out/xml/dtd/docbook
+unpackFile $src
+mv docbook-*/* .
+rmdir docbook-*
\ No newline at end of file
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-5.0/default.nix
new file mode 100644
index 00000000000..8854fa23915
--- /dev/null
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-5.0/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "docbook-5.0b6";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://docbook.org/xml/5.0b6/docbook-5.0b6.tar.gz;
+    md5 = "4bf53ff6eb4721a14b37c97155379bd2";
+  };
+}
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
index b713a197de1..60bfe405e2c 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "docbook-xsl-1.69.1";
+  name = "docbook-xsl-1.70.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/docbook-xsl-1.69.1.tar.gz;
-    md5 = "6f2478faea86bd55abb36ddb57291347";
+    url = http://surfnet.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.70.1.tar.gz;
+    md5 = "3ac0ab99bfbfc9c631baa03eef0f719c";
   };
 }
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/docbook-xsl-1.69.1.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/docbook-xsl-1.69.1.nix
new file mode 100644
index 00000000000..b713a197de1
--- /dev/null
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/docbook-xsl-1.69.1.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "docbook-xsl-1.69.1";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/docbook-xsl-1.69.1.tar.gz;
+    md5 = "6f2478faea86bd55abb36ddb57291347";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 451276cb61d..a1dc6990b8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1981,8 +1981,8 @@ rec {
     inherit fetchurl stdenv unzip;
   };
 
-  docbook_ng = (import ../data/sgml+xml/schemas/docbook-ng) {
-    inherit fetchurl stdenv unzip;
+  docbook5x = (import ../data/sgml+xml/schemas/xml-dtd/docbook-5.0) {
+    inherit fetchurl stdenv;
   };
 
   docbook_xml_ebnf_dtd = (import ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf) {
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 3cc122c17df..7a85ef1c60a 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -27,7 +27,7 @@ let {
     darcs
     db4
     diffutils
-    docbook_ng
+    docbook5x
     docbook_xml_dtd_42
     docbook_xml_dtd_43
     docbook_xml_xslt