diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-30 17:28:13 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-30 17:30:09 +0100 |
| commit | 947c8a530e2f977f56601289e1b11cde42f95322 (patch) | |
| tree | 57311affe0bf99e077924bc3fabc946a8cc2d9cf | |
| parent | 0380a95b42a5e79edbe835ea76142ae0472c7b2d (diff) | |
| download | haskell-947c8a530e2f977f56601289e1b11cde42f95322.tar.gz | |
Bump GHC HEAD's Version from 7.11 to 8.1ghc-8.1-start
This updates the haddock submodule
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | iserv/iserv-bin.cabal | 2 | ||||
| -rw-r--r-- | libraries/template-haskell/Language/Haskell/TH/Lib.hs | 2 | ||||
| -rw-r--r-- | libraries/template-haskell/template-haskell.cabal | 2 | ||||
| m--------- | utils/haddock | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index f5d624db26..0ff4769742 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], [7.11], [glasgow-haskell-bugs@haskell.org], [ghc]) +AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.1], [glasgow-haskell-bugs@haskell.org], [ghc]) # 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 c7bd8237ba..a770b4fc99 100644 --- a/iserv/iserv-bin.cabal +++ b/iserv/iserv-bin.cabal @@ -23,4 +23,4 @@ Executable iserv bytestring >= 0.10 && < 0.11, containers >= 0.5 && < 0.6, deepseq >= 1.4 && < 1.5, - ghci >= 7.11 && < 8.1 + ghci == 8.1 diff --git a/libraries/template-haskell/Language/Haskell/TH/Lib.hs b/libraries/template-haskell/Language/Haskell/TH/Lib.hs index 3d77a4a77d..0dcf81ad22 100644 --- a/libraries/template-haskell/Language/Haskell/TH/Lib.hs +++ b/libraries/template-haskell/Language/Haskell/TH/Lib.hs @@ -478,7 +478,7 @@ closedTypeFamilyD tc tvs result injectivity eqns = -- 3. remove the FamFlavour data type from Syntax module -- 4. make sure that all references to FamFlavour are gone from DsMeta, -- Convert, TcSplice (follows from 3) -#if __GLASGOW_HASKELL__ > 800 +#if __GLASGOW_HASKELL__ >= 802 #error Remove deprecated familyNoKindD, familyKindD, closedTypeFamilyNoKindD and closedTypeFamilyKindD #endif diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal index ff9fe05367..aae8afee59 100644 --- a/libraries/template-haskell/template-haskell.cabal +++ b/libraries/template-haskell/template-haskell.cabal @@ -48,7 +48,7 @@ Library build-depends: base >= 4.6 && < 4.10, - ghc-boot >= 7.11 && < 8.1, + ghc-boot == 8.1, pretty == 1.1.* -- We need to set the unit ID to template-haskell (without a diff --git a/utils/haddock b/utils/haddock -Subproject 80f2f9805b61e8cea291bae8ce22db626dc11f2 +Subproject 6ddd758be0e7b50bd19d33400b3c3013d60786c |