Try submodule bumps again

Bumps containers, time, and unix submodules.

This reverts commit c347a121.

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,

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

containers @ 9e5d789c

-Subproject commit aa982fb83f2561d3b27b89b46d36ffca21e072cc
+Subproject commit 9e5d789c77b7252fb3fbf7a26f649b96ba20649c

time @ 4eb06c0e

-Subproject commit b6098be8a4facfa854c633f2a3a82ab8e72962ef
+Subproject commit 4eb06c0e5381a5b5ad2186ac6ecff434cd711376

unix @ 821cb07e

-Subproject commit d0b0e8cf5a7fa5b9dc500d2f623258200818cb16
+Subproject commit 821cb07ecf235625b4bb06626d30e4b15f28df30

testsuite/tests/backpack/should_run/bkprun05.stderr

 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

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])

testsuite/tests/driver/T10970.stdout

-0.5.7.1
+0.5.10.2
 OK

testsuite/tests/ghci.debugger/scripts/print026.stdout

 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"

testsuite/tests/package/package01e.stderr

 
 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.

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’

testsuite/tests/th/T10796b.stderr

 
 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"))