diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-11-29 09:54:14 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-12-04 16:37:18 -0500 |
| commit | d6fccfb2ba087abfdd4a68b13165e1312f9af022 (patch) | |
| tree | 64aa7fd3cda7314c166c154f906253dbfb7ca36c | |
| parent | 595f60fd55cc0305883c8a0b382a4b9718a0e0d8 (diff) | |
| download | haskell-d6fccfb2ba087abfdd4a68b13165e1312f9af022.tar.gz | |
Bump version to 8.5ghc-8.5-start
The ghc-8.4 branch has now been cut. Updates the haddock submodule.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | iserv/iserv-bin.cabal | 6 | ||||
| -rw-r--r-- | libraries/template-haskell/template-haskell.cabal | 2 | ||||
| m--------- | utils/haddock | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index d67e5bd9a6..6733385b2b 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ dnl # see what flags are available. (Better yet, read the documentation!) # -AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.3], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION]) +AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.5], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION]) # Set this to YES for a released version, otherwise NO : ${RELEASE=NO} diff --git a/iserv/iserv-bin.cabal b/iserv/iserv-bin.cabal index 846a111fd1..a713e6fbdb 100644 --- a/iserv/iserv-bin.cabal +++ b/iserv/iserv-bin.cabal @@ -85,7 +85,7 @@ Library bytestring >= 0.10 && < 0.11, containers >= 0.5 && < 0.6, deepseq >= 1.4 && < 1.5, - ghci == 8.3, + ghci == 8.5, network >= 2.6 && < 2.7, directory >= 1.3 && < 1.4, filepath >= 1.4 && < 1.5 @@ -112,7 +112,7 @@ Executable iserv bytestring >= 0.10 && < 0.11, containers >= 0.5 && < 0.6, deepseq >= 1.4 && < 1.5, - ghci == 8.3 + ghci == 8.5 if os(windows) Cpp-Options: -DWINDOWS @@ -133,7 +133,7 @@ Executable iserv-proxy bytestring >= 0.10 && < 0.11, containers >= 0.5 && < 0.6, deepseq >= 1.4 && < 1.5, - ghci == 8.3, + ghci == 8.5, directory >= 1.3 && < 1.4, network >= 2.6, filepath >= 1.4 && < 1.5, diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal index 887865d35e..7770a38405 100644 --- a/libraries/template-haskell/template-haskell.cabal +++ b/libraries/template-haskell/template-haskell.cabal @@ -52,7 +52,7 @@ Library build-depends: base >= 4.9 && < 4.12, - ghc-boot-th == 8.3, + ghc-boot-th == 8.5, pretty == 1.1.* ghc-options: -Wall diff --git a/utils/haddock b/utils/haddock -Subproject ae0d140334fff57f2737dbd7c5804b4868d9c3a +Subproject aaf07338cbfec7df69532a4d1e8a0f21c9a1cfd |