diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:36:11 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:48:37 -0500 |
| commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
| tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/xml.scm | |
| parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
| download | guix-0d41fe4855588fb659b8adafe215d5573517a79b.tar.gz guix-0d41fe4855588fb659b8adafe215d5573517a79b.zip | |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/xml.scm')
| -rw-r--r-- | gnu/packages/xml.scm | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index bc76a95c59..771c577618 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -119,6 +119,7 @@ the entire document.") (package (name "expat") (version "2.4.1") + (replacement expat/fixed) (source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c)))) (origin (method url-fetch) @@ -154,6 +155,23 @@ stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags).") (license license:expat))) +(define expat/fixed + (package + (inherit expat) + (version "2.4.3") + (source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c)))) + (origin + (method url-fetch) + (uri (list (string-append "mirror://sourceforge/expat/expat/" + version "/expat-" version ".tar.xz") + (string-append + "https://github.com/libexpat/libexpat/releases/download/R_" + (string-map dot->underscore version) + "/expat-" version ".tar.xz"))) + (sha256 + (base32 + "12kp4h40cpyqqpjqaldag0xq4ig1ljzpkzy9i2marc7blnqz3ydi"))))))) + (define-public libebml (package (name "libebml") @@ -1555,7 +1573,12 @@ Excel(TM) since version 2007.") #:test-target "test" #:phases (modify-phases %standard-phases - (replace 'install (install-jars "jar"))))) + (replace 'install (install-jars "jar")) + (add-before 'check 'disable-failing-test + (lambda _ + ;; This test sometimes fails with an out of memory exception + (delete-file + "test/src/org/simpleframework/xml/core/NoAnnotationsRequiredTest.java")))))) (native-inputs (list unzip)) (home-page "http://simple.sourceforge.net/") |