stack-nightly: bump to GHC 8.4.2 and newer fsnotify

Author: borsboom

.travis.yml

@@ -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"
@@ -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
@@ -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

package.yaml

@@ -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
@@ -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

stack-nightly.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2018-04-20
+resolver: nightly-2018-04-23
 
 # docker:
 #   enable: true
@@ -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