Skip to content

Commit

Permalink
stack-nightly: bump to GHC 8.4.2 and newer fsnotify
Browse files Browse the repository at this point in the history
  • Loading branch information
borsboom committed Apr 23, 2018
1 parent 4c04fcf commit 783158f
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
13 changes: 3 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ matrix:
compiler: ": #stack 8.2.2"
addons: {apt: {packages: [ghc-8.2.2, alex-3.1.7, happy-1.19.5], sources: [hvr-ghc]}}

- env: BUILD=stack GHCVER=8.4.1 STACK_YAML=stack-nightly.yaml
compiler: ": #stack 8.4.1"
addons: {apt: {packages: [ghc-8.4.1, alex-3.1.7, happy-1.19.5], sources: [hvr-ghc]}}
- env: BUILD=stack GHCVER=8.4.2 STACK_YAML=stack-nightly.yaml
compiler: ": #stack 8.4.2"
addons: {apt: {packages: [ghc-8.4.2, alex-3.1.7, happy-1.19.5], sources: [hvr-ghc]}}

- env: BUILD=stack GHCVER=8.2.2 STACK_YAML=stack.yaml
compiler: ": #stack 8.2.2 osx"
Expand All @@ -48,12 +48,6 @@ matrix:
compiler: ": #stack 8.2.2 osx"
os: osx

## Expected to fail because fsnotify depends on a version of hinotify
## that doesn't support GHC 8.4
- env: BUILD=stack GHCVER=8.4.1 STACK_YAML=stack-nightly.yaml
compiler: ": #stack 8.4.1"
addons: {apt: {packages: [ghc-8.4.1, alex-3.1.7, happy-1.19.5], sources: [hvr-ghc]}}

# Note: the distinction between `before_install` and `install` is not important.
# - in before_install we install build tools
# - in install we install (haskell) dependencies
Expand Down Expand Up @@ -119,7 +113,6 @@ install:
script:
- GHC_OPTIONS="-Werror"
- if [ $GHCVER = 8.2.2 ]; then GHC_OPTIONS="$GHC_OPTIONS -Wno-missing-home-modules"; fi
- |
set -ex
case "$BUILD" in
Expand Down
13 changes: 11 additions & 2 deletions package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ library:
verbatim:
# TODO: replace with 'generated-exposed-modules' after stack-1.7 is released.
# Using 'verbatim' to support older hpack version.
autogen-modules: Paths_stack
autogen-modules: |
Paths_stack
exposed-modules:
- Control.Concurrent.Execute
- Data.Aeson.Extended
Expand Down Expand Up @@ -272,7 +273,15 @@ executables:
stack:
main: Main.hs
source-dirs: src/main
generated-other-modules: Build_stack
verbatim:
# TODO: replace with 'generated-other-modules' after stack-1.7 is released.
# Using 'verbatim' to support older hpack version.
autogen-modules: |
Build_stack,
Paths_stack
other-modules:
- Build_stack
- Paths_stack
ghc-options:
- -threaded
- -rtsopts
Expand Down
4 changes: 2 additions & 2 deletions stack-nightly.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: nightly-2018-04-20
resolver: nightly-2018-04-23

# docker:
# enable: true
Expand All @@ -15,7 +15,7 @@ nix:
- unzip
extra-deps:
- bitarray-0.0.1.1
- fsnotify-0.2.1.1
- fsnotify-0.2.1.2
- project-template-0.2.0.1
- regex-applicative-text-0.1.0.1
- unicode-transforms-0.3.4

0 comments on commit 783158f

Please sign in to comment.