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-cabal | |
| 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-cabal')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 7 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc-cabal.cabal | 2 |
2 files changed, 5 insertions, 4 deletions
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 |