diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
| commit | f03426420497cd9839f5fb3cb547dbecd8d6053b (patch) | |
| tree | 220cdbab5b58b27c63d2df3ee711ad4bfdda074b /gnu/packages/xml.scm | |
| parent | 3cf1afb7e7249992b2db2f4f00899fd22237e89a (diff) | |
| parent | 069399ee9dbf75b7c89583f03346a63b2cfe4ac6 (diff) | |
| download | guix-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu/local.mk gnu/packages/bioinformatics.scm gnu/packages/django.scm gnu/packages/gtk.scm gnu/packages/llvm.scm gnu/packages/python-web.scm gnu/packages/python.scm gnu/packages/tex.scm guix/build-system/asdf.scm guix/build/emacs-build-system.scm guix/profiles.scm
Diffstat (limited to 'gnu/packages/xml.scm')
| -rw-r--r-- | gnu/packages/xml.scm | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index ad5f35ef1e..9483ba4ea3 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> @@ -227,7 +227,7 @@ project (but it is usable outside of the Gnome platform).") (define-public libxlsxwriter (package (name "libxlsxwriter") - (version "1.0.1") + (version "1.0.3") (source (origin (method git-fetch) @@ -236,7 +236,7 @@ project (but it is usable outside of the Gnome platform).") (commit (string-append "RELEASE_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0dsqv4qdd582fhwj6m80iz50gkyw4m8n9h4mkd2871csa03sbilf")) + (base32 "14c5rgx87nhzasr0j7mcfr1w7ifz0gmdiqy2xq59di5xvcdrpxpv")) (modules '((guix build utils))) (snippet ;; Remove bundled minizip source @@ -1218,14 +1218,14 @@ XSL-T processor. It also performs any necessary post-processing.") (define-public xmlsec (package (name "xmlsec") - (version "1.2.31") + (version "1.2.32") (source (origin (method url-fetch) (uri (string-append "https://www.aleksey.com/xmlsec/download/" "xmlsec1-" version ".tar.gz")) (sha256 (base32 - "09hbbaz2d9hw645q27apkjs1mdr6vd85x5z3c9hzgr1iri9bq44v")))) + "0hy0nwz57n9r5wwab9xa66gzwlwvzs54nhlfn3jh8q13acl710z3")))) (build-system gnu-build-system) (propagated-inputs ; according to xmlsec1.pc `(("libxml2" ,libxml2) @@ -1261,6 +1261,14 @@ Libxml2).") '(#:configure-flags '("--disable-md5"))) (synopsis "XML Security Library (using NSS instead of GnuTLS)"))) +(define-public xmlsec-openssl + (package/inherit xmlsec + (name "xmlsec-openssl") + (inputs + `(("openssl" ,openssl) + ("libltdl" ,libltdl))) + (synopsis "XML Security Library (using OpenSSL instead of GnuTLS)"))) + (define-public minixml (package (name "minixml") |