Merge branch 'master' of https://github.com/commercialhaskell/stack

Author: mpilgrem

src/test/Stack/ConfigSpec.hs

@@ -24,12 +24,12 @@ import Test.Hspec
 
 sampleConfig :: String
 sampleConfig =
-  "resolver: lts-2.10\n" ++
+  "resolver: lts-19.22\n" ++
   "packages: ['.']\n"
 
 buildOptsConfig :: String
 buildOptsConfig =
-  "resolver: lts-2.10\n" ++
+  "resolver: lts-19.22\n" ++
   "packages: ['.']\n" ++
   "build:\n" ++
   "  library-profiling: true\n" ++
@@ -56,24 +56,24 @@ buildOptsConfig =
 
 hpackConfig :: String
 hpackConfig =
-  "resolver: lts-2.10\n" ++
+  "resolver: lts-19.22\n" ++
   "with-hpack: /usr/local/bin/hpack\n" ++
   "packages: ['.']\n"
 
 resolverConfig :: String
 resolverConfig =
-  "resolver: lts-2.10\n" ++
+  "resolver: lts-19.22\n" ++
   "packages: ['.']\n"
 
 snapshotConfig :: String
 snapshotConfig =
-  "snapshot: lts-2.10\n" ++
+  "snapshot: lts-19.22\n" ++
   "packages: ['.']\n"
 
 resolverSnapshotConfig :: String
 resolverSnapshotConfig =
-  "resolver: lts-2.10\n" ++
-  "snapshot: lts-2.10\n" ++
+  "resolver: lts-19.22\n" ++
+  "snapshot: lts-19.22\n" ++
   "packages: ['.']\n"
 
 stackDotYaml :: Path Rel File
@@ -123,11 +123,11 @@ spec = beforeAll setup $ do
 
     it "parses snapshot using 'resolver'" $ inTempDir $ do
       loadProject resolverConfig $ \Project{..} ->
-        projectResolver `shouldBe` RSLSynonym (LTS 2 10)
+        projectResolver `shouldBe` RSLSynonym (LTS 19 22)
 
     it "parses snapshot using 'snapshot'" $ inTempDir $ do
       loadProject snapshotConfig $ \Project{..} ->
-        projectResolver `shouldBe` RSLSynonym (LTS 2 10)
+        projectResolver `shouldBe` RSLSynonym (LTS 19 22)
 
     it "throws if both 'resolver' and 'snapshot' are present" $ inTempDir $ do
       loadProject resolverSnapshotConfig (const (return ()))
@@ -213,7 +213,7 @@ spec = beforeAll setup $ do
             yamlAbs = parentDir </> yamlRel
             packageYaml = childRel </> either impureThrow id (parseRelFile "package.yaml")
         createDirectoryIfMissing True $ toFilePath $ parent yamlAbs
-        writeFile (toFilePath yamlAbs) "resolver: ghc-7.8"
+        writeFile (toFilePath yamlAbs) "resolver: ghc-9.0"
         writeFile (toFilePath packageYaml) "name: foo"
         withEnvVar "STACK_YAML" (toFilePath yamlRel) $ loadConfig' $ \config -> liftIO $ do
             BuildConfig{..} <- runRIO config $ withBuildConfig ask

src/test/Stack/NixSpec.hs

@@ -23,7 +23,7 @@ import Test.Hspec
 
 sampleConfigNixEnabled :: String
 sampleConfigNixEnabled =
-  "resolver: lts-2.10\n" ++
+  "resolver: lts-19.22\n" ++
   "packages: ['.']\n" ++
   "system-ghc: true\n" ++
   "nix:\n" ++
@@ -32,7 +32,7 @@ sampleConfigNixEnabled =
 
 sampleConfigNixDisabled :: String
 sampleConfigNixDisabled =
-  "resolver: lts-2.10\n" ++
+  "resolver: lts-19.22\n" ++
   "packages: ['.']\n" ++
   "nix:\n" ++
   "   enable: False"
@@ -101,6 +101,6 @@ spec = beforeAll setup $ do
           nixEnable (configNix config) `shouldBe` trueOnNonWindows
       it "sees that the only package asked for is glpk and asks for the correct GHC derivation" $ loadConfig' mempty $ \config -> do
         nixPackages (configNix config) `shouldBe` ["glpk"]
-        v <- parseVersionThrowing "7.10.3"
+        v <- parseVersionThrowing "9.0.2"
         ghc <- either throwIO return $ nixCompiler (WCGhc v)
-        ghc `shouldBe` "haskell.compiler.ghc7103"
+        ghc `shouldBe` "haskell.compiler.ghc902"