Merge pull request #2793 from commercialhaskell/2491-drop-data-yaml-e…

…xtra

Drop Data.Yaml.Extra #2491

src/Stack/BuildPlan.hs

@@ -66,7 +66,7 @@ import qualified Data.Text as T
 import           Data.Text.Encoding (encodeUtf8)
 import qualified Data.Traversable as Tr
 import           Data.Typeable (Typeable)
-import           Data.Yaml.Extra (decodeEither', decodeFileEither)
+import           Data.Yaml (decodeEither', decodeFileEither)
 import qualified Distribution.Package as C
 import           Distribution.PackageDescription (GenericPackageDescription,
                                                   flagDefault, flagManual,

src/Stack/Config.hs

@@ -64,7 +64,7 @@ import           Data.Maybe
 import           Data.Monoid.Extra
 import qualified Data.Text as T
 import           Data.Text.Encoding (encodeUtf8, decodeUtf8)
-import qualified Data.Yaml.Extra as Yaml
+import qualified Data.Yaml as Yaml
 import           Distribution.System (OS (..), Platform (..), buildPlatform)
 import qualified Distribution.Text
 import           Distribution.Version (simplifyVersionRange)

src/Stack/ConfigCmd.hs

@@ -23,7 +23,7 @@ import qualified Data.HashMap.Strict as HMap
 import           Data.Monoid
 import           Data.Text (Text)
 import qualified Data.Text as T
-import qualified Data.Yaml.Extra as Yaml
+import qualified Data.Yaml as Yaml
 import qualified Options.Applicative as OA
 import qualified Options.Applicative.Types as OA
 import           Path

src/Stack/Solver.hs

@@ -54,7 +54,7 @@ import           Data.Text.Extra (stripCR)
 import qualified Data.Text.Lazy as LT
 import           Data.Text.Lazy.Encoding (decodeUtf8With)
 import           Data.Tuple (swap)
-import qualified Data.Yaml.Extra as Yaml
+import qualified Data.Yaml as Yaml
 import qualified Distribution.Package as C
 import qualified Distribution.PackageDescription as C
 import qualified Distribution.Text as C

stack-7.8.yaml

@@ -76,6 +76,7 @@ extra-deps:
 - text-metrics-0.1.0
 - pid1-0.1.0.0
 - file-embed-0.0.10
+- yaml-0.8.20
 flags:
   time-locale-compat:
     old-locale: false

stack-8.0.yaml

@@ -1,4 +1,4 @@
-resolver: lts-7.0
+resolver: lts-7.9
 image:
   containers:
     - base: "fpco/stack-base" # see ./etc/docker/stack-base/Dockerfile

stack.cabal

@@ -68,7 +68,6 @@ library
                      Data.Monoid.Extra
                      Data.Store.VersionTagged
                      Data.Text.Extra
-                     Data.Yaml.Extra
                      Distribution.Version.Extra
                      Network.HTTP.Download
                      Network.HTTP.Download.Verified
@@ -257,7 +256,7 @@ library
                    , unordered-containers >= 0.2.5.1
                    , vector >= 0.10.12.3 && < 0.12
                    , vector-binary-instances
-                   , yaml >= 0.8.10.1
+                   , yaml >= 0.8.20
                    , zlib >= 0.5.4.2 && < 0.7
                    , deepseq >= 1.4
                    , hastache

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-6.14
+resolver: lts-6.25
 # docker:
 #   enable: true
 #   repo: fpco/stack-full