me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ludovic Courtès 2020-09-04 15:57:50 +02:00
parent d6983b1331
commit e9db10ae7f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/package-management.scm
View File

@ -1000,6 +1000,15 @@ environments.")
(substitute* "configure.ac" (substitute* "configure.ac"
(("^GUILE_PKG.*") (("^GUILE_PKG.*")
"GUILE_PKG([3.0 2.2])\n")) "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)) #t))
(file-name (string-append "guix-jupyter-" version "-checkout")))) (file-name (string-append "guix-jupyter-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)