Use Glob >= 0.9 and QuickCheck >= 2.10.1

basvandijk · basvandijk · commit 9c927bab4d0a · 2018-01-01T14:51:29.000+01:00
diff --git a/doc/ExampleExtractor.hs b/doc/ExampleExtractor.hs
@@ -278,9 +278,7 @@ mkRenderExampleImages renderTargets = [d|
             else VarE render `AppE` fp `AppE` sym
 
 findHaskellPaths :: FilePath -> IO [FilePath]
-findHaskellPaths srcDir = do
-  (paths, _) <- G.globDir [G.compile "**/*.hs", G.compile "**/*.hsc"] srcDir
-  pure $ concat paths
+findHaskellPaths = fmap concat . G.globDir [G.compile "**/*.hs", G.compile "**/*.hsc"]
 
 haddockToHaskell :: T.Text -> T.Text
 haddockToHaskell =
diff --git a/opencv-extra/opencv-extra.cabal b/opencv-extra/opencv-extra.cabal
@@ -129,7 +129,7 @@ test-suite doc-images-opencv-extra
       , containers        >= 0.5.6.2
       , data-default      >= 0.7.1.1
       , directory         >= 1.2.2
-      , Glob              >= 0.7.5
+      , Glob              >= 0.9
       , haskell-src-exts  >= 1.18.2
       , JuicyPixels       >= 3.2.8.1
       , linear            >= 1.20.4
diff --git a/opencv/opencv.cabal b/opencv/opencv.cabal
@@ -227,7 +227,7 @@ test-suite doc-images-opencv
       , containers        >= 0.5.6.2
       , data-default      >= 0.7.1.1
       , directory         >= 1.2.2
-      , Glob              >= 0.7.5
+      , Glob              >= 0.9
       , haskell-src-exts  >= 1.18.2
       , JuicyPixels       >= 3.2.8.1
       , linear            >= 1.20.4
@@ -262,7 +262,7 @@ test-suite test-opencv
       , lens              >= 4.13
       , linear            >= 1.20.4
       , opencv
-      , QuickCheck        >= 2.8.2
+      , QuickCheck        >= 2.10.1
       , repa              >= 3.4.0.2
       , tasty             >= 0.11.0.2
       , tasty-hunit       >= 0.9.2
diff --git a/opencv/test/test.hs b/opencv/test/test.hs
@@ -398,12 +398,6 @@ eye_m33 = V3 (V3 1 0 0) (V3 0 1 0) (V3 0 0 1)
 -- QuikcCheck Arbitrary Instances
 --------------------------------------------------------------------------------
 
-instance QC.Arbitrary CFloat where
-    arbitrary = CFloat <$> QC.arbitrary
-
-instance QC.Arbitrary CDouble where
-    arbitrary = CDouble <$> QC.arbitrary
-
 instance (QC.Arbitrary a) => QC.Arbitrary (V2 a) where
     arbitrary = V2 <$> QC.arbitrary <*> QC.arbitrary
 
