gnu: guile: Update to 2.2.4.

* gnu/packages/guile.scm (guile-2.2): Update to 2.2.4.
(guile-2.2.4): Remove.
* gnu/packages/package-management.scm (guix)[inputs]: Switch to
GUILE-2.2.
* guix/self.scm (guile-for-build): Likewise.
This commit is contained in:
Ludovic Courtès 2018-07-27 11:20:09 +02:00
parent 8afa18d6e7
commit 2abd76e8af
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 4 additions and 22 deletions

View file

@ -228,7 +228,7 @@ (define-public guile-2.0
(define-public guile-2.2 (define-public guile-2.2
(package (inherit guile-2.0) (package (inherit guile-2.0)
(name "guile") (name "guile")
(version "2.2.3") (version "2.2.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -238,7 +238,7 @@ (define-public guile-2.2
".tar.xz")) ".tar.xz"))
(sha256 (sha256
(base32 (base32
"11j01agvnci2cx32wwpqs9078856yxmvs15gcsz7ganpkj2ahlw3")) "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Remove the pre-built object files. Instead, build everything ;; Remove the pre-built object files. Instead, build everything
@ -302,20 +302,6 @@ (define-public guile-2.2.2
(base32 (base32
"1azm25zcmxif0skxfrp11d2wc89nrzpjaann9yxdw6pvjxhs948w")))))) "1azm25zcmxif0skxfrp11d2wc89nrzpjaann9yxdw6pvjxhs948w"))))))
(define-public guile-2.2.4
;; This version contains important bug fixes, in particular wrt. to crashes
;; of multi-threaded code as used by 'guix pull' and grafting.
(package
(inherit guile-2.2)
(version "2.2.4")
(source (origin
(inherit (package-source guile-2.2))
(uri (string-append "mirror://gnu/guile/guile-" version
".tar.xz"))
(sha256
(base32
"07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"))))))
(define-public guile-next (define-public guile-next
(deprecated-package "guile-next" guile-2.2)) (deprecated-package "guile-next" guile-2.2))

View file

@ -264,9 +264,7 @@ (define (intern tarball)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
;; Use 2.2.4 to avoid various thread-safety issues while building ("guile" ,guile-2.2)
;; code in parallel.
("guile" ,guile-2.2.4)
;; Many tests rely on the 'guile-bootstrap' package, which is why we ;; Many tests rely on the 'guile-bootstrap' package, which is why we
;; have it here. ;; have it here.

View file

@ -896,10 +896,8 @@ (define canonical-package ;soft reference
(module-ref (resolve-interface '(gnu packages guile)) (module-ref (resolve-interface '(gnu packages guile))
'guile-2.2.2)) 'guile-2.2.2))
("2.2" ("2.2"
;; Use the latest version, which has fixes for
;; <https://bugs.gnu.org/30602> and VM stack-marking issues.
(canonical-package (module-ref (resolve-interface '(gnu packages guile)) (canonical-package (module-ref (resolve-interface '(gnu packages guile))
'guile-2.2.4))) 'guile-2.2)))
("2.0" ("2.0"
(module-ref (resolve-interface '(gnu packages guile)) (module-ref (resolve-interface '(gnu packages guile))
'guile-2.0)))) 'guile-2.0))))