Update to latest lts-11 and nightly resolvers

- lts-11.19
- nightly-2018-07-31

Author: dbaynard

.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.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.4.3 STACK_YAML=stack-nightly.yaml
+      compiler: ": #stack 8.4.3"
+      addons: {apt: {packages: [ghc-8.4.3, 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"

doc/GUIDE.md

@@ -1,6 +1,6 @@
 #!/usr/bin/env stack
 {- stack script
-    --resolver lts-11.6
+    --resolver lts-11.19
     --package base
     --package directory
     --package filepath

etc/scripts/install-many-stack-releases.hs

@@ -1 +1 @@
-resolver: lts-11.6
+resolver: lts-11.19

etc/scripts/stack.yaml

@@ -4,6 +4,7 @@
 {-# LANGUAGE TemplateHaskell  #-}
 module Stack.ConfigSpec where
 
+import Control.Arrow
 import Data.Aeson.Extended
 import Data.Yaml
 import Path
@@ -165,7 +166,7 @@ spec = beforeAll setup $ do
     it "is parseable" $ \_ -> do
         curDir <- getCurrentDir
         let parsed :: Either String (Either String (WithJSONWarnings ConfigMonoid))
-            parsed = parseEither (parseConfigMonoid curDir) <$> decodeEither defaultConfigYaml
+            parsed = parseEither (parseConfigMonoid curDir) <$> left show (decodeEither' defaultConfigYaml)
         case parsed of
             Right (Right _) -> return () :: IO ()
             _ -> fail "Failed to parse default config yaml"

src/test/Stack/ConfigSpec.hs

@@ -51,12 +51,6 @@ addMinAndMaxBounds xs =
     (if (minBound :: a) `notElem` xs then [minBound] else []) ++
     (if (maxBound :: a) `notElem` xs && (maxBound :: a) /= minBound then maxBound : xs else xs)
 
-$(do let ns = [ ''Int64, ''Word64, ''Word8
-              ]
-         f n = [d| instance Monad m => Serial m $(conT n) where
-                      series = generate (\_ -> addMinAndMaxBounds [0, 1]) |]
-     concat <$> mapM f ns)
-
 $(do let tys = [ ''InstalledCacheInner
                -- FIXME , ''PackageCache
                -- FIXME , ''LoadedSnapshot

src/test/Stack/StoreSpec.hs

@@ -5,7 +5,7 @@ module Stack.Types.BuildPlanSpec where
 import           Data.Aeson.Extended (WithJSONWarnings(..))
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as S8
-import           Data.Yaml (decode)
+import           Data.Yaml (decodeThrow)
 import           Stack.Types.BuildPlan
 import           Test.Hspec
 
@@ -15,7 +15,7 @@ spec =
     describe "Archive" $ do
       describe "github" $ do
         let decode' :: ByteString -> Maybe (WithJSONWarnings (PackageLocation Subdirs))
-            decode' = decode
+            decode' = decodeThrow
 
         it "'github' and 'commit' keys" $ do
           let contents :: ByteString

src/test/Stack/Types/BuildPlanSpec.hs

@@ -1,4 +1,4 @@
-resolver: nightly-2018-04-25
+resolver: nightly-2018-07-31
 
 # docker:
 #   enable: true
@@ -13,14 +13,6 @@ nix:
   packages:
     - zlib
     - unzip
-extra-deps:
-- bitarray-0.0.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
-- githash-0.1.0.0@rev:0
-- hpack-0.29.0@rev:0
 
 ghc-options:
    "$locals": -fhide-source-paths

stack-nightly.yaml

@@ -1,4 +1,4 @@
-resolver: lts-11.6
+resolver: lts-11.19
 
 # docker:
 #   enable: true
@@ -17,23 +17,22 @@ flags:
     hide-dependency-versions: true
     supported-build: true
 extra-deps:
-- rio-0.1.1.0@rev:0
 - Cabal-2.2.0.1@rev:0
-- hpack-0.29.0@rev:0
+- infer-license-0.2.0@rev:0
+- hpack-0.29.5@rev:0
 - http-api-data-0.3.8.1@rev:0
-- githash-0.1.0.0@rev:0
+- githash-0.1.0.1@rev:0
 
-# Avoid https://github.com/commercialhaskell/stack/issues/3922
+# Avoid https://github.com/commercialhaskell/stack/issues/4125
 # (triggered because later versions of persistent transitively depends
 # on haskell-src-exts, which needs the 'happy' build tool)
+# THIS IS FIXED AS OF STACK 1.8, but keep these here until next major
+# version to maintain the ability to build stack with older versions.
 - persistent-2.7.1@rev:0
 - persistent-sqlite-2.6.4@rev:0
 - resourcet-1.1.11@rev:0
-- conduit-1.2.13@rev:0
+- conduit-1.2.13.1@rev:0
 - conduit-extra-1.2.3.2@rev:0
 
-# Not present until resolver lts-11.9
-- ansi-terminal-0.8.0.4
-
 ghc-options:
    "$locals": -fhide-source-paths

stack.yaml

@@ -97,8 +97,8 @@ test runghc env' currDir origStackRoot newHome newStackRoot name = it name $ wit
 
     (ClosedStream, outSrc, errSrc, sph) <- streamingProcess cp
     (out, err, ec) <- runConcurrently $ (,,)
-        <$> Concurrently (outSrc $$ sinkLbs)
-        <*> Concurrently (errSrc $$ sinkLbs)
+        <$> Concurrently (outSrc `connect` sinkLbs)
+        <*> Concurrently (errSrc `connect` sinkLbs)
         <*> Concurrently (waitForStreamingProcess sph)
     when (ec /= ExitSuccess) $ throwIO $ TestFailure out err ec
   where
@@ -120,7 +120,7 @@ instance Exception TestFailure
 
 copyTree :: (FilePath -> Bool) -> FilePath -> FilePath -> IO ()
 copyTree toCopy src dst =
-    runResourceT (sourceDirectoryDeep False src $$ CL.mapM_ go)
+    runResourceT (sourceDirectoryDeep False src `connect` CL.mapM_ go)
         `catch` \(_ :: IOException) -> return ()
   where
     go srcfp = when (toCopy srcfp) $ liftIO $ do