Bump version to 8.5 ghc-8.5-start
authorBen Gamari <ben@smart-cactus.org>
Wed, 29 Nov 2017 14:54:14 +0000 (09:54 -0500)
committerBen Gamari <ben@smart-cactus.org>
Mon, 4 Dec 2017 21:37:18 +0000 (16:37 -0500)
The ghc-8.4 branch has now been cut. Updates the haddock submodule.

configure.ac
iserv/iserv-bin.cabal
libraries/template-haskell/template-haskell.cabal
utils/haddock

index d67e5bd..6733385 100644 (file)
@@ -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}
index 846a111..a713e6f 100644 (file)
@@ -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,
index 887865d..7770a38 100644 (file)
@@ -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
index ae0d140..aaf0733 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ae0d140334fff57f2737dbd7c5804b4868d9c3ab
+Subproject commit aaf07338cbfec7df69532a4d1e8a0f21c9a1cfde