[commit: packages/binary] master: Fix compilation issue with criterion-1. (0508d4a)
git at git.haskell.org
git at git.haskell.org
Sun Dec 14 17:55:21 UTC 2014
Repository : ssh://git@git.haskell.org/binary
On branch : master
Link : http://git.haskell.org/packages/binary.git/commitdiff/0508d4af712ee05166dfb60a24476c68e96ec1b2
>---------------------------------------------------------------
commit 0508d4af712ee05166dfb60a24476c68e96ec1b2
Author: Lennart Kolmodin <kolmodin at google.com>
Date: Thu Sep 25 15:49:53 2014 +0400
Fix compilation issue with criterion-1.
>---------------------------------------------------------------
0508d4af712ee05166dfb60a24476c68e96ec1b2
benchmarks/Builder.hs | 1 -
benchmarks/Get.hs | 1 -
binary.cabal | 4 ++--
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/benchmarks/Builder.hs b/benchmarks/Builder.hs
index bc5eff6..08c6d46 100644
--- a/benchmarks/Builder.hs
+++ b/benchmarks/Builder.hs
@@ -9,7 +9,6 @@ module Main (main) where
import Control.DeepSeq
import Control.Exception (evaluate)
import Control.Monad.Trans (liftIO)
-import Criterion.Config
import Criterion.Main hiding (run)
import qualified Data.ByteString as S
import qualified Data.ByteString.Char8 as C
diff --git a/benchmarks/Get.hs b/benchmarks/Get.hs
index 57616c9..cb3ca51 100644
--- a/benchmarks/Get.hs
+++ b/benchmarks/Get.hs
@@ -9,7 +9,6 @@ module Main where
import Control.DeepSeq
import Control.Exception (evaluate)
import Control.Monad.Trans (liftIO)
-import Criterion.Config
import Criterion.Main hiding (run)
import qualified Data.ByteString as S
import qualified Data.ByteString.Char8 as C8
diff --git a/binary.cabal b/binary.cabal
index 9b0888c..ccce933 100644
--- a/binary.cabal
+++ b/binary.cabal
@@ -116,7 +116,7 @@ benchmark get
base >= 3.0 && < 5,
bytestring,
cereal,
- criterion,
+ criterion == 1.*,
deepseq,
mtl
-- build dependencies from using binary source rather than depending on the library
@@ -130,7 +130,7 @@ benchmark builder
build-depends:
base >= 3.0 && < 5,
bytestring,
- criterion,
+ criterion == 1.*,
deepseq,
mtl
-- build dependencies from using binary source rather than depending on the library
More information about the ghc-commits
mailing list