01/01: gnu: guile-json: Update to 1.0.1.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit f52ef55e2b7c728ebf6dd102a0344dd0c78c8118
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jun 2 15:28:12 2018 +0200

    gnu: guile-json: Update to 1.0.1.
    
    * gnu/packages/guile.scm (guile-json): Update to 1.0.1.
    [source]: Switch to github.com.  Adjust 'snippet' to modify
    'configure.ac' and 'Makefile.am'.
    [native-inputs]: Add AUTOCONF and AUTOMAKE.
---
 gnu/packages/guile.scm | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 4fdd404..a88d248 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -814,29 +814,33 @@ for Guile\".")
 (define-public guile-json
   (package
     (name "guile-json")
-    (version "0.6.0")
+    (version "1.0.1")
+    (home-page "https://github.com/aconchillo/guile-json";)
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://savannah/guile-json/guile-json-"
+              (uri (string-append home-page "/archive/"
                                   version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1qmjg7lbgciw95fkdzvlp9f68vv17kdjky42ywfzd4ffzwww0lgc"))
+                "16155dv30rhagz6dwv7xc87l386i8v0f1kgydqa2ajr166fi9qhr"))
               (modules '((guix build utils)))
               (snippet
                ;; Make sure everything goes under .../site/X.Y, like Guile's
                ;; search paths expects.
                '(begin
-                  (substitute* "configure"
-                    (("ac_subst_vars='")
-                     "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n"))
-                  (substitute* '("Makefile.in" "json/Makefile.in")
-                    (("moddir =.*/share/guile/site" all)
-                     (string-append all "/@GUILE_EFFECTIVE_VERSION@")))
-                  #t))))
+                  (substitute* "configure.ac"
+                    (("GUILE_PROGS")
+                     (string-append "GUILE_PROGS\n"
+                                    "AC_SUBST([GUILE_EFFECTIVE_VERSION])\n")))
+                  (substitute* '("Makefile.am" "json/Makefile.am")
+                    (("moddir[[:blank:]]*=.*/share/guile/site" all)
+                     (string-append all "/@GUILE_EFFECTIVE_VERSION@")))))))
     (build-system gnu-build-system)
-    (native-inputs `(("guile" ,guile-2.2)))
-    (home-page "https://savannah.nongnu.org/projects/guile-json/";)
+    (native-inputs `(("autoconf" ,autoconf)
+                     ("automake" ,automake)
+                     ("guile" ,guile-2.2)))
+    (inputs `(("guile" ,guile-2.2)))
     (synopsis "JSON module for Guile")
     (description
      "Guile-JSON supports parsing and building JSON documents according to the