From e9db10ae7ff67b8d368b6557d6be5ddca5e6358d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 4 Sep 2020 15:57:50 +0200 Subject: [PATCH] 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 d05b343628..11aae911c2 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)