summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compiler/ghc.cabal.in2
-rw-r--r--ghc/ghc-bin.cabal.in2
m---------libraries/containers0
m---------libraries/time0
m---------libraries/unix0
-rw-r--r--testsuite/tests/backpack/should_run/bkprun05.stderr2
-rw-r--r--testsuite/tests/cabal/cabal08/all.T3
-rw-r--r--testsuite/tests/driver/T10970.stdout2
-rw-r--r--testsuite/tests/ghci.debugger/scripts/print026.stdout11
-rw-r--r--testsuite/tests/package/package01e.stderr4
-rw-r--r--testsuite/tests/partial-sigs/should_fail/T10999.stderr3
-rw-r--r--testsuite/tests/th/T10796b.stderr2
12 files changed, 17 insertions, 14 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index f3d6711f89..b8b7106346 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -55,7 +55,7 @@ Library
process >= 1 && < 1.5,
bytestring >= 0.9 && < 0.11,
binary == 0.8.*,
- time >= 1.4 && < 1.8,
+ time >= 1.4 && < 1.9,
containers >= 0.5 && < 0.6,
array >= 0.1 && < 0.6,
filepath >= 1 && < 1.5,
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 9c9ca0e246..0f50453c3d 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -52,7 +52,7 @@ Executable ghc
deepseq == 1.4.*,
ghci == @ProjectVersionMunged@,
haskeline == 0.7.*,
- time == 1.7.*,
+ time == 1.8.*,
transformers == 0.5.*
CPP-Options: -DGHCI
GHC-Options: -fno-warn-name-shadowing
diff --git a/libraries/containers b/libraries/containers
-Subproject aa982fb83f2561d3b27b89b46d36ffca21e072c
+Subproject 9e5d789c77b7252fb3fbf7a26f649b96ba20649
diff --git a/libraries/time b/libraries/time
-Subproject b6098be8a4facfa854c633f2a3a82ab8e72962e
+Subproject 4eb06c0e5381a5b5ad2186ac6ecff434cd71137
diff --git a/libraries/unix b/libraries/unix
-Subproject d0b0e8cf5a7fa5b9dc500d2f623258200818cb1
+Subproject 821cb07ecf235625b4bb06626d30e4b15f28df3
diff --git a/testsuite/tests/backpack/should_run/bkprun05.stderr b/testsuite/tests/backpack/should_run/bkprun05.stderr
index d9042b073d..854de8b6c5 100644
--- a/testsuite/tests/backpack/should_run/bkprun05.stderr
+++ b/testsuite/tests/backpack/should_run/bkprun05.stderr
@@ -1,4 +1,4 @@
bkprun05: Prelude.undefined
CallStack (from HasCallStack):
error, called at libraries/base/GHC/Err.hs:79:14 in base:GHC.Err
- undefined, called at bkprun05.bkp:138:30 in app+app-9GMmly0OuEYHDXryaGD7sX:App
+ undefined, called at bkprun05.bkp:138:30 in app+app-89WS9ScvjQd9lPG2oW0wWM:App
diff --git a/testsuite/tests/cabal/cabal08/all.T b/testsuite/tests/cabal/cabal08/all.T
index 95864fdf96..d8bc444f2a 100644
--- a/testsuite/tests/cabal/cabal08/all.T
+++ b/testsuite/tests/cabal/cabal08/all.T
@@ -4,6 +4,7 @@ else:
cleanup = 'CLEANUP=0'
test('cabal08',
- extra_files(['Main.hs', 'Setup.hs', 'p1/', 'p2/']),
+ [extra_files(['Main.hs', 'Setup.hs', 'p1/', 'p2/']),
+ expect_broken(13313)],
run_command,
['$MAKE -s --no-print-directory cabal08 ' + cleanup])
diff --git a/testsuite/tests/driver/T10970.stdout b/testsuite/tests/driver/T10970.stdout
index fd35dddeb2..96362170dd 100644
--- a/testsuite/tests/driver/T10970.stdout
+++ b/testsuite/tests/driver/T10970.stdout
@@ -1,2 +1,2 @@
-0.5.7.1
+0.5.10.2
OK
diff --git a/testsuite/tests/ghci.debugger/scripts/print026.stdout b/testsuite/tests/ghci.debugger/scripts/print026.stdout
index decc3dfb6d..9ed900fbb6 100644
--- a/testsuite/tests/ghci.debugger/scripts/print026.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print026.stdout
@@ -1,6 +1,9 @@
fromList "abc"
-l = Data.Sequence.Seq (Data.Sequence.Deep
- 3 (Data.Sequence.One (Data.Sequence.Elem 'a')) Data.Sequence.Empty
- (Data.Sequence.Two
- (Data.Sequence.Elem 'b') (Data.Sequence.Elem 'c')))
+l = Data.Sequence.Internal.Seq (Data.Sequence.Internal.Deep
+ 3
+ (Data.Sequence.Internal.Two
+ (Data.Sequence.Internal.Elem 'a')
+ (Data.Sequence.Internal.Elem 'b'))
+ Data.Sequence.Internal.EmptyT
+ (Data.Sequence.Internal.One (Data.Sequence.Internal.Elem 'c')))
l = fromList "abc"
diff --git a/testsuite/tests/package/package01e.stderr b/testsuite/tests/package/package01e.stderr
index f34ee1dd8f..cfde9a7b28 100644
--- a/testsuite/tests/package/package01e.stderr
+++ b/testsuite/tests/package/package01e.stderr
@@ -1,10 +1,10 @@
package01e.hs:2:1: error:
Could not find module ‘Data.Map’
- It is a member of the hidden package ‘containers-0.5.7.1’.
+ It is a member of the hidden package ‘containers-0.5.10.2’.
Use -v to see a list of the files searched for.
package01e.hs:3:1: error:
Could not find module ‘Data.IntMap’
- It is a member of the hidden package ‘containers-0.5.7.1’.
+ It is a member of the hidden package ‘containers-0.5.10.2’.
Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/partial-sigs/should_fail/T10999.stderr b/testsuite/tests/partial-sigs/should_fail/T10999.stderr
index 582cf1a70e..0b534b9480 100644
--- a/testsuite/tests/partial-sigs/should_fail/T10999.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/T10999.stderr
@@ -21,8 +21,7 @@ T10999.hs:8:28: error:
Relevant bindings include g :: [b0] (bound at T10999.hs:8:1)
Probable fix: use a type annotation to specify what ‘b0’ should be.
These potential instances exist:
- instance Ord a => Ord (Set.Set a)
- -- Defined in ‘containers-0.5.7.1:Data.Set.Base’
+ instance Ord a => Ord (Set.Set a) -- Defined in ‘Data.Set.Internal’
instance Ord Ordering -- Defined in ‘GHC.Classes’
instance Ord Integer
-- Defined in ‘integer-gmp-1.0.0.1:GHC.Integer.Type’
diff --git a/testsuite/tests/th/T10796b.stderr b/testsuite/tests/th/T10796b.stderr
index eff1f75f7c..2491a8c259 100644
--- a/testsuite/tests/th/T10796b.stderr
+++ b/testsuite/tests/th/T10796b.stderr
@@ -1,5 +1,5 @@
T10796b.hs:8:17: error:
- • Can't construct a pattern from name Data.Set.Base.fromList
+ • Can't construct a pattern from name Data.Set.Internal.fromList
• In the untyped splice:
$(dataToPatQ (const Nothing) (fromList "test"))
View Lorry Controller Status