* Upgraded the DocBook DTD and the DocBook XSL stylesheets.

* Added the DocBook EBNF module.

svn path=/nixpkgs/trunk/; revision=926

pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh

@@ -0,0 +1,8 @@
+. $stdenv/setup
+
+mkdir -p $out/xml/dtd/docbook-ebnf
+cd $out/xml/dtd/docbook-ebnf
+stripHash $dtd
+cp -p $dtd $strippedName
+stripHash $catalog
+cp -p $catalog $strippedName

pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, unzip}:
+
+assert unzip != null;
+
+stdenv.mkDerivation {
+  name = "docbook-xml-ebnf-1.2b1";
+  builder = ./builder.sh;
+  dtd = fetchurl {
+    url = http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd;
+    md5 = "e50f7d38caf4285965c7a247e026fa7c";
+  };
+  catalog = ./docbook-ebnf.cat;
+}

pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/docbook-ebnf.cat

@@ -0,0 +1,2 @@
+PUBLIC "-//OASIS//DTD DocBook EBNF Module V1.0//EN"
+       "dbebnf.dtd"

pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh

@@ -1,5 +1,5 @@
-. $stdenv/setup || exit 1
+. $stdenv/setup
 
-mkdir -p $out/xml/dtd/docbook || exit 1
-cd $out/xml/dtd/docbook || exit 1
-$unzip/bin/unzip $src || exit 1
+mkdir -p $out/xml/dtd/docbook
+cd $out/xml/dtd/docbook
+unpackFile $src

pkgs/data/sgml+xml/schemas/xml-dtd/docbook/default.nix

@@ -3,11 +3,11 @@
 assert unzip != null;
 
 stdenv.mkDerivation {
-  name = "docbook-xml-4.2";
+  name = "docbook-xml-4.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.oasis-open.org/docbook/xml/4.2/docbook-xml-4.2.zip;
-    md5 = "73fe50dfe74ca631c1602f558ed8961f";
+    url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip;
+    md5 = "ab200202b9e136a144db1e0864c45074";
   };
-  unzip = unzip;
+  buildInputs = [unzip];
 }

pkgs/data/sgml+xml/stylesheets/xslt/docbook/builder.sh

@@ -1,8 +1,8 @@
-. $stdenv/setup || exit 1
+. $stdenv/setup
 
-mkdir $out || exit 1
-cd $out || exit 1
-tar xvfz $src || exit 1
-mkdir xml || exit 1
-mkdir xml/xsl || exit 1
-mv docbook-xsl-* xml/xsl/docbook || exit 1
+mkdir $out
+cd $out
+unpackFile $src
+mkdir xml
+mkdir xml/xsl
+mv docbook-xsl-* xml/xsl/docbook

pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "docbook-xsl-1.64.1";
+  name = "docbook-xsl-1.65.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://cesnet.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.64.1.tar.gz;
-    md5 = "ed766902e8381f6206d12f5c326fbd47";
+    url = http://heanet.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.65.1.tar.gz;
+    md5 = "2f7d446de5523ec34a19ccbe8caf387f";
   };
 }

pkgs/system/all-packages-generic.nix

@@ -526,6 +526,10 @@ rec {
     inherit fetchurl stdenv unzip;
   };
 
+  docbook_xml_ebnf_dtd = (import ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf) {
+    inherit fetchurl stdenv unzip;
+  };
+
   docbook_xml_xslt = (import ../data/sgml+xml/stylesheets/xslt/docbook) {
     inherit fetchurl stdenv;
   };

pkgs/system/populate-cache.nix

@@ -37,6 +37,7 @@ let {
       pkgs.libxml2
       pkgs.libxslt
       pkgs.docbook_xml_dtd
+      pkgs.docbook_xml_ebnf_dtd
       pkgs.docbook_xml_xslt
       pkgs.subversion
       pkgs.pan