guix_mirror_bot pushed a commit to branch world-rebuild in repository guix.
commit 215be2fadee16e763ddd999cd6c0c27c1f645e41 Author: Zheng Junjie <[email protected]> AuthorDate: Fri Sep 18 10:42:14 2026 +0800 gnu: expat: Update to 2.8.4. * gnu/packages/xml.scm (expat): Update to 2.8.4. [replacement]: Remove it. [source]: Remove sourceforge source. [arguments]: Use Gexp. (expat-2.8.4): Delete variable. Merges: https://codeberg.org/guix/guix/pulls/11302 Signed-off-by: Nguyễn Gia Phong <[email protected]> --- gnu/packages/xml.scm | 57 ++++++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 8e50bd8ee25..1704e400149 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -132,34 +132,32 @@ the entire document.") (define-public expat (package (name "expat") - (version "2.7.1") - (replacement expat-2.8.4) + (version "2.8.4") (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"))) + (uri (string-append + "https://github.com/libexpat/libexpat/releases/download/R_"; + (string-map dot->underscore version) + "/expat-" version ".tar.xz")) (sha256 (base32 - "0c3w446jrrnss3ccgx9z590lpwbpxiqdbxv2a0p036cg9da54i9m"))))) + "19w5k6q7ccw7v8wn5v60hj096hv27vrm9qml7d8ymd53ip6f2sk5"))))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'install 'move-static-library - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (static (assoc-ref outputs "static"))) - (mkdir-p (string-append static "/lib")) - (link (string-append out "/lib/libexpat.a") - (string-append static "/lib/libexpat.a")) - (delete-file (string-append out "/lib/libexpat.a")) - (substitute* (string-append out "/lib/libexpat.la") - (("old_library=.*") - "old_library=''")))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'install 'move-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let ((out #$output) + (static #$output:static)) + (mkdir-p (string-append static "/lib")) + (link (string-append out "/lib/libexpat.a") + (string-append static "/lib/libexpat.a")) + (delete-file (string-append out "/lib/libexpat.a")) + (substitute* (string-append out "/lib/libexpat.la") + (("old_library=.*") + "old_library=''")))))))) (outputs '("out" "static")) (home-page "https://libexpat.github.io/";) (synopsis "Stream-oriented XML parser library written in C") @@ -169,23 +167,6 @@ 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-2.8.4 - (hidden-package - (package - (inherit expat) - (name "expat") - (version "2.8.4") - (source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c)))) - (origin - (method url-fetch) - (uri (string-append - "https://github.com/libexpat/libexpat/releases/download/R_"; - (string-map dot->underscore version) - "/expat-" version ".tar.xz")) - (sha256 - (base32 - "19w5k6q7ccw7v8wn5v60hj096hv27vrm9qml7d8ymd53ip6f2sk5")))))))) - (define-public libebml (package (name "libebml")
