gnu: guile: Update to 3.0.7.
* gnu/packages/guile.scm (guile-3.0): Update to 3.0.7 by merging with GUILE-3.0-LATEST. (guile-3.0-latest): Define as an alias.master
parent
25487c3fe6
commit
a81c898fd7
|
@ -291,21 +291,30 @@ without requiring the source code to be rewritten.")
|
||||||
(package
|
(package
|
||||||
(inherit guile-2.2)
|
(inherit guile-2.2)
|
||||||
(name "guile")
|
(name "guile")
|
||||||
(version "3.0.5")
|
(version "3.0.7")
|
||||||
(source (origin
|
(source (origin
|
||||||
(inherit (package-source guile-2.2))
|
(inherit (package-source guile-2.2)) ;preserve snippet
|
||||||
|
(patches '())
|
||||||
(uri (string-append "mirror://gnu/guile/guile-"
|
(uri (string-append "mirror://gnu/guile/guile-"
|
||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1wah6fq1h8vmbpdadjych1mq8hyqkd7p015cbxm14ri37l1gnxid"))))
|
"1dwiwsrpm4f96alfnz6wibq378242z4f16vsxgy1n9r00v3qczgm"))))
|
||||||
|
|
||||||
|
;; Build with the bundled mini-GMP to avoid interference with GnuTLS' own
|
||||||
|
;; use of GMP via Nettle: <https://issues.guix.gnu.org/46330>.
|
||||||
|
(propagated-inputs
|
||||||
|
(srfi-1:fold srfi-1:alist-delete
|
||||||
|
(package-propagated-inputs guile-2.2)
|
||||||
|
'("gmp" "libltdl")))
|
||||||
(arguments
|
(arguments
|
||||||
;; XXX: JIT-enabled Guile crashes in obscure ways on GNU/Hurd.
|
(substitute-keyword-arguments (package-arguments guile-2.2)
|
||||||
(if (hurd-target?)
|
((#:configure-flags flags ''())
|
||||||
(substitute-keyword-arguments (package-arguments guile-2.2)
|
(let ((flags `(cons "--enable-mini-gmp" ,flags)))
|
||||||
((#:configure-flags flags ''())
|
;; XXX: JIT-enabled Guile crashes in obscure ways on GNU/Hurd.
|
||||||
`(cons "--disable-jit" ,flags)))
|
(if (hurd-target?)
|
||||||
(package-arguments guile-2.2)))
|
`(cons "--disable-jit" ,flags)
|
||||||
|
flags)))))
|
||||||
(native-search-paths
|
(native-search-paths
|
||||||
(list (search-path-specification
|
(list (search-path-specification
|
||||||
(variable "GUILE_LOAD_PATH")
|
(variable "GUILE_LOAD_PATH")
|
||||||
|
@ -316,31 +325,7 @@ without requiring the source code to be rewritten.")
|
||||||
"share/guile/site/3.0")))))))
|
"share/guile/site/3.0")))))))
|
||||||
|
|
||||||
(define-public guile-3.0-latest
|
(define-public guile-3.0-latest
|
||||||
;; TODO: Make this 'guile-3.0' on the next rebuild cycle.
|
guile-3.0)
|
||||||
(package
|
|
||||||
(inherit guile-3.0)
|
|
||||||
(version "3.0.7")
|
|
||||||
(source (origin
|
|
||||||
(inherit (package-source guile-3.0)) ;preserve snippet
|
|
||||||
(patches '())
|
|
||||||
(uri (string-append "mirror://gnu/guile/guile-"
|
|
||||||
version ".tar.xz"))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1dwiwsrpm4f96alfnz6wibq378242z4f16vsxgy1n9r00v3qczgm"))))
|
|
||||||
|
|
||||||
;; Build with the bundled mini-GMP to avoid interference with GnuTLS' own
|
|
||||||
;; use of GMP via Nettle: <https://issues.guix.gnu.org/46330>. Use
|
|
||||||
;; LIBGC/DISABLE-MUNMAP to work around <https://bugs.gnu.org/40525>.
|
|
||||||
;; Remove libltdl, which is no longer used.
|
|
||||||
(propagated-inputs
|
|
||||||
`(("bdw-gc" ,libgc/disable-munmap)
|
|
||||||
,@(srfi-1:fold srfi-1:alist-delete (package-propagated-inputs guile-3.0)
|
|
||||||
'("gmp" "libltdl" "bdw-gc"))))
|
|
||||||
(arguments
|
|
||||||
(substitute-keyword-arguments (package-arguments guile-3.0)
|
|
||||||
((#:configure-flags flags ''())
|
|
||||||
`(cons "--enable-mini-gmp" ,flags))))))
|
|
||||||
|
|
||||||
(define-public guile-3.0/libgc-7
|
(define-public guile-3.0/libgc-7
|
||||||
;; Using libgc-7 avoid crashes that can occur, particularly when loading
|
;; Using libgc-7 avoid crashes that can occur, particularly when loading
|
||||||
|
|
Reference in New Issue