aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJulien Tanguy <julien.tanguy@jhome.fr>2015-05-06 11:52:59 +0200
committerJulien Tanguy <julien.tanguy@jhome.fr>2015-05-06 11:53:06 +0200
commitc1e083c0be9f3791fa5527533a33eef63ebef497 (patch)
treeca66d529ba4822a0a14293ce441d93a5af78bdad
parentd41449d7b93adcfd7ffd5c21c355d9ed381cf3ff (diff)
downloadhmacaroons-c1e083c0be9f3791fa5527533a33eef63ebef497.tar.gz
hmacaroons-c1e083c0be9f3791fa5527533a33eef63ebef497.tar.zst
hmacaroons-c1e083c0be9f3791fa5527533a33eef63ebef497.zip
Fix build and add travis badge
-rw-r--r--.travis.yml2
-rw-r--r--README.md2
-rw-r--r--hmacaroons.cabal2
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index a4d9702..621b275 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ script:
35 # (including tests/benchmarks) 35 # (including tests/benchmarks)
36 - cabal build 36 - cabal build
37 37
38 - cabal test 38 - cabal test --show-details=streaming
39 - cabal check 39 - cabal check
40 40
41 # tests that a source-distribution can be generated 41 # tests that a source-distribution can be generated
diff --git a/README.md b/README.md
index ea1a1e6..452b90a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
1Macaroons: Pure haskell implementation of macaroons 1Macaroons: Pure haskell implementation of macaroons [![Build Status](https://travis-ci.org/jtanguy/hmacaroons.svg?branch=master)](https://travis-ci.org/jtanguy/hmacaroons)
2=================================================== 2===================================================
3 3
4Macaroons is a pure haskell implementation of macaroons. It aims to provide 4Macaroons is a pure haskell implementation of macaroons. It aims to provide
diff --git a/hmacaroons.cabal b/hmacaroons.cabal
index 41020ca..a2878f2 100644
--- a/hmacaroons.cabal
+++ b/hmacaroons.cabal
@@ -94,7 +94,7 @@ benchmark bench
94 byteable >= 0.1 && <0.2, 94 byteable >= 0.1 && <0.2,
95 cereal >= 0.4, 95 cereal >= 0.4,
96 cryptohash >=0.11 && <0.12, 96 cryptohash >=0.11 && <0.12,
97-- cipher-aes >=0.2 && <0.3, 97 cipher-aes >=0.2 && <0.3,
98 hex >= 0.1, 98 hex >= 0.1,
99 deepseq >= 1.1, 99 deepseq >= 1.1,
100 criterion >= 1.1 100 criterion >= 1.1