Update Win32 version for GHC 8.4.

Update to Win32 2.6 which is the expected version release for 8.4

This involves moving Cabal forward which brings some backwards incompatible
changes that needs various fixups.

Bump a bunch of submodules

Test Plan: ./validate

Reviewers: austin, bgamari, angerman

Reviewed By: bgamari, angerman

Subscribers: angerman, thomie, rwbarton

Differential Revision: https://phabricator.haskell.org/D4133

6 files changed, 11 insertions, 12 deletions

diff --git a/utils/check-api-annotations/check-api-annotations.cabal b/utils/check-api-annotations/check-api-annotations.cabal
index 880f4d6603..f2b3d74e1c 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      >= 2.0 && < 2.1,
+                   Cabal      >= 2.1 && < 2.2,
                    directory,
                    ghc
diff --git a/utils/check-ppr/check-ppr.cabal b/utils/check-ppr/check-ppr.cabal
index 584558b3ff..e788927196 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      >= 2.0 && < 2.1,
+                   Cabal      >= 2.1 && < 2.2,
                    directory,
                    filepath,
                    ghc
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index e445520c80..2ba912a30f 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -15,7 +15,8 @@ import Distribution.Simple.GHC
 import Distribution.Simple.Program
 import Distribution.Simple.Program.HcPkg
 import Distribution.Simple.Setup (ConfigFlags(configStripLibs), fromFlag, toFlag)
-import Distribution.Simple.Utils (defaultPackageDesc, writeFileAtomic, toUTF8)
+import Distribution.Simple.Utils (defaultPackageDesc, writeFileAtomic,
+                                  toUTF8LBS)
 import Distribution.Simple.Build (writeAutogenFiles)
 import Distribution.Simple.Register
 import Distribution.Text
@@ -26,7 +27,6 @@ import qualified Distribution.Simple.PackageIndex as PackageIndex
 
 import Control.Exception (bracket)
 import Control.Monad
-import qualified Data.ByteString.Lazy.Char8 as BS
 import Data.List
 import Data.Maybe
 import System.IO
@@ -307,7 +307,8 @@ generate directory distdir config_args
                                  Installed.haddockHTMLs = []
                              }
                  content = Installed.showInstalledPackageInfo final_ipi ++ "\n"
-             writeFileAtomic (distdir </> "inplace-pkg-config") (BS.pack $ toUTF8 content)
+             writeFileAtomic (distdir </> "inplace-pkg-config")
+                             (toUTF8LBS content)
 
       let
           comp = compiler lbi
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal
index 2c20432b5f..7f413b6fc8 100644
--- a/utils/ghc-cabal/ghc-cabal.cabal
+++ b/utils/ghc-cabal/ghc-cabal.cabal
@@ -21,7 +21,7 @@ Executable ghc-cabal
 
     Build-Depends: base       >= 3   && < 5,
                    bytestring >= 0.10 && < 0.11,
-                   Cabal      >= 2.0 && < 2.1,
+                   Cabal      >= 2.1 && < 2.2,
                    directory  >= 1.1 && < 1.4,
                    filepath   >= 1.2 && < 1.5
 
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
index 9074acfd4c..6420dd4f16 100644
--- a/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
@@ -44,7 +44,7 @@ import Distribution.Backpack
 import Distribution.Types.UnqualComponentName
 import Distribution.Types.MungedPackageName
 import Distribution.Types.MungedPackageId
-import Distribution.Simple.Utils (fromUTF8, toUTF8, writeUTF8File, readUTF8File)
+import Distribution.Simple.Utils (fromUTF8BS, toUTF8BS, writeUTF8File, readUTF8File)
 import qualified Data.Version as Version
 import System.FilePath as FilePath
 import qualified System.FilePath.Posix as FilePath.Posix
@@ -75,8 +75,6 @@ import qualified Data.Traversable as F
 import qualified Data.Set as Set
 import qualified Data.Map as Map
 
-import qualified Data.ByteString.Char8 as BS
-
 #if defined(mingw32_HOST_OS)
 -- mingw32 needs these for getExecDir
 import Foreign
@@ -1286,8 +1284,8 @@ instance GhcPkg.BinaryStringRep ModuleName where
   toStringRep   = toStringRep . display
 
 instance GhcPkg.BinaryStringRep String where
-  fromStringRep = fromUTF8 . BS.unpack
-  toStringRep   = BS.pack . toUTF8
+  fromStringRep = fromUTF8BS
+  toStringRep   = toUTF8BS
 
 instance GhcPkg.BinaryStringRep UnitId where
   fromStringRep = mkUnitId . fromStringRep
diff --git a/utils/ghctags/ghctags.cabal b/utils/ghctags/ghctags.cabal
index 1bb658882c..0e2bc5252e 100644
--- a/utils/ghctags/ghctags.cabal
+++ b/utils/ghctags/ghctags.cabal
@@ -18,6 +18,6 @@ Executable ghctags
 
     Build-Depends: base       >= 4   && < 5,
                    containers,
-                   Cabal      >= 2.0 && <2.1,
+                   Cabal      >= 2.1 && <2.2,
                    ghc