pyrox.dev
Merge #14356: docbook updates
+3
-3
pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+3
-3
pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
···
3
3
let
4
4
5
5
common = { pname, sha256 }: stdenv.mkDerivation rec {
6
-
name = "${pname}-1.78.1";
6
+
name = "${pname}-1.79.1";
7
7
8
8
src = fetchurl {
9
9
url = "mirror://sourceforge/docbook/${name}.tar.bz2";
···
35
35
36
36
docbook_xsl = common {
37
37
pname = "docbook-xsl";
38
-
sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9";
38
+
sha256 = "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj";
39
39
};
40
40
41
41
docbook_xsl_ns = common {
42
42
pname = "docbook-xsl-ns";
43
-
sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng";
43
+
sha256 = "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin";
44
44
};
45
45
46
46
}
+5
-4
pkgs/tools/typesetting/xmlto/default.nix
+5
-4
pkgs/tools/typesetting/xmlto/default.nix
···
1
1
{ fetchurl, stdenv, flex, libxml2, libxslt
2
-
, docbook_xml_dtd_42, docbook_xsl, w3m
2
+
, docbook_xml_dtd_45, docbook_xsl, w3m
3
3
, bash, getopt, makeWrapper }:
4
4
5
5
stdenv.mkDerivation rec {
6
-
name = "xmlto-0.0.26";
6
+
name = "xmlto-0.0.28";
7
7
src = fetchurl {
8
8
url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2";
9
-
sha256 = "1v5mahfg5k9lh3anykl482xnrgxn36zlmqsgwahw29xwncprpd7g";
9
+
sha256 = "0xhj8b2pwp4vhl9y16v3dpxpsakkflfamr191mprzsspg4xdyc0i";
10
10
};
11
11
12
12
patchPhase = ''
···
20
20
21
21
# `libxml2' provides `xmllint', needed at build-time and run-time.
22
22
# `libxslt' provides `xsltproc', used by `xmlto' at run-time.
23
-
buildInputs = [ libxml2 libxslt docbook_xml_dtd_42 docbook_xsl getopt makeWrapper ];
23
+
nativeBuildInputs = [ makeWrapper ];
24
+
buildInputs = [ libxml2 libxslt docbook_xml_dtd_45 docbook_xsl getopt ];
24
25
25
26
postInstall = ''
26
27
wrapProgram "$out/bin/xmlto" \