Merge #14356: docbook updates
This commit is contained in:
commit
bd458e56b6
@ -3,7 +3,7 @@
|
||||
let
|
||||
|
||||
common = { pname, sha256 }: stdenv.mkDerivation rec {
|
||||
name = "${pname}-1.78.1";
|
||||
name = "${pname}-1.79.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/docbook/${name}.tar.bz2";
|
||||
@ -35,12 +35,12 @@ in {
|
||||
|
||||
docbook_xsl = common {
|
||||
pname = "docbook-xsl";
|
||||
sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9";
|
||||
sha256 = "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj";
|
||||
};
|
||||
|
||||
docbook_xsl_ns = common {
|
||||
pname = "docbook-xsl-ns";
|
||||
sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng";
|
||||
sha256 = "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin";
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -1,12 +1,12 @@
|
||||
{ fetchurl, stdenv, flex, libxml2, libxslt
|
||||
, docbook_xml_dtd_42, docbook_xsl, w3m
|
||||
, docbook_xml_dtd_45, docbook_xsl, w3m
|
||||
, bash, getopt, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xmlto-0.0.26";
|
||||
name = "xmlto-0.0.28";
|
||||
src = fetchurl {
|
||||
url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2";
|
||||
sha256 = "1v5mahfg5k9lh3anykl482xnrgxn36zlmqsgwahw29xwncprpd7g";
|
||||
sha256 = "0xhj8b2pwp4vhl9y16v3dpxpsakkflfamr191mprzsspg4xdyc0i";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# `libxml2' provides `xmllint', needed at build-time and run-time.
|
||||
# `libxslt' provides `xsltproc', used by `xmlto' at run-time.
|
||||
buildInputs = [ libxml2 libxslt docbook_xml_dtd_42 docbook_xsl getopt makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ libxml2 libxslt docbook_xml_dtd_45 docbook_xsl getopt ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/xmlto" \
|
||||
|
Loading…
Reference in New Issue
Block a user