diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
| commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
| tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/packages/xml.scm | |
| parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
| parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
| download | guix-01f0707207741ce2a5d7509a175464799b08aea6.tar.gz | |
Merge branch 'staging' into 'core-updates'.
Conflicts: gnu/local.mk gnu/packages/cmake.scm gnu/packages/curl.scm gnu/packages/gl.scm gnu/packages/glib.scm gnu/packages/guile.scm gnu/packages/node.scm gnu/packages/openldap.scm gnu/packages/package-management.scm gnu/packages/python-xyz.scm gnu/packages/python.scm gnu/packages/tls.scm gnu/packages/vpn.scm gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/xml.scm')
| -rw-r--r-- | gnu/packages/xml.scm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index fe475e38d1..065f523387 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1128,12 +1128,15 @@ Libxml2).") (inputs `(("nss" ,nss) ("libltdl" ,libltdl))) + (arguments + ;; NSS no longer supports MD5 since 3.59, don't attempt to use it. + '(#:configure-flags '("--disable-md5"))) (synopsis "XML Security Library (using NSS instead of GnuTLS)"))) (define-public minixml (package (name "minixml") - (version "2.12") + (version "3.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/michaelrsweet/mxml/" @@ -1141,14 +1144,14 @@ Libxml2).") "/mxml-" version ".tar.gz")) (sha256 (base32 - "0kq3wiycb40dcyswvajrqb1n5ffm5xcnsfxxaml92vhpl6x57yvb")))) + "0x698ayv00vrjg0yfm20lakpgl7m02x1fk2n09wygwk4973gd55q")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) #:tests? #f)) ; tests are run during build - (home-page "https://michaelrsweet.github.io/mxml") + (home-page "https://www.msweet.org/mxml/") (synopsis "Small XML parsing library") (description "Mini-XML is a small C library to read and write XML files and strings in @@ -2140,7 +2143,7 @@ outputting XML data from Java code.") (define-public java-xstream (package (name "java-xstream") - (version "1.4.10") + (version "1.4.15") (source (origin (method git-fetch) @@ -2152,7 +2155,7 @@ outputting XML data from Java code.") version))))) (file-name (git-file-name name version)) (sha256 - (base32 "12m2bw8bapdc1w0pni9wl5hh2y8jfdgcvxd464jl9917dsp3ai2n")))) + (base32 "1178qryrjwjp44439pi5dxzd32896r5zs429z1qhlc09951r7mi9")))) (build-system ant-build-system) (arguments `(#:jar-name "xstream.jar" |