diff options
author | Marius Bakke <marius@gnu.org> | 2020-05-26 22:34:46 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-05-26 22:34:46 +0200 |
commit | aa13c5657d4f8b5dd52beda88a9a8ccc59ebca86 (patch) | |
tree | 856094a6541a72b70d471ed5265d6e940cb11e55 /gnu/packages/xml.scm | |
parent | 8ab211dbdb7df000a64aceadfe7b53488819d245 (diff) | |
parent | b4f04e0efff1fb6112b84dc6d36ea46215c336b2 (diff) | |
download | guix-aa13c5657d4f8b5dd52beda88a9a8ccc59ebca86.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/xml.scm')
-rw-r--r-- | gnu/packages/xml.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 03daebb4a7..d9efd5264b 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> +;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -817,16 +818,17 @@ server, collect the answer, and finally decoding the XML to Perl.") (base32 "1z1a88bpy64j42bbyl8acbfl3dn9iaz47gx6clkgy5sbn4kr0kgk")))) (build-system perl-build-system) - (arguments - `(#:tests? #f)) ; tests require internet connection (native-inputs `(("perl-module-build" ,perl-module-build) ("perl-uri" ,perl-uri) ("perl-class-data-inheritable" ,perl-class-data-inheritable))) - (inputs + (propagated-inputs `(("perl-class-errorhandler" ,perl-class-errorhandler) ("perl-datetime" ,perl-datetime) + ("perl-datetime-format-flexible" ,perl-datetime-format-flexible) + ("perl-datetime-format-iso8601" ,perl-datetime-format-iso8601) ("perl-datetime-format-mail" ,perl-datetime-format-mail) + ("perl-datetime-format-natural" ,perl-datetime-format-natural) ("perl-datetime-format-w3cdtf" ,perl-datetime-format-w3cdtf) ("perl-feed-find" ,perl-feed-find) ("perl-html-parser" ,perl-html-parser) @@ -1101,7 +1103,7 @@ C++ programming language.") (define-public tinyxml2 (package (name "tinyxml2") - (version "7.0.1") + (version "8.0.0") (source (origin (method git-fetch) @@ -1110,7 +1112,7 @@ C++ programming language.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1sf6sch1kawrna2f9dc8f4xl836acqcddkghzdib0s7dl48m9r7m")))) + (base32 "0raa8r2hsagk7gjlqjwax95ib8d47ba79n91r4aws2zg8y6ssv1d")))) (build-system cmake-build-system) (synopsis "Small XML parser for C++") (description "TinyXML2 is a small and simple XML parsing library for the |