[Git][ghc/ghc][ghc-9.10] Revert "Bump time submodule to 1.14"

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch ghc-9.10 at Glasgow Haskell Compiler / GHC


Commits:
3b63186d by Ben Gamari at 2024-04-13T09:07:57-04:00
Revert "Bump time submodule to 1.14"

Unfortunately the `Lift` instances introduced in 1.14 trigger #22229.
While it's unlikely that an end-user will observe this breakage, we
cannot to ship a release with the CI breakage that this implies (as
multi-component support would have no validation). Consequently, we have
no choice but to try to fix #22229 and bump again in 9.12.

This reverts commit 2ed7264434a2edee97ab441c9ccbdf675e0d7896.

- - - - -


7 changed files:

- compiler/ghc.cabal.in
- ghc/ghc-bin.cabal.in
- hadrian/src/Rules/Dependencies.hs
- libraries/Cabal
- libraries/directory
- libraries/hpc
- libraries/time


Changes:

=====================================
compiler/ghc.cabal.in
=====================================
@@ -111,7 +111,7 @@ Library
                    process    >= 1   && < 1.7,
                    bytestring >= 0.9 && < 0.13,
                    binary     == 0.8.*,
-                   time       >= 1.4 && < 1.15,
+                   time       >= 1.4 && < 1.13,
                    containers >= 0.6.2.1 && < 0.8,
                    array      >= 0.1 && < 0.6,
                    filepath   >= 1   && < 1.6,


=====================================
ghc/ghc-bin.cabal.in
=====================================
@@ -61,7 +61,7 @@ Executable ghc
             ghci           == @ProjectVersionMunged@,
             haskeline      == 0.8.*,
             exceptions     == 0.10.*,
-            time           >= 1.8 && < 1.15
+            time           >= 1.8 && < 1.13
         CPP-Options: -DHAVE_INTERNAL_INTERPRETER
         Other-Modules:
             GHCi.Leak


=====================================
hadrian/src/Rules/Dependencies.hs
=====================================
@@ -29,18 +29,6 @@ extraDepsList =
     , (containers, "Data.Set.Internal") --> th_internal
     , (containers, "Data.Sequence.Internal") --> th_internal
     , (containers, "Data.Graph") --> th_internal
-    , (time, "Data.Time.Calendar.CalendarDiffDays") --> th_internal
-    , (time, "Data.Time.Calendar.Days") --> th_internal
-    , (time, "Data.Time.Calendar.Month") --> th_internal
-    , (time, "Data.Time.Calendar.Quarter") --> th_internal
-    , (time, "Data.Time.Calendar.Week") --> th_internal
-    , (time, "Data.Time.Calendar.WeekDate") --> th_internal
-    , (time, "Data.Time.Clock.Internal.AbsoluteTime") --> th_internal
-    , (time, "Data.Time.Clock.Internal.DiffTime") --> th_internal
-    , (time, "Data.Time.Clock.Internal.NominalDiffTime") --> th_internal
-    , (time, "Data.Time.Clock.Internal.SystemTime") --> th_internal
-    , (time, "Data.Time.Clock.Internal.UTCTime") --> th_internal
-    , (time, "Data.Time.Clock.Internal.UniversalTime") --> th_internal
     ]
   where
     (p1,m1) --> (p2,m2) = (PkgMod p1 m1, PkgMod p2 m2)


=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit b5ac2f70b0289c5ee1d31211a44133217a8fb9e3
+Subproject commit 7d140c56d277c49fb8452729de3bb62c937017a0


=====================================
libraries/directory
=====================================
@@ -1 +1 @@
-Subproject commit fc144a581768eb0a328bdcd5adcffca400bd0876
+Subproject commit 4b7c231d187cf253c5f446c4aed2fea26b81d5f9


=====================================
libraries/hpc
=====================================
@@ -1 +1 @@
-Subproject commit 4989c41b96c7c9ca09a6687da638ac28f3d3688b
+Subproject commit 8bf6f8b08b0d72cb9231775b66ca572acc1d3197


=====================================
libraries/time
=====================================
@@ -1 +1 @@
-Subproject commit e5c5d1987011efe88a21ab6ded45aaa33a16274f
+Subproject commit baab563ee2ce547f7b7f7e7069ed09db2d406941



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3b63186da9de818963c40ecb27848d3eb4722513

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3b63186da9de818963c40ecb27848d3eb4722513
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240414/353b7f42/attachment-0001.html>