Update Win32 version for GHC 8.4.
authorTamar Christina <tamar@zhox.com>
Wed, 25 Oct 2017 07:51:00 +0000 (08:51 +0100)
committerTamar Christina <tamar@zhox.com>
Wed, 25 Oct 2017 08:12:09 +0000 (09:12 +0100)
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

compiler/ghc.cabal.in
docs/users_guide/8.4.1-notes.rst
ghc/ghc-bin.cabal.in
libraries/Cabal
libraries/Win32
libraries/directory
libraries/process

index d3cbe95..19e8d1a 100644 (file)
@@ -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.*
index b787e2e..8b11c05 100644 (file)
@@ -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.
index 5fe7c9d..c94c6f8 100644 (file)
@@ -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.*
 
index 082cf20..46c79e1 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 082cf2066b7206d3b12a9f92d832236e2484b4c1
+Subproject commit 46c79e1d8d0ed76b20e8494b697f3057b64aafd5
index 147a0af..0f869f6 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 147a0af92ac74ec58b209e16aeb1cf03bddf9482
+Subproject commit 0f869f6bf66e227d566947fdbf0886c10291d80d
index 7e7b3c2..7504d6f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 7e7b3c2ae34c52c525270094b625f21829c83576
+Subproject commit 7504d6f94823684846545e48c046322039c64eb1
index 4f6e0a3..2fb7e73 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 4f6e0a336cb9a3517415c7279888667b9284d88f
+Subproject commit 2fb7e739771f4a899a12b45f8b392e4874616b89