git.iko.soy/typeable/req
on master help sign in
Fix Cabal build (#5)

* We don't need ‘libflac-dev’ here * Use ‘cabal-install-1.24’ for all GHC versions * Allow ‘time-1.7’

commit5e9370781720d5619a06dbe04787ad0d22a7691b authorMark Karpov <markkarpov@opmbx.org> dateFri 6 Jan 2017, 04:55 (10 years ago) parentf3e79fc
2 files changed+9−12
compare with master
unifiedsplit
.travis.yml+7−10 req.cabal+2−2
.travis.yml+7−10
@@ -4,14 +4,14 @@ sudo: false
44
55matrix:
66 include:
7− - env: CABALVER=1.18 GHCVER=7.8.4
8− addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,libflac-dev], sources: [hvr-ghc]}}
9− - env: CABALVER=1.22 GHCVER=7.10.3
10− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,libflac-dev],sources: [hvr-ghc]}}
7+ - env: CABALVER=1.24 GHCVER=7.8.4
8+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.8.4], sources: [hvr-ghc]}}
9+ - env: CABALVER=1.24 GHCVER=7.10.3
10+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.10.3],sources: [hvr-ghc]}}
1111 - env: CABALVER=1.24 GHCVER=8.0.1
12− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1,libflac-dev],sources: [hvr-ghc]}}
12+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1],sources: [hvr-ghc]}}
1313 - env: CABALVER=head GHCVER=head
14− addons: {apt: {packages: [cabal-install-head,ghc-head,libflac-dev], sources: [hvr-ghc]}}
14+ addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
1515
1616 allow_failures:
1717 - env: CABALVER=head GHCVER=head
@@ -26,10 +26,7 @@ install:
2626 - cabal install --only-dependencies --enable-tests
2727
2828script:
29− - case "$CABALVER" in
30− "1.18") cabal configure --enable-tests --enable-library-coverage -v2 -f dev ;;
31− *) cabal configure --enable-tests --enable-coverage -v2 -f dev ;;
32− esac
29+ - cabal configure --enable-tests --enable-coverage -v2 -f dev
3330 - cabal build
3431 - cabal test --show-details=always
3532 - cabal sdist
req.cabal+2−2
@@ -71,7 +71,7 @@ library
7171 , http-types >= 0.8 && < 10.0
7272 , mtl >= 2.0 && < 3.0
7373 , text >= 0.2 && < 1.3
74− , time >= 1.2 && < 1.7
74+ , time >= 1.2 && < 1.8
7575 , transformers >= 0.4 && < 0.6
7676 if !impl(ghc >= 8.0)
7777 build-depends: semigroups == 0.18.*
@@ -100,7 +100,7 @@ test-suite pure-tests
100100 , mtl >= 2.0 && < 3.0
101101 , req >= 0.1.0
102102 , text >= 0.2 && < 1.3
103− , time >= 1.2 && < 1.7
103+ , time >= 1.2 && < 1.8
104104 if flag(dev)
105105 ghc-options: -Wall -Werror
106106 else