GHC-8.0.1 compatability fixes (#36)

* Support for QuickCheck-2.9

As requested by commercialhaskell/stackage#1691

* Test with 8.0.1 on Travis-CI

* Remove redundant constraints

* Make `cabal check` happy

Author: ivan-m

.travis.yml

@@ -32,6 +32,9 @@ matrix:
     - env: CABALVER=1.22 GHCVER=7.10.2
       compiler: ": #GHC 7.10.2"
       addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2], sources: [hvr-ghc]}}
+    - env: CABALVER=1.24 GHCVER=8.0.1
+      compiler: ": #GHC 8.0.1"
+      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
     - env: CABALVER=head GHCVER=head
       compiler: ": #GHC head"
       addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}

Data/Graph/Inductive/NodeMap.hs

@@ -223,16 +223,16 @@ liftM1' f c =
        return r
 
 -- | Monadic node construction.
-mkNodeM :: (Ord a, DynGraph g) => a -> NodeMapM a b g (LNode a)
+mkNodeM :: (Ord a) => a -> NodeMapM a b g (LNode a)
 mkNodeM = liftN2 mkNode
 
-mkNodesM :: (Ord a, DynGraph g) => [a] -> NodeMapM a b g [LNode a]
+mkNodesM :: (Ord a) => [a] -> NodeMapM a b g [LNode a]
 mkNodesM = liftN2 mkNodes
 
-mkEdgeM :: (Ord a, DynGraph g) => (a, a, b) -> NodeMapM a b g (Maybe (LEdge b))
+mkEdgeM :: (Ord a) => (a, a, b) -> NodeMapM a b g (Maybe (LEdge b))
 mkEdgeM = liftN2' mkEdge
 
-mkEdgesM :: (Ord a, DynGraph g) => [(a, a, b)] -> NodeMapM a b g (Maybe [LEdge b])
+mkEdgesM :: (Ord a) => [(a, a, b)] -> NodeMapM a b g (Maybe [LEdge b])
 mkEdgesM = liftN2' mkEdges
 
 insMapNodeM :: (Ord a, DynGraph g) => a -> NodeMapM a b g (LNode a)

Data/Graph/Inductive/Query/GVD.hs

@@ -50,7 +50,7 @@ maybePath v = listToMaybe . filter ((v==) . fst . head . unLPath)
 
 -- | Try to determine the nearest root node to the one specified in the
 --   shortest path forest.
-nearestNode :: (Real b) => Node -> Voronoi b -> Maybe Node
+nearestNode :: Node -> Voronoi b -> Maybe Node
 nearestNode v = fmap (fst . last . unLPath) . maybePath v
 
 -- | The distance to the 'nearestNode' (if there is one) in the

fgl-arbitrary/fgl-arbitrary.cabal

@@ -29,14 +29,12 @@ library
   -- other-extensions:
   build-depends:       base < 5
                      , fgl >= 5.5.2.0 && < 6
-                     , QuickCheck >= 2.3 && < 2.9
+                     , QuickCheck >= 2.3 && < 2.10
   -- hs-source-dirs:
   default-language:    Haskell2010
 
   ghc-options:         -Wall
 
-  ghc-prof-options:    -prof -auto
-
 test-suite fgl-arbitrary-tests
     default-language: Haskell2010
 
@@ -45,7 +43,7 @@ test-suite fgl-arbitrary-tests
     build-depends:    fgl-arbitrary
                     , fgl
                     , base
-                    , QuickCheck >= 2.3 && < 2.9
+                    , QuickCheck >= 2.3 && < 2.10
                     , hspec >= 2.1 && < 2.3
                     , containers
 
@@ -54,5 +52,3 @@ test-suite fgl-arbitrary-tests
     main-is:          TestSuite.hs
 
     ghc-options:      -Wall
-
-    ghc-prof-options: -prof -auto

fgl.cabal

@@ -18,7 +18,7 @@ extra-source-files:
                ChangeLog
 
 tested-with:   GHC == 7.0.4, GHC == 7.2.2, GHC == 7.4.2, GHC == 7.6.3,
-               GHC == 7.8.4, GHC == 7.10.2, GHC == 7.11.*
+               GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.1.*
 
 source-repository head
     type:         git
@@ -89,7 +89,7 @@ test-suite fgl-tests {
 
     build-depends:    fgl
                     , base
-                    , QuickCheck >= 2.8 && < 2.9
+                    , QuickCheck >= 2.8 && < 2.10
                     , hspec >= 2.1 && < 2.3
                     , containers
 
@@ -105,5 +105,4 @@ test-suite fgl-tests {
 
     ghc-options:      -Wall
 
-    ghc-prof-options: -prof -auto
 }