01/01: import: hackage: Update list of ghc-included packages.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 1cc12357a65e4479c2f4735e915941382ef82d94
Author: Robert Vollmert <address@hidden>
Date:   Sat May 25 22:11:02 2019 +0200

    import: hackage: Update list of ghc-included packages.
    
    Update the list of excepted dependencies for current ghc-8.4, based on the
    release notes at
    
https://downloads.haskell.org/~ghc/8.4.3/docs/html/users_guide/8.4.3-notes.html
    
    Particularly, this adds `text` to the list, which is a dependency of 
`parsec`
    which was already on the list before, causing build failures with updated
    versions of the `text` package.
    
    * guix/import/hackage.scm (ghc-standard-libraries): Update list.
    
    Signed-off-by: Ricardo Wurmus <address@hidden>
---
 guix/import/hackage.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index bf7e99d..366256b 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -51,34 +51,35 @@
             hackage-package?))
 
 (define ghc-standard-libraries
-  ;; List of libraries distributed with ghc (7.10.2). We include GHC itself as
-  ;; some packages list it.
-  '("array"
+  ;; List of libraries distributed with ghc (8.4.3).
+  ;; 
https://downloads.haskell.org/~ghc/8.4.3/docs/html/users_guide/8.4.3-notes.html
+  '("ghc"
+    "cabal" ;; in the output of `ghc-pkg list` Cabal is uppercased, but
+            ;; hackage-name->package-name takes this into account.
+    "win32" ;; similarly uppercased
+    "array"
     "base"
-    "bin-package-db"
     "binary"
     "bytestring"
-    "cabal" ;; in the output of `ghc-pkg list` Cabal is uppercased, but
-            ;; hackage-name->package-name takes this into account.
     "containers"
     "deepseq"
     "directory"
     "filepath"
-    "ghc"
+    "ghc-boot"
+    "ghc-compact"
     "ghc-prim"
+    "ghci"
     "haskeline"
-    "hoopl"
     "hpc"
     "integer-gmp"
-    "pretty"
+    "mtl"
+    "parsec"
     "process"
-    "rts"
     "template-haskell"
-    "terminfo"
+    "text"
     "time"
     "transformers"
     "unix"
-    "win32"
     "xhtml"))
 
 (define package-name-prefix "ghc-")