01/328: gnu: Use GHC 8.6.5 as the main Haskell compiler.

[guix-commits]

samplet pushed a commit to branch wip-haskell-updates
in repository guix.

commit 98316366b3ef17f83bc62339e791c2b9319d0501
Author: Timothy Sample <address@hidden>
Date:   Wed Oct 30 22:22:30 2019 -0400

    gnu: Use GHC 8.6.5 as the main Haskell compiler.
    
    * gnu/package/haskell.scm (ghc-8): Change to 'ghc-8.6'.
    * guix/import/hackage.scm (ghc-standard-libraries): Add 'ghc-heap'
    and 'libiserv'.
---
 gnu/packages/haskell.scm | 2 +-
 guix/import/hackage.scm  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index d86daa5..8db650e 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -604,7 +604,7 @@ interactive environment for the functional language 
Haskell.")
                                 (file-pattern ".*\\.conf\\.d$")
                                 (file-type 'directory))))))
 
-(define-public ghc-8 ghc-8.4)
+(define-public ghc-8 ghc-8.6)
 
 (define-public ghc ghc-8)
 
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 5fe3d85..9cf07c9 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -52,8 +52,8 @@
             hackage-package?))
 
 (define ghc-standard-libraries
-  ;; List of libraries distributed with ghc (8.4.3).
-  ;; Contents of ...-ghc-8.4.3/lib/ghc-8.4.3.
+  ;; List of libraries distributed with ghc (8.6.5).
+  ;; Contents of ...-ghc-8.6.5/lib/ghc-8.6.5.
   '("ghc"
     "cabal" ;; in the output of `ghc-pkg list` Cabal is uppercased, but
             ;; hackage-name->package-name takes this into account.
@@ -70,11 +70,13 @@
     "ghc-boot"
     "ghc-boot-th"
     "ghc-compact"
+    "ghc-heap"
     "ghc-prim"
     "ghci"
     "haskeline"
     "hpc"
     "integer-gmp"
+    "libiserv"
     "mtl"
     "parsec"
     "pretty"