Skip to content

Commit

Permalink
Merge pull request #837 from agrafix/master
Browse files Browse the repository at this point in the history
build the ignore library w/o pcre support
  • Loading branch information
borsboom committed Aug 23, 2015
2 parents 53892f8 + 18cf75e commit 42cf39b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ install:
- cabal --version
- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
- travis_retry cabal update
- cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0
- cabal install --only-dependencies --constraint="ignore +without-pcre" --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0

script:
- if [ -f configure.ac ]; then autoreconf -i; fi
Expand All @@ -69,4 +69,3 @@ script:
# `cabal install --force-reinstalls dist/*-*.tar.gz`
- SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
(cd dist && cabal install --force-reinstalls "$SRC_TGZ")

2 changes: 1 addition & 1 deletion stack.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ library
, http-client-tls >= 0.2.2
, http-conduit >= 2.1.7
, http-types >= 0.8.6
, ignore >= 0.1
, ignore >= 0.1.1
, lifted-base
, monad-control
, monad-logger >= 0.3.13.1
Expand Down
5 changes: 4 additions & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
resolver: lts-3.0
extra-deps:
- ignore-0.1.0.0
- ignore-0.1.1.0
flags:
ignore:
without-pcre: true
image:
container:
base: "fpco/ubuntu-with-libgmp:14.04"
Expand Down

0 comments on commit 42cf39b

Please sign in to comment.