summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZubin Duggal <zubin.duggal@gmail.com>2021-12-24 17:21:13 +0530
committerZubin Duggal <zubin.duggal@gmail.com>2021-12-24 22:31:42 +0530
commitf5584045e5e2190175062f1cf329d24b46c83963 (patch)
treee5f2a31e8499ecd89e87313428ae31e777fe7b09
parentf1a274029b1ff2531316c653247ec0d5807f1dbf (diff)
downloadhaskell-f5584045e5e2190175062f1cf329d24b46c83963.tar.gz
Relax upper bound for Win32 to 2.13
bump Cabal submodule to 3.4.1.0 and directory submodule to 1.3.6.2
-rw-r--r--compiler/ghc.cabal.in2
-rw-r--r--docs/users_guide/9.0.2-notes.rst4
-rw-r--r--ghc/ghc-bin.cabal.in2
m---------libraries/Cabal0
m---------libraries/directory0
5 files changed, 6 insertions, 2 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index f2e97d81fb..de53f7f548 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -77,7 +77,7 @@ Library
ghci == @ProjectVersionMunged@
if os(windows)
- Build-Depends: Win32 >= 2.3 && < 2.11
+ Build-Depends: Win32 >= 2.3 && < 2.13
else
if flag(terminfo)
Build-Depends: terminfo == 0.4.*
diff --git a/docs/users_guide/9.0.2-notes.rst b/docs/users_guide/9.0.2-notes.rst
index 99d1ecc731..bae7261f34 100644
--- a/docs/users_guide/9.0.2-notes.rst
+++ b/docs/users_guide/9.0.2-notes.rst
@@ -203,6 +203,10 @@ Packaging fixes
- Bump ``text`` to 1.2.5.0
+- Bump ``Cabal`` to 3.4.1.0
+
+- Bump ``directory`` to 1.3.6.2
+
Portability fixes
-----------------
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index d2a5fd451e..9c0ff6f138 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -45,7 +45,7 @@ Executable ghc
ghc == @ProjectVersionMunged@
if os(windows)
- Build-Depends: Win32 >= 2.3 && < 2.11
+ Build-Depends: Win32 >= 2.3 && < 2.13
else
Build-Depends: unix >= 2.7 && < 2.9
diff --git a/libraries/Cabal b/libraries/Cabal
-Subproject 97582dd2cbf56bcc19830c4c3a3d98f4af7d1a0
+Subproject 942639c18c0cd8ec53e0a6f8d120091af35312c
diff --git a/libraries/directory b/libraries/directory
-Subproject b697b3ea77dd4803f2f8f676dd64c8ea5277fcf
+Subproject ffdb0a0714438122fae3b18ebe2a8cd8ba4f976