02/02: gnu: guix-jupyter: Fix compilation with Guile-JSON >= 4.3.x.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit e9db10ae7ff67b8d368b6557d6be5ddca5e6358d
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Sep 4 15:57:50 2020 +0200

    gnu: guix-jupyter: Fix compilation with Guile-JSON >= 4.3.x.
    
    Reported by wehlutyk on #guix.
    
    * gnu/packages/package-management.scm (guix-jupyter)[source]: Avoid
    'define-json-mapping' name clash with Guile-JSON.
---
 gnu/packages/package-management.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index d05b343..11aae91 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1000,6 +1000,15 @@ environments.")
                   (substitute* "configure.ac"
                     (("^GUILE_PKG.*")
                      "GUILE_PKG([3.0 2.2])\n"))
+
+                  ;; Avoid name clash and build failure now that
+                  ;; 'define-json-mapping' is also provided by Guile-JSON, as
+                  ;; of version 4.3.
+                  (substitute* (find-files "." "\\.scm$")
+                    (("define-json-mapping")
+                     "define-json-mapping*")
+                    (("<=>")
+                     "<->"))
                   #t))
               (file-name (string-append "guix-jupyter-" version "-checkout"))))
     (build-system gnu-build-system)