summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-09-08 11:42:58 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-09-17 08:51:08 -0400
commit76009ec84652f9b5c085f320ad9476e3693549f1 (patch)
tree9ae2e8cc14bac64336a728ab91e3186e25bb7528
parent8d0c26c463fc1512ad90788345b002b23e53555a (diff)
downloadhaskell-76009ec84652f9b5c085f320ad9476e3693549f1.tar.gz
Bump Win32 submodule to 2.9.0.0
Also bumps Cabal, directory
-rw-r--r--compiler/ghc.cabal.in2
-rw-r--r--ghc/ghc-bin.cabal.in2
m---------libraries/Cabal0
m---------libraries/directory0
m---------libraries/haskeline0
-rw-r--r--utils/check-api-annotations/check-api-annotations.cabal2
-rw-r--r--utils/check-ppr/check-ppr.cabal2
-rw-r--r--utils/ghc-cabal/ghc-cabal.cabal2
8 files changed, 5 insertions, 5 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index d469a85926..b58ae7f38e 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -76,7 +76,7 @@ Library
ghci == @ProjectVersionMunged@
if os(windows)
- Build-Depends: Win32 >= 2.3 && < 2.7
+ Build-Depends: Win32 >= 2.3 && < 2.10
else
if flag(terminfo)
Build-Depends: terminfo == 0.4.*
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index bc111dbf98..1518a8debc 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.7
+ Build-Depends: Win32 >= 2.3 && < 2.10
else
Build-Depends: unix >= 2.7 && < 2.9
diff --git a/libraries/Cabal b/libraries/Cabal
-Subproject 32dad5c1cf70d65ecb93b0ec214445cf9c9f661
+Subproject 2d8a1b60ae409291585b647be8f02bc42b23cbb
diff --git a/libraries/directory b/libraries/directory
-Subproject 3d9ca6edc0703860829ab3210db78bb4c4ff72b
+Subproject c16afcda5708ee9944afa7ea6858e5be894fe67
diff --git a/libraries/haskeline b/libraries/haskeline
-Subproject 5f16b76168f13c6413413386efc44fb1152048d
+Subproject 2790f1c6ed94990ed51466079e8fb1097129c9b
diff --git a/utils/check-api-annotations/check-api-annotations.cabal b/utils/check-api-annotations/check-api-annotations.cabal
index f8363de536..8bf0fb6922 100644
--- a/utils/check-api-annotations/check-api-annotations.cabal
+++ b/utils/check-api-annotations/check-api-annotations.cabal
@@ -24,6 +24,6 @@ Executable check-api-annotations
Build-Depends: base >= 4 && < 5,
containers,
- Cabal >= 3.0 && < 3.4,
+ Cabal >= 3.0 && < 3.6,
directory,
ghc
diff --git a/utils/check-ppr/check-ppr.cabal b/utils/check-ppr/check-ppr.cabal
index 5938667354..059a4d364c 100644
--- a/utils/check-ppr/check-ppr.cabal
+++ b/utils/check-ppr/check-ppr.cabal
@@ -25,7 +25,7 @@ Executable check-ppr
Build-Depends: base >= 4 && < 5,
bytestring,
containers,
- Cabal >= 3.0 && < 3.4,
+ Cabal >= 3.0 && < 3.6,
directory,
filepath,
ghc
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal
index 49ae948c44..5914c192e6 100644
--- a/utils/ghc-cabal/ghc-cabal.cabal
+++ b/utils/ghc-cabal/ghc-cabal.cabal
@@ -21,6 +21,6 @@ Executable ghc-cabal
Build-Depends: base >= 3 && < 5,
bytestring >= 0.10 && < 0.11,
- Cabal >= 3.0 && < 3.4,
+ Cabal >= 3.0 && < 3.6,
directory >= 1.1 && < 1.4,
filepath >= 1.2 && < 1.5