01/02: gnu: expat: Add additional source URI

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit f85c8dd8aec96869d7b56e2e926d2e2e758da1cf
Author: Jack Hill <address@hidden>
Date:   Wed Jul 10 16:03:19 2019 -0400

    gnu: expat: Add additional source URI
    
    The expat sourceforge page announces that the project is in the process of
    moving to GitHub.
    
    * gnu/packages/xml.scm (expat)[source]: Add GitHub URI.
    
    Signed-off-by: Marius Bakke <address@hidden>
---
 gnu/packages/xml.scm | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 8c5c7b0..e3260be 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2017 Petter <address@hidden>
 ;;; Copyright © 2017 Stefan Reichör <address@hidden>
 ;;; Copyright © 2018 Pierre Neidhardt <address@hidden>
+;;; Copyright © 2018 Jack Hill <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -66,13 +67,18 @@
   (package
     (name "expat")
     (version "2.2.6")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://sourceforge/expat/expat/"
-                                 version "/expat-" version ".tar.bz2"))
-             (sha256
-              (base32
-               "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p"))))
+    (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.bz2")
+                           (string-append
+                            
"https://github.com/libexpat/libexpat/releases/download/R_";
+                            (string-map dot->underscore version)
+                            "/expat-" version ".tar.bz2")))
+                (sha256
+                 (base32
+                  "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p")))))
     (build-system gnu-build-system)
     (home-page "https://libexpat.github.io/";)
     (synopsis "Stream-oriented XML parser library written in C")