mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-15 19:40:46 +02:00
Code Releases Activity

gnu: ghc-8.8: Update to 8.8.4.

Browse source 
* gnu/packages/haskell.scm (ghc-8.8): Update to 8.8.4.
[arguments]: Add 'fix-cc-reference phase.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Matthew James Kraai 2021-07-13 05:09:37 -07:00 • committed by Ludovic Courtès
parent 599b173b11
commit 0a1ea2b0fb
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/haskell.scm
View file

@ -20,6 +20,7 @@
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net> ;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com> ;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -613,14 +614,14 @@ interactive environment for the functional language Haskell.")
(define-public ghc-8.8 (define-public ghc-8.8
(package (inherit ghc-8.6) (package (inherit ghc-8.6)
(name "ghc") (name "ghc")
(version "8.8.3") (version "8.8.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.haskell.org/ghc/dist/" (uri (string-append "https://www.haskell.org/ghc/dist/"
version "/ghc-" version "-src.tar.xz")) version "/ghc-" version "-src.tar.xz"))
(sha256 (sha256
(base32 "128g932i3wix6ic03v04nh5755vyjiidzri9iybwad72yfmc1p70")))) (base32 "0bgwbxxvdn56l91bp9p5d083gzcfdi6z8l8b17qzjpr3n8w5wl7h"))))
(native-inputs (native-inputs
`(("ghc-bootstrap" ,ghc-8.6) `(("ghc-bootstrap" ,ghc-8.6)
("ghc-testsuite" ("ghc-testsuite"
@ -632,7 +633,7 @@ interactive environment for the functional language Haskell.")
(patches (search-patches "ghc-testsuite-dlopen-pie.patch")) (patches (search-patches "ghc-testsuite-dlopen-pie.patch"))
(sha256 (sha256
(base32 (base32
"1l32mp94ll72skfsq1g2fqax4bkiw8b85gr3wd0bbqsqyi9a9jpr")))) "0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z"))))
("git" ,git) ; invoked during tests ("git" ,git) ; invoked during tests
,@(filter (match-lambda ,@(filter (match-lambda
(("ghc-bootstrap" . _) #f) (("ghc-bootstrap" . _) #f)
@ -643,6 +644,11 @@ interactive environment for the functional language Haskell.")
(substitute-keyword-arguments (package-arguments ghc-8.6) (substitute-keyword-arguments (package-arguments ghc-8.6)
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'fix-references 'fix-cc-reference
(lambda _
(substitute* "utils/hsc2hs/Common.hs"
(("\"cc\"") "\"gcc\""))
#t))
(add-after 'unpack-testsuite 'skip-more-tests (add-after 'unpack-testsuite 'skip-more-tests
(lambda _ (lambda _
;; XXX: This test fails because our ld-wrapper script ;; XXX: This test fails because our ld-wrapper script