diff options
| author | Tamar Christina <tamar@zhox.com> | 2017-11-08 01:21:16 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-11-09 17:49:22 -0500 |
| commit | bdd2d2862e248948efafa8ba4219e94825ddf21a (patch) | |
| tree | ca7cbf97d125ed2d4900ef4e4a10181487010c67 /utils/ghc-pkg | |
| parent | 10ff3e3180d1e808dbcff0f92afc5a3b3a8d4e83 (diff) | |
| download | haskell-bdd2d2862e248948efafa8ba4219e94825ddf21a.tar.gz | |
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
Diffstat (limited to 'utils/ghc-pkg')
| -rw-r--r-- | utils/ghc-pkg/Main.hs | 8 |
1 files changed, 3 insertions, 5 deletions
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 |