GNU bug report logs - #49542
[PATCH] gnu: ghc-8.8: Update to 8.8.4.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49542 in the body.
You can then email your comments to 49542 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Matthew James Kraai <kraai <at> ftbfs.org>
To: guix-patches <at> gnu.org
Cc: Matthew James Kraai <kraai <at> ftbfs.org>
Subject: [PATCH] gnu: ghc-8.8: Update to 8.8.4.
Date: Tue, 13 Jul 2021 05:09:37 -0700

* gnu/packages/haskell.scm (ghc-8.8): Update to 8.8.4.
[arguments]: Add 'fix-cc-reference phase.
---
 gnu/packages/haskell.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 09732fc594..3d10bdc946 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2019 Robert Vollmert <rob <at> vllmrt.net>
 ;;; Copyright © 2019 Jacob MacDonald <jaccarmac <at> gmail.com>
 ;;; Copyright © 2020 Marius Bakke <mbakke <at> fastmail.com>
+;;; Copyright © 2021 Matthew James Kraai <kraai <at> ftbfs.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -613,14 +614,14 @@ interactive environment for the functional language Haskell.")
 (define-public ghc-8.8
   (package (inherit ghc-8.6)
     (name "ghc")
-    (version "8.8.3")
+    (version "8.8.4")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.haskell.org/ghc/dist/"
                            version "/ghc-" version "-src.tar.xz"))
        (sha256
-        (base32 "128g932i3wix6ic03v04nh5755vyjiidzri9iybwad72yfmc1p70"))))
+        (base32 "0bgwbxxvdn56l91bp9p5d083gzcfdi6z8l8b17qzjpr3n8w5wl7h"))))
     (native-inputs
      `(("ghc-bootstrap" ,ghc-8.6)
        ("ghc-testsuite"
@@ -632,7 +633,7 @@ interactive environment for the functional language Haskell.")
            (patches (search-patches "ghc-testsuite-dlopen-pie.patch"))
            (sha256
             (base32
-             "1l32mp94ll72skfsq1g2fqax4bkiw8b85gr3wd0bbqsqyi9a9jpr"))))
+             "0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z"))))
        ("git" ,git)                     ; invoked during tests
        ,@(filter (match-lambda
                    (("ghc-bootstrap" . _) #f)
@@ -643,6 +644,11 @@ interactive environment for the functional language Haskell.")
      (substitute-keyword-arguments (package-arguments ghc-8.6)
        ((#:phases phases '%standard-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
              (lambda _
                ;; XXX: This test fails because our ld-wrapper script
-- 
2.32.0

Message #10 received at 49542-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Matthew James Kraai <kraai <at> ftbfs.org>
Cc: 49542-done <at> debbugs.gnu.org
Subject: Re: bug#49542: [PATCH] gnu: ghc-8.8: Update to 8.8.4.
Date: Mon, 26 Jul 2021 19:40:28 +0200

Hi,

Matthew James Kraai <kraai <at> ftbfs.org> skribis:

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

Applied, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.