Skip to content

Commit

Permalink
Merge pull request #208 from gelisam/issue-195
Browse files Browse the repository at this point in the history
fix #195
  • Loading branch information
gelisam authored Dec 3, 2018
2 parents 489a1e7 + 9e484c1 commit 7213655
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ env:
# if this build fails and you need to bump the lts, remember
# to also bump the lower bounds in package.yaml to match the
# versions provided by that new lts!
- BUILD=stack RESOLVER="lts-7.0"
- BUILD=stack RESOLVER="lts-8.0"

- BUILD=stack RESOLVER="lts-12.19"
- BUILD=cabal RESOLVER="lts-12.19"
Expand Down
6 changes: 6 additions & 0 deletions bump-lower-bounds.vim
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
"for future reference, here is a vim macro which, when the cursos is on a line like
"
" - haskell-src-exts >= 1.0
"
"will update the lower bound to match the version used by the current lts.
0dwdwEld$A '^isa€kbtack ls dependencies --test | grep '^V:!bashWi>= 0i - j
Expand Down
35 changes: 17 additions & 18 deletions package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ extra-source-files:

ghc-options: -Wall
dependencies:
- base >= 4.9.0.0
- base >= 4.9.1.0
- bytestring >= 0.10.8.1
- containers >= 0.5.7.1
- stringsearch >= 0.3.6.6
Expand All @@ -30,47 +30,46 @@ executables:
hawk:
main: Main.hs
dependencies:
- directory >= 1.2.6.2
- directory >= 1.3.0.0
- exceptions >= 0.8.3
- extra >= 1.4.10
- extra >= 1.5.1
- filelock >= 0.1.0.1
- filepath >= 1.4.1.0
- filepath >= 1.4.1.1
- haskell-awk
- haskell-src-exts >= 1.20.3
- haskell-src-exts >= 1.18.2
- hint >= 0.6.0
- mtl >= 2.2.1
- network >= 2.6.3.1
- process >= 1.4.2.0
- template-haskell >= 2.11.0.0
- process >= 1.4.3.0
- template-haskell >= 2.11.1.0
- time >= 1.6.0.1
- transformers >= 0.5.2.0
source-dirs: src

# TODO: set the lower bounds to the lts-7.0 versions
tests:
reference:
source-dirs:
- src
- tests
main: RunTests.hs
dependencies:
- aeson >= 0.11.2.1
- directory >= 1.2.6.2
- doctest >= 0.11.0
- aeson >= 1.0.2.1
- directory >= 1.3.0.0
- doctest >= 0.11.1
- easy-file >= 0.2.1
- exceptions >= 0.8.3
- extra >= 1.4.10
- extra >= 1.5.1
- filelock >= 0.1.0.1
- filepath >= 1.4.1.0
- filepath >= 1.4.1.1
- haskell-awk
- haskell-src-exts >= 1.20.3
- haskell-src-exts >= 1.18.2
- hint >= 0.6.0
- hspec >= 2.2.3
- HUnit >= 1.3.1.2
- hspec >= 2.4.1
- HUnit >= 1.5.0.0
- mtl >= 2.2.1
- network >= 2.6.3.1
- process >= 1.4.2.0
- template-haskell >= 2.11.0.0
- process >= 1.4.3.0
- template-haskell >= 2.11.1.0
- temporary >= 1.2.0.4
- test-framework >= 0.8.1.1
- test-framework-hunit >= 0.3.0.2
Expand Down
5 changes: 2 additions & 3 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resolver: lts-12.19
resolver: lts-8.0
packages:
- .
extra-deps:
- haskell-src-exts-1.20.3
extra-deps: []

0 comments on commit 7213655

Please sign in to comment.