summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-08-08 18:14:45 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-08-08 18:14:45 +0200
commit36f400f6166af069d0e17cc486fb800bbe947131 (patch)
tree91eb12f802c05071041989efff40dcad69ca63e8 /guix
parentc8f5827a5654f8cebe23231e25ce541b0d0d8878 (diff)
parentffc4869e45e852414b6ead19e7d93fca96d4e833 (diff)
Merge branch 'master' into staging
Diffstat (limited to 'guix')
-rw-r--r--guix/import/hackage.scm8
1 files changed, 7 insertions, 1 deletions
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 6f426af900..5fe3d85a7f 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -52,7 +53,7 @@
(define ghc-standard-libraries
;; 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
+ ;; Contents of ...-ghc-8.4.3/lib/ghc-8.4.3.
'("ghc"
"cabal" ;; in the output of `ghc-pkg list` Cabal is uppercased, but
;; hackage-name->package-name takes this into account.
@@ -65,7 +66,9 @@
"deepseq"
"directory"
"filepath"
+ "ghc"
"ghc-boot"
+ "ghc-boot-th"
"ghc-compact"
"ghc-prim"
"ghci"
@@ -74,8 +77,11 @@
"integer-gmp"
"mtl"
"parsec"
+ "pretty"
"process"
+ "stm"
"template-haskell"
+ "terminfo"
"text"
"time"
"transformers"