public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added the Docbook 4.1 SGML DTDs.

Browse Source 
* Fixed the "docbook2man --sgml" command in docbook2x.
* Fixed the module-init-tools manual pages.

svn path=/nixpkgs/trunk/; revision=30165
This commit is contained in:
Eelco Dolstra 2011-11-01 16:47:18 +00:00
parent aa98c7dc02
commit 0918b83c75
4 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, fetchurl, unzip }:
let
src = fetchurl {
url = http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip;
sha256 = "04b3gp4zkh9c5g9kvnywdkdfkcqx3kjc04j4mpkr4xk7lgqgrany";
};
isoents = fetchurl {
url = http://www.oasis-open.org/cover/ISOEnts.zip;
sha256 = "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w";
};
in
stdenv.mkDerivation {
name = "docbook-sgml-4.1";
unpackPhase = "true";
buildInputs = [ unzip ];
installPhase =
''
o=$out/sgml/dtd/docbook-4.1
mkdir -p $o
cd $o
unzip ${src}
unzip ${isoents}
sed -e "s/iso-/ISO/" -e "s/.gml//" -i docbook.cat
'';
}

4
pkgs/os-specific/linux/module-init-tools/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, docbook2x}: { stdenv, fetchurl, docbook2x, docbook_sgml_dtd_41 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "module-init-tools-3.16"; name = "module-init-tools-3.16";
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
buildInputs = [ docbook2x ]; buildInputs = [ docbook2x ];
SGML_CATALOG_FILES = "${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat";
patches = [ ./module-dir.patch ./docbook2man.patch ]; patches = [ ./module-dir.patch ./docbook2man.patch ];
postInstall = "rm $out/sbin/insmod.static"; # don't need it postInstall = "rm $out/sbin/insmod.static"; # don't need it

8
pkgs/tools/typesetting/docbook2x/default.nix
View File

@ -1,10 +1,12 @@
{ fetchurl, stdenv, texinfo, perl { fetchurl, stdenv, texinfo, perl
, XMLSAX, XMLParser, XMLNamespaceSupport , XMLSAX, XMLParser, XMLNamespaceSupport
, groff, libxml2, libxslt, gnused, libiconv , groff, libxml2, libxslt, gnused, libiconv, opensp
, docbook_xml_dtd_43
, makeWrapper }: , makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "docbook2X-0.8.8"; name = "docbook2X-0.8.8";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/docbook2x/${name}.tar.gz"; url = "mirror://sourceforge/docbook2x/${name}.tar.gz";
sha256 = "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0"; sha256 = "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0";
@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
patches = [ ./db2x_texixml-to-stdout.patch ]; patches = [ ./db2x_texixml-to-stdout.patch ];
buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper
XMLSAX XMLParser XMLNamespaceSupport XMLSAX XMLParser XMLNamespaceSupport opensp
] ++ (if libiconv != null then [libiconv] else []); ] ++ (if libiconv != null then [libiconv] else []);
postConfigure = '' postConfigure = ''
@ -37,7 +39,7 @@ stdenv.mkDerivation rec {
--prefix PERL5LIB : \ --prefix PERL5LIB : \
"${XMLNamespaceSupport}/lib/perl5/site_perl" \ "${XMLNamespaceSupport}/lib/perl5/site_perl" \
--prefix XML_CATALOG_FILES "\ " \ --prefix XML_CATALOG_FILES "\ " \
"$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml" "$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml\ ${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml"
done done
wrapProgram $out/bin/sgml2xml-isoent --prefix PATH : \ wrapProgram $out/bin/sgml2xml-isoent --prefix PATH : \

2
pkgs/top-level/all-packages.nix
View File

@ -6180,6 +6180,8 @@ let
docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { }; docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { };
docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { };
docbook_xml_dtd_412 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix { }; docbook_xml_dtd_412 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix { };
docbook_xml_dtd_42 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix { }; docbook_xml_dtd_42 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix { };