Skip to content

Commit

Permalink
Merge pull request #66 from himura/relax-hspec-discover-version
Browse files Browse the repository at this point in the history
Fix cabal dependency
  • Loading branch information
himura authored Oct 25, 2019
2 parents f2c6320 + 5efb1ec commit 433c4a2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 36 deletions.
25 changes: 0 additions & 25 deletions .travis/check-sdist.sh

This file was deleted.

21 changes: 10 additions & 11 deletions twitter-conduit.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ description:
extra-source-files:
.gitignore
.travis.yml
.travis/*.sh
README.md
ChangeLog.md
Warning.hs
Expand Down Expand Up @@ -122,31 +121,31 @@ test-suite spec_main
if flag(run-integrated-test)
CPP-Options: -DRUN_INTEGRATED_TEST

build-tool-depends: hspec-discover:hspec-discover >= 2.3.0 && < 2.5
build-tool-depends: hspec-discover:hspec-discover >= 2.3.0
build-depends:
base >= 4.5 && < 5
base
, aeson
, attoparsec >= 0.10
, attoparsec
, authenticate-oauth
, bytestring
, case-insensitive
, conduit
, conduit-extra >= 1.1
, conduit-extra
, containers
, data-default
, hspec
, http-client
, http-conduit
, http-types
, lens
, lens-aeson >= 1
, lens-aeson
, resourcet
, template-haskell
, text
, time
, twitter-conduit
, twitter-types >= 0.6
, twitter-types-lens >= 0.6
, twitter-types
, twitter-types-lens

if flag(network-uri)
build-depends: network-uri >= 2.6
Expand All @@ -165,6 +164,6 @@ test-suite spec_main

custom-setup
setup-depends:
base >= 4.5 && <5,
Cabal >= 1.24,
cabal-doctest >= 1 && < 1.1
base
, Cabal >= 1.24
, cabal-doctest >= 1 && < 1.1

0 comments on commit 433c4a2

Please sign in to comment.