From 49c4678f061ba5fd3db74c67395979d40b3bbf1c Mon Sep 17 00:00:00 2001
From: Herbert Valerio Riedel <hvr@gnu.org>
Date: Fri, 20 Mar 2015 12:23:41 +0100
Subject: [PATCH] Bump ghc-prim to 0.4.0.0

This major version bump was made necessary by
f44333eae7bc7dc7b6003b75874a02445f6b633b which changed the type
signatures of prefetch primops, as well as other changes
such as 051d694fc978ad28ac3043d296cafddd3c2a7050 turning `Any` into
an abstract closed type family.

(cherry picked from commit 9dfdd16a61e79cb03c633d442190a81fe5c0b6b8)
---
 libraries/base/base.cabal                     |  2 +-
 libraries/ghc-prim/ghc-prim.cabal             |  4 +-
 libraries/integer-gmp/integer-gmp.cabal       |  2 +-
 .../indexed-types/should_compile/T3017.stderr |  4 +-
 .../partial-sigs/should_compile/ADT.stderr    |  2 +-
 .../should_compile/AddAndOr1.stderr           |  2 +-
 .../should_compile/AddAndOr2.stderr           |  2 +-
 .../should_compile/AddAndOr3.stderr           |  2 +-
 .../should_compile/AddAndOr4.stderr           |  2 +-
 .../should_compile/AddAndOr5.stderr           |  2 +-
 .../should_compile/AddAndOr6.stderr           |  2 +-
 .../should_compile/BoolToBool.stderr          |  2 +-
 .../should_compile/Defaulting1MROn.stderr     |  2 +-
 .../should_compile/Defaulting2MROff.stderr    |  2 +-
 .../should_compile/Defaulting2MROn.stderr     |  2 +-
 .../partial-sigs/should_compile/Either.stderr |  2 +-
 .../partial-sigs/should_compile/Every.stderr  |  2 +-
 .../should_compile/EveryNamed.stderr          |  2 +-
 .../should_compile/ExpressionSig.stderr       |  2 +-
 .../should_compile/ExpressionSigNamed.stderr  |  2 +-
 .../should_compile/ExtraConstraints1.stderr   |  2 +-
 .../should_compile/ExtraConstraints2.stderr   |  2 +-
 .../should_compile/ExtraConstraints3.stderr   |  2 +-
 .../should_compile/ExtraNumAMROff.stderr      |  2 +-
 .../should_compile/Forall1.stderr             |  2 +-
 .../should_compile/GenNamed.stderr            |  2 +-
 .../should_compile/HigherRank1.stderr         |  2 +-
 .../should_compile/HigherRank2.stderr         |  2 +-
 .../should_compile/LocalDefinitionBug.stderr  |  2 +-
 .../should_compile/Meltdown.stderr            |  2 +-
 .../should_compile/MonoLocalBinds.stderr      |  4 +-
 .../should_compile/NamedTyVar.stderr          |  2 +-
 .../should_compile/ParensAroundContext.stderr |  2 +-
 .../should_compile/PatBind.stderr             |  4 +-
 .../should_compile/PatternSig.stderr          |  2 +-
 .../should_compile/Recursive.stderr           |  2 +-
 .../ScopedNamedWildcards.stderr               |  2 +-
 .../ScopedNamedWildcardsGood.stderr           |  2 +-
 .../should_compile/ShowNamed.stderr           |  2 +-
 .../should_compile/SimpleGen.stderr           |  2 +-
 .../should_compile/SkipMany.stderr            |  2 +-
 .../should_compile/SomethingShowable.stderr   |  2 +-
 .../should_compile/Uncurry.stderr             |  2 +-
 .../should_compile/UncurryNamed.stderr        |  2 +-
 .../WarningWildcardInstantiations.stderr      |  2 +-
 .../tests/roles/should_compile/Roles1.stderr  |  4 +-
 .../tests/roles/should_compile/Roles14.stderr |  4 +-
 .../tests/roles/should_compile/Roles2.stderr  |  4 +-
 .../tests/roles/should_compile/Roles3.stderr  |  4 +-
 .../tests/roles/should_compile/Roles4.stderr  |  4 +-
 .../tests/roles/should_compile/T8958.stderr   | 72 +++++++++----------
 .../safeHaskell/check/pkg01/safePkg01.stdout  | 16 ++---
 testsuite/tests/th/TH_Roles2.stderr           |  2 +-
 .../typecheck/should_compile/tc231.stderr     | 38 +++++-----
 54 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index f83b4410ceee..1172f2a0f793 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -99,7 +99,7 @@ Library
         UnliftedFFITypes
         Unsafe
 
-    build-depends: rts == 1.0.*, ghc-prim >= 0.3.1 && < 0.4
+    build-depends: rts == 1.0.*, ghc-prim == 0.4.*
     if flag(integer-simple)
         build-depends: integer-simple >= 0.1.1 && < 0.2
 
diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
index c87f3363c347..b9e74d1fa3ae 100644
--- a/libraries/ghc-prim/ghc-prim.cabal
+++ b/libraries/ghc-prim/ghc-prim.cabal
@@ -1,6 +1,6 @@
 name:           ghc-prim
-version:        0.3.1.0
--- GHC 7.6.1 released with 0.3.0.0
+version:        0.4.0.0
+-- GHC 7.8.4 released with 0.3.1.0
 license:        BSD3
 license-file:   LICENSE
 category:       GHC
diff --git a/libraries/integer-gmp/integer-gmp.cabal b/libraries/integer-gmp/integer-gmp.cabal
index 376139f10242..493da28e808b 100644
--- a/libraries/integer-gmp/integer-gmp.cabal
+++ b/libraries/integer-gmp/integer-gmp.cabal
@@ -73,7 +73,7 @@ Library
     c-sources: cbits/cbits.c
     include-dirs: include
 
-    build-depends: ghc-prim >= 0.3.1 && < 0.4
+    build-depends: ghc-prim == 0.4.*
 
     -- We need to set the package key to integer-gmp
     -- (without a version number) as it's magic.
diff --git a/testsuite/tests/indexed-types/should_compile/T3017.stderr b/testsuite/tests/indexed-types/should_compile/T3017.stderr
index ec97deaf1815..ab480b49b0cd 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.8.0.0, ghc-prim-0.3.1.0,
-                     integer-gmp-0.5.1.0]
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
+                     integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/ADT.stderr b/testsuite/tests/partial-sigs/should_compile/ADT.stderr
index 74b1ae18f9b7..2dccd9254575 100644
--- a/testsuite/tests/partial-sigs/should_compile/ADT.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/ADT.stderr
@@ -5,5 +5,5 @@ TYPE CONSTRUCTORS
     Promotable
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr
index b0952b4d5e1a..acd08095edf4 100644
--- a/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr
index f902a8007379..9c55bb1f2f99 100644
--- a/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr
index f68e6ef50d3e..7d7d3bb72652 100644
--- a/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr
index be7cc05f1bd4..7f1dd30edaaa 100644
--- a/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr
index 8e6699443f0b..bbbed0d41310 100644
--- a/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr
index ec1703a535c1..44f74b9300e8 100644
--- a/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr b/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr
index 3d8f949fd000..e7865eff7e12 100644
--- a/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr b/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr
index fbcaddebfcd4..f81efb1d6906 100644
--- a/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr
index fb95845970dd..5418eb5cac6e 100644
--- a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr
index 9fda9ec81560..65a7bc7ff1b0 100644
--- a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/Either.stderr b/testsuite/tests/partial-sigs/should_compile/Either.stderr
index bff0e846eb18..11aaf4d5db09 100644
--- a/testsuite/tests/partial-sigs/should_compile/Either.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/Either.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/Every.stderr b/testsuite/tests/partial-sigs/should_compile/Every.stderr
index 90bcb5747132..caa57db5bf9d 100644
--- a/testsuite/tests/partial-sigs/should_compile/Every.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/Every.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr b/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr
index ce7c7a3d81ab..e04c2de1c0d7 100644
--- a/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr b/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr
index 3d8f949fd000..e7865eff7e12 100644
--- a/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr b/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr
index 3d8f949fd000..e7865eff7e12 100644
--- a/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr
index 15eb30d1bf0c..05ccb6157260 100644
--- a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr
@@ -7,5 +7,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr
index 8c28c5b93b7d..19b454422460 100644
--- a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr
index f4df3cb14169..e43150970fb1 100644
--- a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr
@@ -230,5 +230,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr
index 6bb444ad369b..c4d33c12a580 100644
--- a/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/Forall1.stderr b/testsuite/tests/partial-sigs/should_compile/Forall1.stderr
index 1af38e4a621f..e6ef981c1587 100644
--- a/testsuite/tests/partial-sigs/should_compile/Forall1.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/Forall1.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr b/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr
index 3d8f949fd000..e7865eff7e12 100644
--- a/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr b/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr
index 1a3e436cac73..9785fce54f1a 100644
--- a/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr b/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr
index 1a3e436cac73..9785fce54f1a 100644
--- a/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr b/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr
index 9f99e17bfef6..a5de44f1812d 100644
--- a/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr b/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr
index 303f72a3ec8d..e0c4c11c8353 100644
--- a/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr
@@ -14,5 +14,5 @@ INSTANCES
     -- Defined at Meltdown.hs:11:10
   instance Monad (NukeMonad a b) -- Defined at Meltdown.hs:15:10
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr b/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr
index 5da503bfd98f..a5de44f1812d 100644
--- a/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
-                     integer-gmp-0.5.1.0]
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
+                     integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr b/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr
index e6c007a60224..e62132f76232 100644
--- a/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr b/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr
index 53fb335e8cca..ba1fb55b7c87 100644
--- a/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/PatBind.stderr b/testsuite/tests/partial-sigs/should_compile/PatBind.stderr
index 492cde119715..62bf9eecc91b 100644
--- a/testsuite/tests/partial-sigs/should_compile/PatBind.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/PatBind.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
-                     integer-gmp-0.5.1.0]
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
+                     integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr b/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr
index 3d8f949fd000..e7865eff7e12 100644
--- a/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/Recursive.stderr b/testsuite/tests/partial-sigs/should_compile/Recursive.stderr
index 71258f48ffd1..626b4d28f860 100644
--- a/testsuite/tests/partial-sigs/should_compile/Recursive.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/Recursive.stderr
@@ -5,5 +5,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr
index 9757f043c8a6..543404488657 100644
--- a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr
index 7b9d39fe7d9d..6dac5ea6c976 100644
--- a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr b/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr
index 51e56f1b2029..8460586ae62b 100644
--- a/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr b/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr
index 96df17eb771d..f0ba022d4284 100644
--- a/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr b/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr
index 0ebd18b1722b..d12a3ff418dd 100644
--- a/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr
@@ -8,5 +8,5 @@ TYPE CONSTRUCTORS
     Promotable
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr b/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr
index f33d43343158..cc8eae05c9fa 100644
--- a/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr b/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr
index 96b90d37ef7e..6ff0de02eb9b 100644
--- a/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr b/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr
index 1468252f58be..a5c2a350e71f 100644
--- a/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr
@@ -3,5 +3,5 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
diff --git a/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr b/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr
index af573c5ffacf..ad2bfdb9bc33 100644
--- a/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr
@@ -4,7 +4,7 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
                      integer-gmp-1.0.0.0]
 
 
diff --git a/testsuite/tests/roles/should_compile/Roles1.stderr b/testsuite/tests/roles/should_compile/Roles1.stderr
index 0ae3048990a0..01c4691519f8 100644
--- a/testsuite/tests/roles/should_compile/Roles1.stderr
+++ b/testsuite/tests/roles/should_compile/Roles1.stderr
@@ -17,8 +17,8 @@ TYPE CONSTRUCTORS
   data T7 (a :: k) b = K7 b
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
-                     integer-gmp-0.5.1.0]
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
+                     integer-gmp-1.0.0.0]
 
 ==================== Typechecker ====================
 
diff --git a/testsuite/tests/roles/should_compile/Roles14.stderr b/testsuite/tests/roles/should_compile/Roles14.stderr
index c7e8ed788cdf..504053bc89a2 100644
--- a/testsuite/tests/roles/should_compile/Roles14.stderr
+++ b/testsuite/tests/roles/should_compile/Roles14.stderr
@@ -6,8 +6,8 @@ TYPE CONSTRUCTORS
 COERCION AXIOMS
   axiom Roles12.NTCo:C2 :: C2 a = a -> a
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
-                     integer-gmp-0.5.1.0]
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
+                     integer-gmp-1.0.0.0]
 
 ==================== Typechecker ====================
 
diff --git a/testsuite/tests/roles/should_compile/Roles2.stderr b/testsuite/tests/roles/should_compile/Roles2.stderr
index b6f13b4e1f57..afd2d8cf965f 100644
--- a/testsuite/tests/roles/should_compile/Roles2.stderr
+++ b/testsuite/tests/roles/should_compile/Roles2.stderr
@@ -5,8 +5,8 @@ TYPE CONSTRUCTORS
   data T2 a = K2 (FunPtr a)
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
-                     integer-gmp-0.5.1.0]
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
+                     integer-gmp-1.0.0.0]
 
 ==================== Typechecker ====================
 
diff --git a/testsuite/tests/roles/should_compile/Roles3.stderr b/testsuite/tests/roles/should_compile/Roles3.stderr
index 5814d4d50a72..506b895dda46 100644
--- a/testsuite/tests/roles/should_compile/Roles3.stderr
+++ b/testsuite/tests/roles/should_compile/Roles3.stderr
@@ -18,8 +18,8 @@ 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.8.0.0, ghc-prim-0.3.1.0,
-                     integer-gmp-0.5.1.0]
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
+                     integer-gmp-1.0.0.0]
 
 ==================== Typechecker ====================
 
diff --git a/testsuite/tests/roles/should_compile/Roles4.stderr b/testsuite/tests/roles/should_compile/Roles4.stderr
index 7ca6478dc724..26f9abda0c03 100644
--- a/testsuite/tests/roles/should_compile/Roles4.stderr
+++ b/testsuite/tests/roles/should_compile/Roles4.stderr
@@ -9,8 +9,8 @@ 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.8.0.0, ghc-prim-0.3.1.0,
-                     integer-gmp-0.5.1.0]
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
+                     integer-gmp-1.0.0.0]
 
 ==================== Typechecker ====================
 
diff --git a/testsuite/tests/roles/should_compile/T8958.stderr b/testsuite/tests/roles/should_compile/T8958.stderr
index 558b36060466..abcd5581c942 100644
--- a/testsuite/tests/roles/should_compile/T8958.stderr
+++ b/testsuite/tests/roles/should_compile/T8958.stderr
@@ -1,36 +1,36 @@
-
-T8958.hs:1:31: Warning:
-    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
-TYPE SIGNATURES
-TYPE CONSTRUCTORS
-  type role Map nominal representational
-  newtype (Nominal k, Representational v) => Map k v = MkMap [(k, v)]
-    Promotable
-  class Nominal a
-  type role Representational representational
-  class Representational a
-COERCION AXIOMS
-  axiom T8958.NTCo:Map :: Map k v = [(k, v)]
-INSTANCES
-  instance [incoherent] Nominal a -- Defined at T8958.hs:7:10
-  instance [incoherent] Representational a
-    -- Defined at T8958.hs:10:10
-Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
-                     integer-gmp-0.5.1.0]
-
-==================== Typechecker ====================
-AbsBinds [a] []
-  {Exports: [T8958.$fRepresentationala <= $dRepresentational
-               <>]
-   Exported types: T8958.$fRepresentationala
-                     :: forall a. Representational a
-                   [LclIdX[DFunId], Str=DmdType]
-   Binds: $dRepresentational = T8958.D:Representational}
-AbsBinds [a] []
-  {Exports: [T8958.$fNominala <= $dNominal
-               <>]
-   Exported types: T8958.$fNominala :: forall a. Nominal a
-                   [LclIdX[DFunId], Str=DmdType]
-   Binds: $dNominal = T8958.D:Nominal}
-
+
+T8958.hs:1:31: Warning:
+    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
+TYPE SIGNATURES
+TYPE CONSTRUCTORS
+  type role Map nominal representational
+  newtype (Nominal k, Representational v) => Map k v = MkMap [(k, v)]
+    Promotable
+  class Nominal a
+  type role Representational representational
+  class Representational a
+COERCION AXIOMS
+  axiom T8958.NTCo:Map :: Map k v = [(k, v)]
+INSTANCES
+  instance [incoherent] Nominal a -- Defined at T8958.hs:7:10
+  instance [incoherent] Representational a
+    -- Defined at T8958.hs:10:10
+Dependent modules: []
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
+                     integer-gmp-1.0.0.0]
+
+==================== Typechecker ====================
+AbsBinds [a] []
+  {Exports: [T8958.$fRepresentationala <= $dRepresentational
+               <>]
+   Exported types: T8958.$fRepresentationala
+                     :: forall a. Representational a
+                   [LclIdX[DFunId], Str=DmdType]
+   Binds: $dRepresentational = T8958.D:Representational}
+AbsBinds [a] []
+  {Exports: [T8958.$fNominala <= $dNominal
+               <>]
+   Exported types: T8958.$fNominala :: forall a. Nominal a
+                   [LclIdX[DFunId], Str=DmdType]
+   Binds: $dNominal = T8958.D:Nominal}
+
diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
index 636a243d7f64..51b047fca87a 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.8.0.0* ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
+package dependencies: base-4.8.0.0* ghc-prim-0.4.0.0 integer-gmp-1.0.0.0
 trusted: safe
 require own pkg trusted: False
 
 M_SafePkg2
-package dependencies: base-4.8.0.0 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
+package dependencies: base-4.8.0.0 ghc-prim-0.4.0.0 integer-gmp-1.0.0.0
 trusted: trustworthy
 require own pkg trusted: False
 
 M_SafePkg3
-package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
+package dependencies: base-4.8.0.0* ghc-prim-0.4.0.0 integer-gmp-1.0.0.0
 trusted: safe
 require own pkg trusted: True
 
 M_SafePkg4
-package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
+package dependencies: base-4.8.0.0* ghc-prim-0.4.0.0 integer-gmp-1.0.0.0
 trusted: safe
 require own pkg trusted: True
 
 M_SafePkg5
-package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
+package dependencies: base-4.8.0.0* ghc-prim-0.4.0.0 integer-gmp-1.0.0.0
 trusted: safe
 require own pkg trusted: True
 
 M_SafePkg6
-package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.3.1.0 integer-gmp-1.0.0.0
+package dependencies: array-0.5.1.0 base-4.8.0.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.4.0.0 integer-gmp-1.0.0.0
 trusted: trustworthy
 require own pkg trusted: False
 
 M_SafePkg7
-package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.3.1.0 integer-gmp-1.0.0.0
+package dependencies: array-0.5.1.0 base-4.8.0.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.4.0.0 integer-gmp-1.0.0.0
 trusted: safe
 require own pkg trusted: False
 
 M_SafePkg8
-package dependencies: array-0.5.0.1 base-4.8.0.0 bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.3.1.0 integer-gmp-1.0.0.0
+package dependencies: array-0.5.1.0 base-4.8.0.0 bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.4.0.0 integer-gmp-1.0.0.0
 trusted: trustworthy
 require own pkg trusted: False
 
diff --git a/testsuite/tests/th/TH_Roles2.stderr b/testsuite/tests/th/TH_Roles2.stderr
index 531a874dff8c..787e57be5253 100644
--- a/testsuite/tests/th/TH_Roles2.stderr
+++ b/testsuite/tests/th/TH_Roles2.stderr
@@ -5,7 +5,7 @@ TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
 Dependent packages: [array-0.5.1.0, base-4.8.0.0, deepseq-1.4.1.1,
-                     ghc-prim-0.3.1.0, integer-gmp-1.0.0.0, pretty-1.1.2.0,
+                     ghc-prim-0.4.0.0, integer-gmp-1.0.0.0, pretty-1.1.2.0,
                      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 098fe94a0c3e..3f10f5502735 100644
--- a/testsuite/tests/typecheck/should_compile/tc231.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc231.stderr
@@ -1,19 +1,19 @@
-TYPE SIGNATURES
-  foo ::
-    forall s b chain.
-    Zork s (Z [Char]) b =>
-    Q s (Z [Char]) chain -> ST s ()
-  s :: forall t t1. Q t (Z [Char]) t1 -> Q t (Z [Char]) t1
-TYPE CONSTRUCTORS
-  data Q s a chain = Node s a chain
-    Promotable
-  data Z a = Z a
-    Promotable
-  class Zork s a b | a -> b where
-    huh :: Q s a chain -> ST s ()
-COERCION AXIOMS
-  axiom NTCo:Zork ::
-      Zork s a b = forall chain. Q s a chain -> ST s ()
-Dependent modules: []
-Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0,
-                     integer-gmp-0.5.1.0]
+TYPE SIGNATURES
+  foo ::
+    forall s b chain.
+    Zork s (Z [Char]) b =>
+    Q s (Z [Char]) chain -> ST s ()
+  s :: forall t t1. Q t (Z [Char]) t1 -> Q t (Z [Char]) t1
+TYPE CONSTRUCTORS
+  data Q s a chain = Node s a chain
+    Promotable
+  data Z a = Z a
+    Promotable
+  class Zork s a b | a -> b where
+    huh :: Q s a chain -> ST s ()
+COERCION AXIOMS
+  axiom NTCo:Zork ::
+      Zork s a b = forall chain. Q s a chain -> ST s ()
+Dependent modules: []
+Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0,
+                     integer-gmp-1.0.0.0]
-- 
GitLab