[commit: packages/binary] master: Update generics-bench to use Cabal == 1.24.* (e69378c)

git at git.haskell.org git at git.haskell.org
Sat Feb 4 21:17:29 UTC 2017


Repository : ssh://git@git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/e69378c5c809d312488cd580a60e0bb195e266c2

>---------------------------------------------------------------

commit e69378c5c809d312488cd580a60e0bb195e266c2
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Wed May 25 21:04:05 2016 +0200

    Update generics-bench to use Cabal == 1.24.*


>---------------------------------------------------------------

e69378c5c809d312488cd580a60e0bb195e266c2
 .travis.yml                      | 2 +-
 benchmarks/GenericsBenchTypes.hs | 1 +
 binary.cabal                     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2866756..cb4732b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ install:
  - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
  - cabal sandbox init
 # can't use "cabal install --only-dependencies --enable-tests --enable-benchmarks" due to dep-cycle
- - cabal install criterion deepseq mtl "QuickCheck >= 2.8" HUnit "test-framework-quickcheck2 >= 0.3" "random >= 1.0.1.0" attoparsec cereal 'Cabal == 1.22.*' tar zlib -j
+ - cabal install criterion deepseq mtl "QuickCheck >= 2.8" HUnit "test-framework-quickcheck2 >= 0.3" "random >= 1.0.1.0" attoparsec cereal 'Cabal == 1.24.*' tar zlib -j
 
 script:
  - cabal configure --enable-tests --enable-benchmarks -v2 --ghc-options=-fno-spec-constr
diff --git a/benchmarks/GenericsBenchTypes.hs b/benchmarks/GenericsBenchTypes.hs
index 65f1efa..cbedf1e 100644
--- a/benchmarks/GenericsBenchTypes.hs
+++ b/benchmarks/GenericsBenchTypes.hs
@@ -39,6 +39,7 @@ instance Binary PackageIdentifier
 instance Binary PackageName
 instance Binary RepoKind
 instance Binary RepoType
+instance Binary SetupBuildInfo
 instance Binary SourceRepo
 instance Binary TestSuite
 instance Binary TestSuiteInterface
diff --git a/binary.cabal b/binary.cabal
index a282ea0..70161c4 100644
--- a/binary.cabal
+++ b/binary.cabal
@@ -161,7 +161,7 @@ benchmark generics-bench
   build-depends:
     base >= 4.5.0.0 && < 5,
     bytestring,
-    Cabal == 1.22.*,
+    Cabal == 1.24.*,
     directory,
     filepath,
     tar,



More information about the ghc-commits mailing list