GNU bug report logs - #46083
[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 46083 in the body.
You can then email your comments to 46083 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: itd <itd <at> net.in.tum.de>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: ghc-8.8: Update to 8.8.4.
Date: Sun, 24 Jan 2021 18:39:10 +0100

* gnu/packages/patches/ghc-hsc2hs-default-compiler.patch: New file.
* gnu/packages/haskell.scm (ghc-8.8): Update to 8.8.4
[source]: Add new patch.
---
Hi,

please consider updating ghc-8.8 to version 8.8.4.  Below a possible
patch for that.  Feedback appreciated.

Without the new patch some tests failed with output "Can't find cc":

> Unexpected failures:
>    ffi/should_run/Capi_Ctype_001.run          Capi_Ctype_001 [bad exit code] (normal)
>    ffi/should_run/Capi_Ctype_002.run          Capi_Ctype_002 [bad exit code] (normal)
>    hsc2hs/hsc2hs001.run                       hsc2hs001 [bad exit code] (normal)
>    hsc2hs/hsc2hs002.run                       hsc2hs002 [bad exit code] (normal)
>    hsc2hs/hsc2hs003.run                       hsc2hs003 [bad exit code] (normal)
>    hsc2hs/hsc2hs004.run                       hsc2hs004 [bad exit code] (normal)
>    hsc2hs/T3837.run                           T3837 [bad exit code] (normal)
>    hsc2hs/T4340.run                           T4340 [bad exit code] (normal)
>    hsc2hs/T10272.run                          T10272 [bad exit code] (normal)
>    hsc2hs/T11004.run                          T11004 [bad exit code] (normal)
>    hsc2hs/T12504.run                          T12504 [bad exit code] (normal)
>    hsc2hs/T15758.run                          T15758 [bad exit code] (normal)
>    libraries/base/tests/IO/T12010/T12010.run  T12010 [bad exit code] (threaded1)

Thanks.

Best regards
itd

 gnu/packages/haskell.scm                          |  7 ++++---
 .../patches/ghc-hsc2hs-default-compiler.patch     | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/ghc-hsc2hs-default-compiler.patch

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 09732fc594..494acbf88a 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -613,14 +613,15 @@ 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"))
+       (patches (search-patches "ghc-hsc2hs-default-compiler.patch"))
        (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)
diff --git a/gnu/packages/patches/ghc-hsc2hs-default-compiler.patch b/gnu/packages/patches/ghc-hsc2hs-default-compiler.patch
new file mode 100644
index 0000000000..72f9049463
--- /dev/null
+++ b/gnu/packages/patches/ghc-hsc2hs-default-compiler.patch
@@ -0,0 +1,15 @@
+GCC does not provide "cc" on guix.  Hence, look for "gcc" instead.
+
+diff --git a/utils/hsc2hs/Common.hs b/utils/hsc2hs/Common.hs
+index 50471b1..c8bd297 100644
+--- a/utils/hsc2hs/Common.hs
++++ b/utils/hsc2hs/Common.hs
+@@ -20,7 +20,7 @@ die :: String -> IO a
+ die s = hPutStr stderr s >> exitWith (ExitFailure 1)
+ 
+ default_compiler :: String
+-default_compiler = "cc"
++default_compiler = "gcc"
+ 
+ ------------------------------------------------------------------------
+ -- Write the output files.
-- 
2.29.2

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

From: itd <itd <at> net.in.tum.de>
To: 46083-done <at> debbugs.gnu.org
Subject: Fixed by update
Date: Sun, 17 Oct 2021 02:18:22 +0200

Current Guix has updated ghc.

Previous Next

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