Bump `base` version to 4.8.0.0 for real

This commit updates several submodules in order to bump
the upper bounds on `base` of most boot packages

Moreover, this updates some of the test-suite cases which have
version numbers hardcoded within.

However, I'm not sure if this commit didn't introduce the following
two test-failures

   ghc-api  T8628 [bad stdout] (normal)
   ghc-api  T8639_api [bad stdout] (normal)

This needs investigation

43 files changed, 43 insertions, 36 deletions

diff --git a/libraries/array b/libraries/array
-Subproject 7784c531e2fc8ae7e544ce50293a6108005cedd
+Subproject bfb488592cf5c92a6970eff64b9495970464014
diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index b7828a9c20..74297bb317 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -1,6 +1,6 @@
 name:           base
-version:        4.7.1.0
--- GHC 7.6.1 released with 4.6.0.0
+version:        4.8.0.0
+-- NOTE: Don't forget to update ./changelog.md
 license:        BSD3
 license-file:   LICENSE
 maintainer:     libraries@haskell.org
diff --git a/libraries/deepseq b/libraries/deepseq
-Subproject 3a9c431e4c89ca506aae8e80867cfcde8c09972
+Subproject 3815fe819ba465159cc618b3521adcba97e3c0d
diff --git a/libraries/directory b/libraries/directory
-Subproject 54c677d227b278de694b10398404981d64ece62
+Subproject 2cb66787cc3599d5ded2b8c7f8b23bc7b152b58
diff --git a/libraries/filepath b/libraries/filepath
-Subproject 57d9b11e4a551588ae5df4013e192ff6ec7812f
+Subproject 7011e20dbe30f96f34f6cfb1fd3f3aad9e7a653
diff --git a/libraries/haskeline b/libraries/haskeline
-Subproject 5579fc2a2949a143ec8946b9bc9dd2ba957bf09
+Subproject d62474efd5256a0668634f612f078a1c730a8d0
diff --git a/libraries/haskell2010 b/libraries/haskell2010
-Subproject c0c87ad53e377aa00f4897bc729c261459b6048
+Subproject acf64b69b05aab78d67461facaf83d4473c0595
diff --git a/libraries/haskell98 b/libraries/haskell98
-Subproject cc6bbbf2bf4eaea57062043cbb6e7c5d6c2f42a
+Subproject 737333db1a8eaed9312268e02bade5344d175d0
diff --git a/libraries/hoopl b/libraries/hoopl
-Subproject a2e34db038b737365c4126f69b1a32eae84dae6
+Subproject 7f06b16ba3a49c2c927fb06fe7dc89089dd7e29
diff --git a/libraries/hpc b/libraries/hpc
-Subproject fb14d3428ba24d36e779736989dae3092a50a95
+Subproject 79eaff2567872279fd916e52f0c39de5e6370b5
diff --git a/libraries/old-locale b/libraries/old-locale
-Subproject 7e7f6722895af36ca4e2f60f2fdfdc056b70db0
+Subproject 6a0f699014a61c23e84036a6fcce97ecc856234
diff --git a/libraries/old-time b/libraries/old-time
-Subproject e816d30ae8c64ccde2dde3063a7420abc922a0d
+Subproject 6a13541b3fff7ff59a17689efaed0818bf87a6e
diff --git a/libraries/parallel b/libraries/parallel
-Subproject 8df9de914ea3ab7f47874e53b7e9d7c6af4d7f8
+Subproject 94e1aa6f621df464c237c9987bb7f65bd4cb5ff
diff --git a/libraries/process b/libraries/process
-Subproject 35bf51cb72baaaeaad22fb340aa9d8c957d2186
+Subproject ec5df5c5752e1cfa02d13685d912a26809ce6c8
diff --git a/libraries/stm b/libraries/stm
-Subproject f456ac3d651ec2f7257df875bf0779fd0ca7316
+Subproject 40fd6d88f75c31b66419ab93f436225c9403846
diff --git a/libraries/template-haskell/changelog.md b/libraries/template-haskell/changelog.md
new file mode 100644
index 0000000000..7d39d35b9a
--- /dev/null
+++ b/libraries/template-haskell/changelog.md
@@ -0,0 +1,5 @@
+# Changelog for [`template-haskell` package](http://hackage.haskell.org/package/template-haskell)
+
+## 2.10.0.0  *TBA*
+
+  * Bundled with GHC 7.10.1
diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index db268be212..1c53af392e 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -1,6 +1,6 @@
 name:           template-haskell
 version:        2.10.0.0
--- GHC 7.8.1 released with 2.9.0.0
+-- NOTE: Don't forget to update ./changelog.md
 license:        BSD3
 license-file:   LICENSE
 category:       Template Haskell
@@ -16,6 +16,8 @@ description:
     See <http://www.haskell.org/haskellwiki/Template_Haskell> for more
     information.
 
+extra-source-files: changelog.md
+
 source-repository head
     type:     git
     location: http://git.haskell.org/ghc.git
@@ -46,7 +48,7 @@ Library
         Language.Haskell.TH.Lib.Map
 
     build-depends:
-        base       == 4.7.*,
+        base       == 4.8.*,
         pretty     == 1.1.*
 
     -- We need to set the package key to template-haskell (without a
diff --git a/libraries/terminfo b/libraries/terminfo
-Subproject 1ce8379744179e5c7f8d88049aaed4d3be52e32
+Subproject de93eba74cd4537771b65117d4ad00db9943657
diff --git a/libraries/unix b/libraries/unix
-Subproject 54fbbdecb673705a67d5b9594503cf86d53265c
+Subproject 8afe57ff808499584f43a5cfeb1a3bb42602df8
diff --git a/testsuite/tests/cabal/cabal06/q/q-1.0.conf b/testsuite/tests/cabal/cabal06/q/q-1.0.conf
index 2c25cee262..1572d4017d 100644
--- a/testsuite/tests/cabal/cabal06/q/q-1.0.conf
+++ b/testsuite/tests/cabal/cabal06/q/q-1.0.conf
@@ -13,7 +13,7 @@ trusted: False
 import-dirs: /5playpen/t-edyang/ghc-backpack/testsuite/tests/cabal/cabal06/inst-d/lib/x86_64-linux-ghc-7.9.20140719/q-1.0
 library-dirs: /5playpen/t-edyang/ghc-backpack/testsuite/tests/cabal/cabal06/inst-d/lib/x86_64-linux-ghc-7.9.20140719/q-1.0
 hs-libraries: HSd54a904d84001e92dbb7d30e2bede8ce
-depends: base-4.7.1.0-inplace
+depends: base-4.8.0.0-inplace
          p-1.0-168289aa0216a183a2729001bb18e7a8
 haddock-interfaces: /5playpen/t-edyang/ghc-backpack/testsuite/tests/cabal/cabal06/inst-d/share/doc/x86_64-linux-ghc-7.9.20140719/q-1.0/html/q.haddock
 haddock-html: /5playpen/t-edyang/ghc-backpack/testsuite/tests/cabal/cabal06/inst-d/share/doc/x86_64-linux-ghc-7.9.20140719/q-1.0/html
diff --git a/testsuite/tests/ghci/scripts/T5979.stderr b/testsuite/tests/ghci/scripts/T5979.stderr
index bbdba12305..c2869b09c6 100644
--- a/testsuite/tests/ghci/scripts/T5979.stderr
+++ b/testsuite/tests/ghci/scripts/T5979.stderr
@@ -2,6 +2,6 @@
 <no location info>:
     Could not find module ‘Control.Monad.Trans.State’
     Perhaps you meant
-      Control.Monad.Trans.State (from transformers-0.4.1.0@trans_ATJ404cg3uBDx7JJZaSn1I)
-      Control.Monad.Trans.Class (from transformers-0.4.1.0@trans_ATJ404cg3uBDx7JJZaSn1I)
-      Control.Monad.Trans.Cont (from transformers-0.4.1.0@trans_ATJ404cg3uBDx7JJZaSn1I)
+      Control.Monad.Trans.State (from transformers-0.4.1.0@trans_5jw4w9yTgmZ89ByuixDAKP)
+      Control.Monad.Trans.Class (from transformers-0.4.1.0@trans_5jw4w9yTgmZ89ByuixDAKP)
+      Control.Monad.Trans.Cont (from transformers-0.4.1.0@trans_5jw4w9yTgmZ89ByuixDAKP)
diff --git a/testsuite/tests/indexed-types/should_compile/T3017.stderr b/testsuite/tests/indexed-types/should_compile/T3017.stderr
index 11e71c7250..4e0677569e 100644
--- a/testsuite/tests/indexed-types/should_compile/T3017.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T3017.stderr
@@ -16,5 +16,5 @@ INSTANCES
 FAMILY INSTANCES
   type Elem (ListColl a)
 Dependent modules: []
-Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
                      integer-gmp-0.5.1.0]
diff --git a/testsuite/tests/indexed-types/should_fail/T9160.stderr b/testsuite/tests/indexed-types/should_fail/T9160.stderr
index b4a503e99f..11c6cd38b9 100644
--- a/testsuite/tests/indexed-types/should_fail/T9160.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T9160.stderr
@@ -1,6 +1,6 @@
 Loading package ghc-prim-0.3.1.0 ... linking ... done.
 Loading package integer-gmp-0.5.1.0 ... linking ... done.
-Loading package base-4.7.1.0 ... linking ... done.
+Loading package base-4.8.0.0 ... linking ... done.
 Loading package pretty-1.1.1.1 ... linking ... done.
 Loading package template-haskell-2.10.0.0 ... linking ... done.
 
diff --git a/testsuite/tests/roles/should_compile/Roles1.stderr b/testsuite/tests/roles/should_compile/Roles1.stderr
index b59b5d3e1f..0ae3048990 100644
--- a/testsuite/tests/roles/should_compile/Roles1.stderr
+++ b/testsuite/tests/roles/should_compile/Roles1.stderr
@@ -17,7 +17,7 @@ TYPE CONSTRUCTORS
   data T7 (a :: k) b = K7 b
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
                      integer-gmp-0.5.1.0]
 
 ==================== Typechecker ====================
diff --git a/testsuite/tests/roles/should_compile/Roles14.stderr b/testsuite/tests/roles/should_compile/Roles14.stderr
index e7a7b65ff1..c7e8ed788c 100644
--- a/testsuite/tests/roles/should_compile/Roles14.stderr
+++ b/testsuite/tests/roles/should_compile/Roles14.stderr
@@ -6,7 +6,7 @@ TYPE CONSTRUCTORS
 COERCION AXIOMS
   axiom Roles12.NTCo:C2 :: C2 a = a -> a
 Dependent modules: []
-Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
                      integer-gmp-0.5.1.0]
 
 ==================== Typechecker ====================
diff --git a/testsuite/tests/roles/should_compile/Roles2.stderr b/testsuite/tests/roles/should_compile/Roles2.stderr
index 053c957d1e..b6f13b4e1f 100644
--- a/testsuite/tests/roles/should_compile/Roles2.stderr
+++ b/testsuite/tests/roles/should_compile/Roles2.stderr
@@ -5,7 +5,7 @@ TYPE CONSTRUCTORS
   data T2 a = K2 (FunPtr a)
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
                      integer-gmp-0.5.1.0]
 
 ==================== Typechecker ====================
diff --git a/testsuite/tests/roles/should_compile/Roles3.stderr b/testsuite/tests/roles/should_compile/Roles3.stderr
index 23925867b1..18c294c4c5 100644
--- a/testsuite/tests/roles/should_compile/Roles3.stderr
+++ b/testsuite/tests/roles/should_compile/Roles3.stderr
@@ -18,7 +18,7 @@ COERCION AXIOMS
   axiom Roles3.NTCo:C3 :: C3 a b = a -> F3 b -> F3 b
   axiom Roles3.NTCo:C4 :: C4 a b = a -> F4 b -> F4 b
 Dependent modules: []
-Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
                      integer-gmp-0.5.1.0]
 
 ==================== Typechecker ====================
diff --git a/testsuite/tests/roles/should_compile/Roles4.stderr b/testsuite/tests/roles/should_compile/Roles4.stderr
index 93a27f3ded..7ca6478dc7 100644
--- a/testsuite/tests/roles/should_compile/Roles4.stderr
+++ b/testsuite/tests/roles/should_compile/Roles4.stderr
@@ -9,7 +9,7 @@ COERCION AXIOMS
   axiom Roles4.NTCo:C1 :: C1 a = a -> a
   axiom Roles4.NTCo:C3 :: C3 a = a -> Syn1 a
 Dependent modules: []
-Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
                      integer-gmp-0.5.1.0]
 
 ==================== Typechecker ====================
diff --git a/testsuite/tests/roles/should_compile/T8958.stderr b/testsuite/tests/roles/should_compile/T8958.stderr
index a01cc05631..10ab093442 100644
--- a/testsuite/tests/roles/should_compile/T8958.stderr
+++ b/testsuite/tests/roles/should_compile/T8958.stderr
@@ -16,7 +16,7 @@ INSTANCES
   instance [incoherent] Representational a
     -- Defined at T8958.hs:10:10
 Dependent modules: []
-Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
                      integer-<IMPL>-<VERSION>]
 
 ==================== Typechecker ====================
diff --git a/testsuite/tests/safeHaskell/check/Check01.stderr b/testsuite/tests/safeHaskell/check/Check01.stderr
index e13e7d9d76..fe6ec9e097 100644
--- a/testsuite/tests/safeHaskell/check/Check01.stderr
+++ b/testsuite/tests/safeHaskell/check/Check01.stderr
@@ -1,4 +1,4 @@
 [3 of 3] Compiling Check01          ( Check01.hs, Check01.o )
 
 <no location info>:
-    The package (base-4.7.1.0) is required to be trusted but it isn't!
+    The package (base-4.8.0.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/Check06.stderr b/testsuite/tests/safeHaskell/check/Check06.stderr
index 0e9433ae1e..29a7941411 100644
--- a/testsuite/tests/safeHaskell/check/Check06.stderr
+++ b/testsuite/tests/safeHaskell/check/Check06.stderr
@@ -2,4 +2,4 @@
 [2 of 2] Compiling Check06          ( Check06.hs, Check06.o )
 
 <no location info>:
-    The package (base-4.7.1.0) is required to be trusted but it isn't!
+    The package (base-4.8.0.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/Check08.stderr b/testsuite/tests/safeHaskell/check/Check08.stderr
index 89ec3ad613..0947a971d4 100644
--- a/testsuite/tests/safeHaskell/check/Check08.stderr
+++ b/testsuite/tests/safeHaskell/check/Check08.stderr
@@ -3,4 +3,4 @@
 [3 of 3] Compiling Check08          ( Check08.hs, Check08.o )
 
 <no location info>:
-    The package (base-4.7.1.0) is required to be trusted but it isn't!
+    The package (base-4.8.0.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/Check09.stderr b/testsuite/tests/safeHaskell/check/Check09.stderr
index 349b234031..6954dd1f89 100644
--- a/testsuite/tests/safeHaskell/check/Check09.stderr
+++ b/testsuite/tests/safeHaskell/check/Check09.stderr
@@ -1,7 +1,7 @@
 
 Check09.hs:4:1:
     Prelude: Can't be safely imported!
-    The package (base-4.7.1.0) the module resides in isn't trusted.
+    The package (base-4.8.0.0) the module resides in isn't trusted.
 
 Check09.hs:5:1:
     Data.ByteString.Char8: Can't be safely imported!
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr
index e6bc4b3ce4..15c242bbff 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr
@@ -1,4 +1,4 @@
 
 ImpSafe01.hs:9:1:
     Data.Word: Can't be safely imported!
-    The package (base-4.7.1.0) the module resides in isn't trusted.
+    The package (base-4.8.0.0) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr
index 0e2e66cf9f..884f080866 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr
@@ -1,6 +1,6 @@
 
 <no location info>:
-    The package (base-4.7.1.0) is required to be trusted but it isn't!
+    The package (base-4.8.0.0) is required to be trusted but it isn't!
 
 <no location info>:
     The package (bytestring-0.10.4.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr
index 0e2e66cf9f..884f080866 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr
@@ -1,6 +1,6 @@
 
 <no location info>:
-    The package (base-4.7.1.0) is required to be trusted but it isn't!
+    The package (base-4.8.0.0) is required to be trusted but it isn't!
 
 <no location info>:
     The package (bytestring-0.10.4.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
index c64f9d831a..7ce7704d23 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
+++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
@@ -4,42 +4,42 @@ pdb.safePkg01/local.db:
 trusted: False
 
 M_SafePkg
-package dependencies: base-4.7.1.0* ghc-prim-0.3.1.0
+package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0
 trusted: safe
 require own pkg trusted: False
 
 M_SafePkg2
-package dependencies: base-4.7.1.0 ghc-prim-0.3.1.0
+package dependencies: base-4.8.0.0 ghc-prim-0.3.1.0
 trusted: trustworthy
 require own pkg trusted: False
 
 M_SafePkg3
-package dependencies: base-4.7.1.0* ghc-prim-0.3.1.0
+package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0
 trusted: safe
 require own pkg trusted: True
 
 M_SafePkg4
-package dependencies: base-4.7.1.0* ghc-prim-0.3.1.0
+package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0
 trusted: safe
 require own pkg trusted: True
 
 M_SafePkg5
-package dependencies: base-4.7.1.0* ghc-prim-0.3.1.0
+package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0
 trusted: safe
 require own pkg trusted: True
 
 M_SafePkg6
-package dependencies: array-0.5.0.0@array_H3W2D8UaI9TKGEhUuQHax2
+package dependencies: array-0.5.0.1@array_GX4NwjS8xZkC2ZPtjgwhnz
 trusted: trustworthy
 require own pkg trusted: False
 
 M_SafePkg7
-package dependencies: array-0.5.0.0@array_H3W2D8UaI9TKGEhUuQHax2
+package dependencies: array-0.5.0.1@array_GX4NwjS8xZkC2ZPtjgwhnz
 trusted: safe
 require own pkg trusted: False
 
 M_SafePkg8
-package dependencies: array-0.5.0.0@array_H3W2D8UaI9TKGEhUuQHax2
+package dependencies: array-0.5.0.1@array_GX4NwjS8xZkC2ZPtjgwhnz
 trusted: trustworthy
 require own pkg trusted: False
 
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr
index e6ffa06f69..da45202a0c 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr
@@ -1,4 +1,4 @@
 
 SafeFlags17.hs:4:8:
     Prelude: Can't be safely imported!
-    The package (base-4.7.1.0) the module resides in isn't trusted.
+    The package (base-4.8.0.0) the module resides in isn't trusted.
diff --git a/testsuite/tests/simplCore/should_compile/T5550.stderr b/testsuite/tests/simplCore/should_compile/T5550.stderr
index 0521604855..c2fa315408 100644
--- a/testsuite/tests/simplCore/should_compile/T5550.stderr
+++ b/testsuite/tests/simplCore/should_compile/T5550.stderr
@@ -1,3 +1,3 @@
 Loading package ghc-prim-0.3.1.0 ... linking ... done.
 Loading package integer-gmp-0.5.1.0 ... linking ... done.
-Loading package base-4.7.1.0 ... linking ... done.
+Loading package base-4.8.0.0 ... linking ... done.
diff --git a/testsuite/tests/th/TH_Roles2.stderr b/testsuite/tests/th/TH_Roles2.stderr
index 439ff6f71a..3426537837 100644
--- a/testsuite/tests/th/TH_Roles2.stderr
+++ b/testsuite/tests/th/TH_Roles2.stderr
@@ -4,7 +4,7 @@ TYPE CONSTRUCTORS
   data T (a :: k)
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
                      integer-gmp-0.5.1.0, pretty-1.1.1.1, template-haskell-2.10.0.0]
 
 ==================== Typechecker ====================
diff --git a/testsuite/tests/typecheck/should_compile/tc231.stderr b/testsuite/tests/typecheck/should_compile/tc231.stderr
index a1ef1b2351..46395c4866 100644
--- a/testsuite/tests/typecheck/should_compile/tc231.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc231.stderr
@@ -15,5 +15,5 @@ COERCION AXIOMS
   axiom ShouldCompile.NTCo:Zork ::
       Zork s a b = forall chain. Q s a chain -> ST s ()
 Dependent modules: []
-Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
                      integer-gmp-0.5.1.0]
diff --git a/testsuite/tests/typecheck/should_fail/tcfail182.stderr b/testsuite/tests/typecheck/should_fail/tcfail182.stderr
index 7b9811234d..373e6dcad5 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail182.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail182.stderr
@@ -3,7 +3,7 @@ tcfail182.hs:9:3:
     Couldn't match expected type ‘Prelude.Maybe a’
                 with actual type ‘Maybe t0’
     NB: ‘Prelude.Maybe’
-          is defined in ‘Data.Maybe’ in package ‘base-4.7.1.0’
+          is defined in ‘Data.Maybe’ in package ‘base-4.8.0.0’
         ‘Maybe’ is defined at tcfail182.hs:6:1-18
     Relevant bindings include
       f :: Prelude.Maybe a -> Int (bound at tcfail182.hs:9:1)
diff --git a/utils/haddock b/utils/haddock
-Subproject 0cc5bc85e9fca92ab712b68a2ba2c0dd9d3d79f
+Subproject c3a7d4701ee64f6c29b95a6bed519f6c16b9bff