[commit: ghc] master: Revert "Update Win32 version for GHC 8.4." (b1ad0bb)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b1ad0bb3be084f365b351dafed41593176e6ec08/ghc

>---------------------------------------------------------------

commit b1ad0bb3be084f365b351dafed41593176e6ec08
Author: Tamar Christina <tamar at zhox.com>
Date:   Wed Oct 25 09:53:54 2017 +0100

    Revert "Update Win32 version for GHC 8.4."
    
    This reverts commit 561bdca16e2fe88d0b96fc10098955eabca81bba.
    
    submodule


>---------------------------------------------------------------

b1ad0bb3be084f365b351dafed41593176e6ec08
 compiler/ghc.cabal.in            | 2 +-
 docs/users_guide/8.4.1-notes.rst | 7 -------
 ghc/ghc-bin.cabal.in             | 2 +-
 libraries/Cabal                  | 2 +-
 libraries/Win32                  | 2 +-
 libraries/directory              | 2 +-
 libraries/process                | 2 +-
 7 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 19e8d1a..d3cbe95 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.7
+        Build-Depends: Win32  >= 2.3 && < 2.6
     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 8b11c05..b787e2e 100644
--- a/docs/users_guide/8.4.1-notes.rst
+++ b/docs/users_guide/8.4.1-notes.rst
@@ -271,10 +271,3 @@ 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 c94c6f8..5fe7c9d 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.7
+        Build-Depends: Win32  >= 2.3 && < 2.6
     else
         Build-Depends: unix   == 2.7.*
 
diff --git a/libraries/Cabal b/libraries/Cabal
index 46c79e1..082cf20 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 46c79e1d8d0ed76b20e8494b697f3057b64aafd5
+Subproject commit 082cf2066b7206d3b12a9f92d832236e2484b4c1
diff --git a/libraries/Win32 b/libraries/Win32
index 0f869f6..147a0af 160000
--- a/libraries/Win32
+++ b/libraries/Win32
@@ -1 +1 @@
-Subproject commit 0f869f6bf66e227d566947fdbf0886c10291d80d
+Subproject commit 147a0af92ac74ec58b209e16aeb1cf03bddf9482
diff --git a/libraries/directory b/libraries/directory
index 7504d6f..7e7b3c2 160000
--- a/libraries/directory
+++ b/libraries/directory
@@ -1 +1 @@
-Subproject commit 7504d6f94823684846545e48c046322039c64eb1
+Subproject commit 7e7b3c2ae34c52c525270094b625f21829c83576
diff --git a/libraries/process b/libraries/process
index 2fb7e73..4f6e0a3 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit 2fb7e739771f4a899a12b45f8b392e4874616b89
+Subproject commit 4f6e0a336cb9a3517415c7279888667b9284d88f