From 3b63186da9de818963c40ecb27848d3eb4722513 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sat, 13 Apr 2024 09:06:56 -0400
Subject: [PATCH] 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.
---
compiler/ghc.cabal.in | 2 +-
ghc/ghc-bin.cabal.in | 2 +-
hadrian/src/Rules/Dependencies.hs | 12 ------------
libraries/Cabal | 2 +-
libraries/directory | 2 +-
libraries/hpc | 2 +-
libraries/time | 2 +-
7 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 5efad1984f3..a7502bb1f9d 100644
--- a/compiler/ghc.cabal.in
+++ b/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,
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 38841a9aa35..de06e3febd1 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/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
diff --git a/hadrian/src/Rules/Dependencies.hs b/hadrian/src/Rules/Dependencies.hs
index 153d0a00229..099d82b0931 100644
--- a/hadrian/src/Rules/Dependencies.hs
+++ b/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)
diff --git a/libraries/Cabal b/libraries/Cabal
index b5ac2f70b02..7d140c56d27 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit b5ac2f70b0289c5ee1d31211a44133217a8fb9e3
+Subproject commit 7d140c56d277c49fb8452729de3bb62c937017a0
diff --git a/libraries/directory b/libraries/directory
index fc144a58176..4b7c231d187 160000
--- a/libraries/directory
+++ b/libraries/directory
@@ -1 +1 @@
-Subproject commit fc144a581768eb0a328bdcd5adcffca400bd0876
+Subproject commit 4b7c231d187cf253c5f446c4aed2fea26b81d5f9
diff --git a/libraries/hpc b/libraries/hpc
index 4989c41b96c..8bf6f8b08b0 160000
--- a/libraries/hpc
+++ b/libraries/hpc
@@ -1 +1 @@
-Subproject commit 4989c41b96c7c9ca09a6687da638ac28f3d3688b
+Subproject commit 8bf6f8b08b0d72cb9231775b66ca572acc1d3197
diff --git a/libraries/time b/libraries/time
index e5c5d198701..baab563ee2c 160000
--- a/libraries/time
+++ b/libraries/time
@@ -1 +1 @@
-Subproject commit e5c5d1987011efe88a21ab6ded45aaa33a16274f
+Subproject commit baab563ee2ce547f7b7f7e7069ed09db2d406941
--
GitLab