diff options
| author | Tamar Christina <tamar@zhox.com> | 2017-10-25 08:51:00 +0100 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2017-10-25 09:12:09 +0100 |
| commit | 561bdca16e2fe88d0b96fc10098955eabca81bba (patch) | |
| tree | d3bd501248aefc9c0f9229d694cd69268f1d8f4b | |
| parent | e888a1ff4b5657c4243fe04f16db4e703fd601b2 (diff) | |
| download | haskell-561bdca16e2fe88d0b96fc10098955eabca81bba.tar.gz | |
Update Win32 version for GHC 8.4.
Summary: Update to Win32 2.6 which is the expected version release for 8.4
This bumps the required submodule s as well.
Test Plan: ./validate
Reviewers: austin, bgamari
Reviewed By: bgamari
Subscribers: rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D4117
| -rw-r--r-- | compiler/ghc.cabal.in | 2 | ||||
| -rw-r--r-- | docs/users_guide/8.4.1-notes.rst | 7 | ||||
| -rw-r--r-- | ghc/ghc-bin.cabal.in | 2 | ||||
| m--------- | libraries/Cabal | 0 | ||||
| m--------- | libraries/Win32 | 0 | ||||
| m--------- | libraries/directory | 0 | ||||
| m--------- | libraries/process | 0 |
7 files changed, 9 insertions, 2 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index d3cbe9563b..19e8d1a705 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -67,7 +67,7 @@ Library ghci == @ProjectVersionMunged@ if os(windows) - Build-Depends: Win32 >= 2.3 && < 2.6 + Build-Depends: Win32 >= 2.3 && < 2.7 else if flag(terminfo) Build-Depends: terminfo == 0.4.* diff --git a/docs/users_guide/8.4.1-notes.rst b/docs/users_guide/8.4.1-notes.rst index b787e2e626..8b11c056f6 100644 --- a/docs/users_guide/8.4.1-notes.rst +++ b/docs/users_guide/8.4.1-notes.rst @@ -271,3 +271,10 @@ Build system There is currently no explicit dependency between the two in the build system and such there is no way to notify ``base`` that the ``rts`` has been split, or vice versa. (see :ghc-ticket:`5987`). + +Win32 +~~~~~ + +- Version number 2.6.x.x (was 2.5.4.1) + NOTE: This release is a backwards incompatible release which corrects the type of certain APIs. + See issue https://github.com/haskell/win32/issues/24. diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in index 5fe7c9dc5c..c94c6f8013 100644 --- a/ghc/ghc-bin.cabal.in +++ b/ghc/ghc-bin.cabal.in @@ -38,7 +38,7 @@ Executable ghc ghc == @ProjectVersionMunged@ if os(windows) - Build-Depends: Win32 >= 2.3 && < 2.6 + Build-Depends: Win32 >= 2.3 && < 2.7 else Build-Depends: unix == 2.7.* diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 082cf2066b7206d3b12a9f92d832236e2484b4c +Subproject 46c79e1d8d0ed76b20e8494b697f3057b64aafd diff --git a/libraries/Win32 b/libraries/Win32 -Subproject 147a0af92ac74ec58b209e16aeb1cf03bddf948 +Subproject 0f869f6bf66e227d566947fdbf0886c10291d80 diff --git a/libraries/directory b/libraries/directory -Subproject 7e7b3c2ae34c52c525270094b625f21829c8357 +Subproject 7504d6f94823684846545e48c046322039c64eb diff --git a/libraries/process b/libraries/process -Subproject 4f6e0a336cb9a3517415c7279888667b9284d88 +Subproject 2fb7e739771f4a899a12b45f8b392e4874616b8 |