diff options
103 files changed, 128 insertions, 128 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index c5ca3132cd..ea9c355010 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -51,7 +51,7 @@ Library Build-Depends: base >= 4 && < 5, deepseq >= 1.4 && < 1.5, - directory >= 1 && < 1.3, + directory >= 1 && < 1.4, process >= 1 && < 1.5, bytestring >= 0.9 && < 0.11, binary == 0.8.*, diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in index 9d4125a964..b9babfec76 100644 --- a/ghc/ghc-bin.cabal.in +++ b/ghc/ghc-bin.cabal.in @@ -31,7 +31,7 @@ Executable ghc Build-Depends: base >= 4 && < 5, array >= 0.1 && < 0.6, bytestring >= 0.9 && < 0.11, - directory >= 1 && < 1.3, + directory >= 1 && < 1.4, process >= 1 && < 1.5, filepath >= 1 && < 1.5, ghc-boot == @ProjectVersionMunged@, diff --git a/libraries/Cabal b/libraries/Cabal -Subproject a7fb9b9ae733ceb3c52fee68e6e1a6ded5fb91d +Subproject 034b44191740214c9e691439b604a8ac95ee994 diff --git a/libraries/array b/libraries/array -Subproject 049db4ac25dd8d21b3a1bba6fe6dfab05d0e3d4 +Subproject bab2c234f176fe3e95443cbe4387833da22f7e5 diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index cf122f7f9e..22df434381 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -1,5 +1,5 @@ name: base -version: 4.9.0.0 +version: 4.10.0.0 -- NOTE: Don't forget to update ./changelog.md license: BSD3 license-file: LICENSE diff --git a/libraries/compact/compact.cabal b/libraries/compact/compact.cabal index 9d87ccccd3..2a4478cf20 100644 --- a/libraries/compact/compact.cabal +++ b/libraries/compact/compact.cabal @@ -37,7 +37,7 @@ library build-depends: rts == 1.0.* build-depends: ghc-prim == 0.5.0.0 - build-depends: base >= 4.9.0 && < 4.10 + build-depends: base >= 4.9.0 && < 4.11 build-depends: deepseq >= 1.4 build-depends: bytestring >= 0.10.6.0 ghc-options: -Wall diff --git a/libraries/deepseq b/libraries/deepseq -Subproject cb66aa890b0972375e31deaee3bc424f46beb68 +Subproject 418856afb4e70127d9dce309a198b18dc47bd7d diff --git a/libraries/directory b/libraries/directory -Subproject ad2e0a110bf2ee2e2a3bd87963fa55505ca58b2 +Subproject 65d1d85a3fc3373a425a0298d572da9cd9ee3d8 diff --git a/libraries/filepath b/libraries/filepath -Subproject 07b334b406a45057a80e821e72c4b973117caae +Subproject 1462d2106e0748efd4cfc1aa3316863a06f9456 diff --git a/libraries/ghc-boot-th/ghc-boot-th.cabal.in b/libraries/ghc-boot-th/ghc-boot-th.cabal.in index 3aebfbfc89..50b07db49d 100644 --- a/libraries/ghc-boot-th/ghc-boot-th.cabal.in +++ b/libraries/ghc-boot-th/ghc-boot-th.cabal.in @@ -34,4 +34,4 @@ Library GHC.LanguageExtensions.Type GHC.Lexeme - build-depends: base >= 4.7 && < 4.10 + build-depends: base >= 4.7 && < 4.11 diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in index 57199e102c..772b92ccdd 100644 --- a/libraries/ghc-boot/ghc-boot.cabal.in +++ b/libraries/ghc-boot/ghc-boot.cabal.in @@ -40,9 +40,9 @@ Library GHC.PackageDb GHC.Serialized - build-depends: base >= 4.7 && < 4.10, + build-depends: base >= 4.7 && < 4.11, binary == 0.8.*, bytestring == 0.10.*, - directory == 1.2.*, + directory >= 1.2 && < 1.4, filepath >= 1.3 && < 1.5, ghc-boot-th == @ProjectVersionMunged@ diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in index 922d3b294a..9b622e1107 100644 --- a/libraries/ghci/ghci.cabal.in +++ b/libraries/ghci/ghci.cabal.in @@ -58,7 +58,7 @@ library Build-Depends: array == 0.5.*, - base == 4.9.*, + base == 4.10.*, binary == 0.8.*, bytestring == 0.10.*, containers == 0.5.*, diff --git a/libraries/haskeline b/libraries/haskeline -Subproject 8addaa2f6f4256da76bac4075316597d0b1d8f6 +Subproject 3653874be6a6b0df3077b7dee583c9aa442e2eb diff --git a/libraries/hoopl b/libraries/hoopl -Subproject 67dff9a7db8e103d379068df0323bbc97452e76 +Subproject d2f117557ea08bb7cf062573d0e39f523bb1a4d diff --git a/libraries/hpc b/libraries/hpc -Subproject 956887d4a15de3e68aae82b14bfa1630c814964 +Subproject 8625c1c0550719437acad89d49401cf04899008 diff --git a/libraries/parallel b/libraries/parallel -Subproject b01d6daa5a12c31439cdb6f75f89de8820a295a +Subproject 040c4f0226a5a9a1e720d89a9e1239028d9f62d diff --git a/libraries/process b/libraries/process -Subproject 296cbce6294316d6534b4449fc7ab0f0d3f5775 +Subproject 85cc1d17e9550a075003a764a2429d4acde6515 diff --git a/libraries/stm b/libraries/stm -Subproject fe8899331e6ca7bdf80d57cf77dd597023ae471 +Subproject 9c3c3bb28834d1ba9574be7f887c8914afd4232 diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal index ceffa82ed3..71e5e02b8b 100644 --- a/libraries/template-haskell/template-haskell.cabal +++ b/libraries/template-haskell/template-haskell.cabal @@ -49,7 +49,7 @@ Library Language.Haskell.TH.Lib.Map build-depends: - base >= 4.8 && < 4.10, + base >= 4.8 && < 4.11, ghc-boot-th == 8.1, pretty == 1.1.* diff --git a/libraries/terminfo b/libraries/terminfo -Subproject 140ca44db6fc734cfc0388e82f9e5270f31475d +Subproject 6ab1dffebc0665dd347eba351a495dd80032d0e diff --git a/libraries/unix b/libraries/unix -Subproject 7b20b4cbc35a2fea3f26c988f9b2a95640babaa +Subproject d0b0e8cf5a7fa5b9dc500d2f623258200818cb1 diff --git a/testsuite/tests/ado/ado004.stderr b/testsuite/tests/ado/ado004.stderr index 6f9e16f2b4..531cb5f9b3 100644 --- a/testsuite/tests/ado/ado004.stderr +++ b/testsuite/tests/ado/ado004.stderr @@ -36,5 +36,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout index fb515ae4aa..2d219b0b68 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout +++ b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout @@ -1,4 +1,4 @@ -Preprocessing library 'bkpcabal01-0.1.0.0-DwERz0Bcrkn4WeBnYMX11h-p' for +Preprocessing library 'bkpcabal01-0.1.0.0-JzlnBa7joVSAwW36Ug1T14-p' for bkpcabal01-0.1.0.0... -Preprocessing library 'bkpcabal01-0.1.0.0-DwERz0Bcrkn4WeBnYMX11h-q' for +Preprocessing library 'bkpcabal01-0.1.0.0-JzlnBa7joVSAwW36Ug1T14-q' for bkpcabal01-0.1.0.0... diff --git a/testsuite/tests/backpack/should_compile/bkp16.stderr b/testsuite/tests/backpack/should_compile/bkp16.stderr index f35021fe11..ef64f71df4 100644 --- a/testsuite/tests/backpack/should_compile/bkp16.stderr +++ b/testsuite/tests/backpack/should_compile/bkp16.stderr @@ -2,7 +2,7 @@ [1 of 1] Compiling Int[sig] ( p/Int.hsig, nothing ) [2 of 2] Processing q Instantiating q - [1 of 1] Including p[Int=base-4.9.0.0:GHC.Exts] - Instantiating p[Int=base-4.9.0.0:GHC.Exts] + [1 of 1] Including p[Int=base-4.10.0.0:GHC.Exts] + Instantiating p[Int=base-4.10.0.0:GHC.Exts] [1 of 1] Including ghc-prim-0.5.0.0 [1 of 1] Compiling Int[sig] ( p/Int.hsig, bkp16.out/p/p-97PZnzqiJmd2hTwUNGdjod/Int.o ) diff --git a/testsuite/tests/backpack/should_fail/bkpfail16.stderr b/testsuite/tests/backpack/should_fail/bkpfail16.stderr index a92352c26d..049cb382cd 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail16.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail16.stderr @@ -2,8 +2,8 @@ [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, nothing ) [2 of 2] Processing q Instantiating q - [1 of 1] Including p[ShouldFail=base-4.9.0.0:Data.Bool] - Instantiating p[ShouldFail=base-4.9.0.0:Data.Bool] + [1 of 1] Including p[ShouldFail=base-4.10.0.0:Data.Bool] + Instantiating p[ShouldFail=base-4.10.0.0:Data.Bool] [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, bkpfail16.out/p/p-1OqLaT7dAn947wScQQKCw5/ShouldFail.o ) bkpfail16.out/p/p-1OqLaT7dAn947wScQQKCw5/../ShouldFail.hi:1:1: error: diff --git a/testsuite/tests/backpack/should_fail/bkpfail17.stderr b/testsuite/tests/backpack/should_fail/bkpfail17.stderr index 20528f5acc..2b67e72de3 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail17.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail17.stderr @@ -2,8 +2,8 @@ [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, nothing ) [2 of 2] Processing q Instantiating q - [1 of 1] Including p[ShouldFail=base-4.9.0.0:Prelude] - Instantiating p[ShouldFail=base-4.9.0.0:Prelude] + [1 of 1] Including p[ShouldFail=base-4.10.0.0:Prelude] + Instantiating p[ShouldFail=base-4.10.0.0:Prelude] [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, bkpfail17.out/p/p-2W6J7O3LvroH97zGxbPEGF/ShouldFail.o ) <no location info>: error: diff --git a/testsuite/tests/backpack/should_fail/bkpfail19.stderr b/testsuite/tests/backpack/should_fail/bkpfail19.stderr index 73f358c8cb..0f6cbfaf92 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail19.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail19.stderr @@ -2,8 +2,8 @@ [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, nothing ) [2 of 2] Processing q Instantiating q - [1 of 1] Including p[ShouldFail=base-4.9.0.0:Data.STRef] - Instantiating p[ShouldFail=base-4.9.0.0:Data.STRef] + [1 of 1] Including p[ShouldFail=base-4.10.0.0:Data.STRef] + Instantiating p[ShouldFail=base-4.10.0.0:Data.STRef] [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, bkpfail19.out/p/p-CfyUIAu1JTRCDuXEyGszXN/ShouldFail.o ) <no location info>: error: diff --git a/testsuite/tests/cabal/cabal09/reexport.cabal b/testsuite/tests/cabal/cabal09/reexport.cabal index 447a3eeb5f..37266cf8cc 100644 --- a/testsuite/tests/cabal/cabal09/reexport.cabal +++ b/testsuite/tests/cabal/cabal09/reexport.cabal @@ -11,7 +11,7 @@ cabal-version: >=1.23 library reexported-modules: Data.List.NonEmpty - build-depends: base >=4.9 && <4.10 + build-depends: base default-language: Haskell2010 executable foo diff --git a/testsuite/tests/determinism/determ021/determ021.stdout b/testsuite/tests/determinism/determ021/determ021.stdout index 747064f2c6..54b795d55d 100644 --- a/testsuite/tests/determinism/determ021/determ021.stdout +++ b/testsuite/tests/determinism/determ021/determ021.stdout @@ -7,7 +7,7 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] [1 of 1] Compiling A ( A.hs, A.o ) TYPE SIGNATURES @@ -18,5 +18,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/ghci/scripts/ghci008.stdout b/testsuite/tests/ghci/scripts/ghci008.stdout index 4cf7448e2b..f27edfbf25 100644 --- a/testsuite/tests/ghci/scripts/ghci008.stdout +++ b/testsuite/tests/ghci/scripts/ghci008.stdout @@ -35,5 +35,5 @@ class (RealFrac a, Floating a) => RealFloat a where -- Defined in ‘GHC.Float’ instance RealFloat Float -- Defined in ‘GHC.Float’ instance RealFloat Double -- Defined in ‘GHC.Float’ -base-4.9.0.0:Data.OldList.isPrefixOf :: Eq a => [a] -> [a] -> Bool - -- Defined in ‘base-4.9.0.0:Data.OldList’ +base-4.10.0.0:Data.OldList.isPrefixOf :: Eq a => [a] -> [a] -> Bool + -- Defined in ‘base-4.10.0.0:Data.OldList’ diff --git a/testsuite/tests/indexed-types/should_compile/T3017.stderr b/testsuite/tests/indexed-types/should_compile/T3017.stderr index b11c95eb6c..5e35716896 100644 --- a/testsuite/tests/indexed-types/should_compile/T3017.stderr +++ b/testsuite/tests/indexed-types/should_compile/T3017.stderr @@ -20,5 +20,5 @@ INSTANCES FAMILY INSTANCES type Elem (ListColl a) Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ADT.stderr b/testsuite/tests/partial-sigs/should_compile/ADT.stderr index 10658a2d4a..9d89067a04 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 data Foo x y z = Foo x y z COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr index 05e2de4413..c26ea58ede 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr index 1d1670f915..989564da65 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr index a5e91de0db..b086368986 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr index 4a86cac6f4..ae3ac1f6df 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr index bcbe00eb20..5e1e17d309 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr index f4a23a6440..ef785f98bd 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr b/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr index 755d87547d..696baa16bc 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/DataFamilyInstanceLHS.stderr b/testsuite/tests/partial-sigs/should_compile/DataFamilyInstanceLHS.stderr index 476ee27198..7a76170f17 100644 --- a/testsuite/tests/partial-sigs/should_compile/DataFamilyInstanceLHS.stderr +++ b/testsuite/tests/partial-sigs/should_compile/DataFamilyInstanceLHS.stderr @@ -20,5 +20,5 @@ COERCION AXIOMS FAMILY INSTANCES data instance Sing Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr b/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr index 314dcf0353..4668148362 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr index 28b5f44e68..733c725eb5 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.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr index 28b5f44e68..733c725eb5 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.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Either.stderr b/testsuite/tests/partial-sigs/should_compile/Either.stderr index e1d92ff1b4..e4e425d981 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.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/EqualityConstraint.stderr b/testsuite/tests/partial-sigs/should_compile/EqualityConstraint.stderr index e79efecea2..3ba61f598e 100644 --- a/testsuite/tests/partial-sigs/should_compile/EqualityConstraint.stderr +++ b/testsuite/tests/partial-sigs/should_compile/EqualityConstraint.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Every.stderr b/testsuite/tests/partial-sigs/should_compile/Every.stderr index c2812624a1..01cf8639c0 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr b/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr index e133db6dd0..69fb6726c4 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.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr b/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr index 755d87547d..696baa16bc 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr b/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr index 755d87547d..696baa16bc 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr index 83c22b61af..c690e9a1ca 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.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr index b3c80fb45b..6975ea2f66 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr index 2dd9d18254..d643f5f575 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.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr index ca49528a3f..5819c9f5ab 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROn.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROn.stderr index 11e2b1f94c..5819c9f5ab 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROn.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROn.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Forall1.stderr b/testsuite/tests/partial-sigs/should_compile/Forall1.stderr index 528cfcb9a1..3f6937e5c1 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr b/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr index 755d87547d..696baa16bc 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr b/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr index ebd780d190..94016edeec 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr b/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr index ebd780d190..94016edeec 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr b/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr index 3a39acfac5..aaa90a8657 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr b/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr index 7a74324ade..037cb20386 100644 --- a/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr @@ -13,5 +13,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.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr b/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr index 3a39acfac5..aaa90a8657 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr b/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr index e7a5205902..d2442eb7ca 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.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/NamedWildcardInDataFamilyInstanceLHS.stderr b/testsuite/tests/partial-sigs/should_compile/NamedWildcardInDataFamilyInstanceLHS.stderr index cd20a9bc19..8b8bebe55f 100644 --- a/testsuite/tests/partial-sigs/should_compile/NamedWildcardInDataFamilyInstanceLHS.stderr +++ b/testsuite/tests/partial-sigs/should_compile/NamedWildcardInDataFamilyInstanceLHS.stderr @@ -19,5 +19,5 @@ COERCION AXIOMS FAMILY INSTANCES data instance Sing Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/NamedWildcardInTypeFamilyInstanceLHS.stderr b/testsuite/tests/partial-sigs/should_compile/NamedWildcardInTypeFamilyInstanceLHS.stderr index bba0917ec3..4fb88774bd 100644 --- a/testsuite/tests/partial-sigs/should_compile/NamedWildcardInTypeFamilyInstanceLHS.stderr +++ b/testsuite/tests/partial-sigs/should_compile/NamedWildcardInTypeFamilyInstanceLHS.stderr @@ -9,5 +9,5 @@ COERCION AXIOMS F _t = Int -- Defined at NamedWildcardInTypeFamilyInstanceLHS.hs:5:3 Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr b/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr index f79a4c393b..6725887302 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/PatBind.stderr b/testsuite/tests/partial-sigs/should_compile/PatBind.stderr index 74be98a080..b787753147 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/PatBind2.stderr b/testsuite/tests/partial-sigs/should_compile/PatBind2.stderr index 7e31f81e60..1ac6d80dc0 100644 --- a/testsuite/tests/partial-sigs/should_compile/PatBind2.stderr +++ b/testsuite/tests/partial-sigs/should_compile/PatBind2.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr b/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr index 755d87547d..696baa16bc 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Recursive.stderr b/testsuite/tests/partial-sigs/should_compile/Recursive.stderr index 813d99058c..2dda7a4b96 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr index 83e9ee558f..50e59f366c 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr index c18e05a8a7..48f9ea90a7 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.9.0.0, ghc-prim-0.5.0.0, - integer-gmp-1.0.0.0] +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, + integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr b/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr index db1f996a1d..4571a27fe9 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.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr b/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr index 55c4e2dc13..71e72a01dd 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.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr b/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr index 5a992cd82f..b682e1d7a1 100644 --- a/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr +++ b/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr @@ -9,5 +9,5 @@ TYPE CONSTRUCTORS data GenParser tok st a = GenParser tok st a COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr b/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr index 88beccf613..9f0ea1fb72 100644 --- a/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr +++ b/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr @@ -3,7 +3,7 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] SomethingShowable.hs:5:1: warning: [-Wsimplifiable-class-constraints (in -Wdefault)] diff --git a/testsuite/tests/partial-sigs/should_compile/TypeFamilyInstanceLHS.stderr b/testsuite/tests/partial-sigs/should_compile/TypeFamilyInstanceLHS.stderr index 78377fb81d..aebc8cf7a6 100644 --- a/testsuite/tests/partial-sigs/should_compile/TypeFamilyInstanceLHS.stderr +++ b/testsuite/tests/partial-sigs/should_compile/TypeFamilyInstanceLHS.stderr @@ -11,5 +11,5 @@ FAMILY INSTANCES type instance F Int _ type instance F Bool _ Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr b/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr index f9bcf3a307..945f24245b 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.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr b/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr index 17ca5bebe6..b0a3a97024 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.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr b/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr index a69c59b0dc..fedbaa96ad 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.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] WarningWildcardInstantiations.hs:5:14: warning: [-Wpartial-type-signatures (in -Wdefault)] diff --git a/testsuite/tests/plugins/annotation-plugin/annotation-plugin.cabal b/testsuite/tests/plugins/annotation-plugin/annotation-plugin.cabal index 412ff9c2be..626e825b3b 100644 --- a/testsuite/tests/plugins/annotation-plugin/annotation-plugin.cabal +++ b/testsuite/tests/plugins/annotation-plugin/annotation-plugin.cabal @@ -7,5 +7,5 @@ cabal-version: >=1.10 library exposed-modules: SayAnnNames other-extensions: DeriveDataTypeable - build-depends: base >=4.8 && <4.10, ghc + build-depends: base, ghc default-language: Haskell2010 diff --git a/testsuite/tests/rename/should_fail/rnfail040.stderr b/testsuite/tests/rename/should_fail/rnfail040.stderr index 1b0e56e255..1d49aed612 100644 --- a/testsuite/tests/rename/should_fail/rnfail040.stderr +++ b/testsuite/tests/rename/should_fail/rnfail040.stderr @@ -1,9 +1,9 @@ -rnfail040.hs:7:12: +rnfail040.hs:7:12: error: Conflicting exports for ‘nub’: ‘module M’ exports ‘M.nub’ imported from ‘Data.List’ at rnfail040.hs:10:2-22 - (and originally defined in ‘base-4.9.0.0:Data.OldList’) + (and originally defined in ‘base-4.10.0.0:Data.OldList’) ‘module M’ exports ‘T.nub’ imported from ‘Rnfail040_A’ at rnfail040.hs:11:2-24 (and originally defined at Rnfail040_A.hs:2:3-5) diff --git a/testsuite/tests/roles/should_compile/Roles1.stderr b/testsuite/tests/roles/should_compile/Roles1.stderr index b44ff8f5ce..bb67a8cf26 100644 --- a/testsuite/tests/roles/should_compile/Roles1.stderr +++ b/testsuite/tests/roles/should_compile/Roles1.stderr @@ -21,7 +21,7 @@ TYPE CONSTRUCTORS data T7 (a :: k) b = K7 b COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/Roles14.stderr b/testsuite/tests/roles/should_compile/Roles14.stderr index b34194db79..8604b00ad2 100644 --- a/testsuite/tests/roles/should_compile/Roles14.stderr +++ b/testsuite/tests/roles/should_compile/Roles14.stderr @@ -8,7 +8,7 @@ TYPE CONSTRUCTORS COERCION AXIOMS axiom Roles12.N:C2 :: C2 a = a -> a -- Defined at Roles14.hs:6:1 Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/Roles2.stderr b/testsuite/tests/roles/should_compile/Roles2.stderr index 65ba748863..cea02f5215 100644 --- a/testsuite/tests/roles/should_compile/Roles2.stderr +++ b/testsuite/tests/roles/should_compile/Roles2.stderr @@ -7,7 +7,7 @@ TYPE CONSTRUCTORS data T2 a = K2 (FunPtr a) COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/Roles3.stderr b/testsuite/tests/roles/should_compile/Roles3.stderr index 5bf803419f..1541f892a9 100644 --- a/testsuite/tests/roles/should_compile/Roles3.stderr +++ b/testsuite/tests/roles/should_compile/Roles3.stderr @@ -29,7 +29,7 @@ COERCION AXIOMS axiom Roles3.N:C4 :: C4 a b = a -> F4 b -> F4 b -- Defined at Roles3.hs:18:1 Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/Roles4.stderr b/testsuite/tests/roles/should_compile/Roles4.stderr index 6a336da26b..49e9ac9768 100644 --- a/testsuite/tests/roles/should_compile/Roles4.stderr +++ b/testsuite/tests/roles/should_compile/Roles4.stderr @@ -14,7 +14,7 @@ COERCION AXIOMS axiom Roles4.N:C3 :: C3 a = a -> Syn1 a -- Defined at Roles4.hs:11:1 Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/T8958.stderr b/testsuite/tests/roles/should_compile/T8958.stderr index 28ef9ce128..a527d1f02e 100644 --- a/testsuite/tests/roles/should_compile/T8958.stderr +++ b/testsuite/tests/roles/should_compile/T8958.stderr @@ -16,7 +16,7 @@ INSTANCES -- Defined at T8958.hs:10:10 instance [incoherent] Nominal a -- Defined at T8958.hs:7:10 Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] ==================== Typechecker ==================== diff --git a/testsuite/tests/safeHaskell/check/Check01.stderr b/testsuite/tests/safeHaskell/check/Check01.stderr index 8aafacab7d..7b1c38f172 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>: error: - The package (base-4.9.0.0) is required to be trusted but it isn't! + The package (base-4.10.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 ac0ece6705..cc33f0f6c1 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>: error: - The package (base-4.9.0.0) is required to be trusted but it isn't! + The package (base-4.10.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 e081a984e8..0b53c3ae9f 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>: error: - The package (base-4.9.0.0) is required to be trusted but it isn't! + The package (base-4.10.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 1bcbe80b2b..1dfa20fd67 100644 --- a/testsuite/tests/safeHaskell/check/Check09.stderr +++ b/testsuite/tests/safeHaskell/check/Check09.stderr @@ -1,8 +1,8 @@ -Check09.hs:4:1: +Check09.hs:4:1: error: Prelude: Can't be safely imported! - The package (base-4.9.0.0) the module resides in isn't trusted. + The package (base-4.10.0.0) the module resides in isn't trusted. -Check09.hs:5:1: +Check09.hs:5:1: error: Data.ByteString.Char8: Can't be safely imported! - The package (bytestring-0.10.5.0) the module resides in isn't trusted. + The package (bytestring-0.10.8.1) the module resides in isn't trusted. diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr index 4947b76771..4a3f86c56f 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: +ImpSafe01.hs:9:1: error: Data.Word: Can't be safely imported! - The package (base-4.9.0.0) the module resides in isn't trusted. + The package (base-4.10.0.0) the module resides in isn't trusted. diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe04.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe04.stderr index 0cabc2f3f3..5700fc8025 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe04.stderr +++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe04.stderr @@ -1,4 +1,4 @@ -ImpSafe04.hs:9:1: +ImpSafe04.hs:9:1: error: Data.Word: Can't be safely imported! - The package (base-4.9.0.0) the module resides in isn't trusted. + The package (base-4.10.0.0) the module resides in isn't trusted. diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr index 1143e13f04..fa2c8a881b 100644 --- a/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr +++ b/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr @@ -1,4 +1,4 @@ -SafeFlags17.hs:4:8: +SafeFlags17.hs:4:8: error: Prelude: Can't be safely imported! - The package (base-4.9.0.0) the module resides in isn't trusted. + The package (base-4.10.0.0) the module resides in isn't trusted. diff --git a/testsuite/tests/typecheck/should_compile/T12763.stderr b/testsuite/tests/typecheck/should_compile/T12763.stderr index 0b38463d1c..8f1937d0a5 100644 --- a/testsuite/tests/typecheck/should_compile/T12763.stderr +++ b/testsuite/tests/typecheck/should_compile/T12763.stderr @@ -10,5 +10,5 @@ COERCION AXIOMS INSTANCES instance C Int -- Defined at T12763.hs:9:10 Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/typecheck/should_compile/tc231.stderr b/testsuite/tests/typecheck/should_compile/tc231.stderr index daa77b3313..e667f3523b 100644 --- a/testsuite/tests/typecheck/should_compile/tc231.stderr +++ b/testsuite/tests/typecheck/should_compile/tc231.stderr @@ -19,5 +19,5 @@ COERCION AXIOMS Zork s a b = forall chain. Q s a chain -> ST s () -- Defined at tc231.hs:25:1 Dependent modules: [] -Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, +Dependent packages: [base-4.10.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] diff --git a/testsuite/tests/typecheck/should_fail/tcfail182.stderr b/testsuite/tests/typecheck/should_fail/tcfail182.stderr index 6bd7b156ab..d5ba794a7b 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: error: • Couldn't match expected type ‘Prelude.Maybe a’ with actual type ‘Maybe a0’ NB: ‘Maybe’ is defined at tcfail182.hs:6:1-18 - ‘Prelude.Maybe’ is defined in ‘GHC.Base’ in package ‘base-4.9.0.0’ + ‘Prelude.Maybe’ is defined in ‘GHC.Base’ in package ‘base-4.10.0.0’ • In the pattern: Foo In an equation for ‘f’: f Foo = 3 • Relevant bindings include diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal index 1f328d8557..d65ffba0e6 100644 --- a/utils/ghc-cabal/ghc-cabal.cabal +++ b/utils/ghc-cabal/ghc-cabal.cabal @@ -22,6 +22,6 @@ Executable ghc-cabal Build-Depends: base >= 3 && < 5, bytestring >= 0.10 && < 0.11, Cabal >= 1.25 && < 1.27, - directory >= 1.1 && < 1.3, + directory >= 1.1 && < 1.4, filepath >= 1.2 && < 1.5 diff --git a/utils/ghc-pkg/ghc-pkg.cabal b/utils/ghc-pkg/ghc-pkg.cabal index 5f76e1b5ee..3511e36691 100644 --- a/utils/ghc-pkg/ghc-pkg.cabal +++ b/utils/ghc-pkg/ghc-pkg.cabal @@ -22,7 +22,7 @@ Executable ghc-pkg Other-Extensions: CPP Build-Depends: base >= 4 && < 5, - directory >= 1 && < 1.3, + directory >= 1 && < 1.4, process >= 1 && < 1.5, containers, filepath, diff --git a/utils/haddock b/utils/haddock -Subproject f951caf888eabd8742059f26e516e3392658fc8 +Subproject b34497c36cd01a9c8a08ec3133ec94783642e43 diff --git a/utils/hpc/hpc-bin.cabal b/utils/hpc/hpc-bin.cabal index 87c5b11e5c..e83a45d1f2 100644 --- a/utils/hpc/hpc-bin.cabal +++ b/utils/hpc/hpc-bin.cabal @@ -29,7 +29,7 @@ Executable hpc Paths_hpc_bin Build-Depends: base >= 4 && < 5, - directory >= 1 && < 1.3, + directory >= 1 && < 1.4, filepath >= 1 && < 1.5, containers >= 0.1 && < 0.6, array >= 0.1 && < 0.6, diff --git a/utils/hsc2hs b/utils/hsc2hs -Subproject f5ae016e5a69ebf42d612805e51afd9227df938 +Subproject fbc552f4bb003edbdd52305a5eb34a903c9fe62 diff --git a/utils/runghc/runghc.cabal.in b/utils/runghc/runghc.cabal.in index 2253292cf0..3be9f26e32 100644 --- a/utils/runghc/runghc.cabal.in +++ b/utils/runghc/runghc.cabal.in @@ -27,7 +27,7 @@ Executable runghc Main-Is: Main.hs Build-Depends: base >= 3 && < 5, - directory >= 1 && < 1.3, + directory >= 1 && < 1.4, process >= 1 && < 1.5, filepath |