Merge branch 'ghc-821'

ppaml-op3 · Jul 23, 2017 · 5fc6eb1 · 5fc6eb1
2 parents 6392cd7 + de653cc
commit 5fc6eb1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,9 @@ matrix:
     - env: OLDCABAL=no CABALVER=1.24 GHCVER=8.0.1 ALLOWNEWER=--allow-newer
       compiler: ": #GHC 8.0.1"
       addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
+    - env: OLDCABAL=no CABALVER=1.24 GHCVER=8.2.1
+      compiler: ": #GHC 8.2.1"
+      addons: {apt: {packages: [cabal-install-1.24,ghc-8.2.1], sources: [hvr-ghc]}}
 
 before_install:
  - unset CC

diff --git a/insomnia.cabal b/insomnia.cabal
@@ -2,7 +2,7 @@
 --  see http://haskell.org/cabal/users-guide/
 
 name:                insomnia
-version:             0.0.4.1
+version:             0.0.4.2
 synopsis:            Typed probabilistic programming language
 description:         Insomnia is a typed, modular probabilistic programming language.
                      .
@@ -32,7 +32,7 @@ build-type:          Simple
 extra-source-files:
                      examples/*.ism
 cabal-version:       >=1.10
-tested-with: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1
+tested-with: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1, GHC == 8.2.1
 
 library
   exposed-modules:

diff --git a/src/Insomnia/Types.hs-boot b/src/Insomnia/Types.hs-boot
@@ -1,7 +1,10 @@
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE MultiParamTypeClasses, CPP #-}
 module Insomnia.Types where
 
+#if MIN_VERSION_base(4,7,0)
+#else
 import Data.Typeable (Typeable)
+#endif
 
 import Control.Lens (Traversal)
 
@@ -19,7 +22,10 @@ instance Show Kind
 instance Show Type
 instance Show TypePath
 
+#if MIN_VERSION_base(4,7,0)
+#else
 instance Typeable Type
+#endif
 
 instance Alpha Kind
 instance Alpha Type

diff --git a/src/Insomnia/ValueConstructor.hs-boot b/src/Insomnia/ValueConstructor.hs-boot
@@ -1,17 +1,26 @@
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE MultiParamTypeClasses,CPP #-}
 module Insomnia.ValueConstructor where
 
+#if MIN_VERSION_base(4,7,0)
+#else
 import Data.Typeable (Typeable)
+#endif
 import Unbound.Generics.LocallyNameless (Alpha)
 
 data ValueConstructor
 
 data ConstructorDef
 
 instance Show ConstructorDef
+#if MIN_VERSION_base(4,7,0)
+#else
 instance Typeable ConstructorDef
+#endif
 instance Alpha ConstructorDef
 
 instance Show ValueConstructor
+#if MIN_VERSION_base(4,7,0)
+#else
 instance Typeable ValueConstructor
+#endif
 instance Alpha ValueConstructor