feat(yesod): Use data-default 0.8

stack.yaml

@@ -15,4 +15,6 @@ packages:
 - ./yesod-eventsource
 - ./yesod-websockets
 
-extra-deps: []
+extra-deps:
+- data-default-0.8.0.0
+- tls-2.1.2

stack.yaml.lock

@@ -3,7 +3,21 @@
 # For more information, please see the documentation at:
 #   https://docs.haskellstack.org/en/stable/lock_files
 
-packages: []
+packages:
+- completed:
+    hackage: data-default-0.8.0.0@sha256:ba77cbe437508d5dfe4dec1e929121a92f0d6fc004c30fabb94c78172c0606dc,1016
+    pantry-tree:
+      sha256: 2ced4cb63070004ac8650e38d5544a25d941fcc8167787505468a163dd28daeb
+      size: 331
+  original:
+    hackage: data-default-0.8.0.0
+- completed:
+    hackage: tls-2.1.2@sha256:ffff03e998d8aa56be4984885d6e79c066cea9cbff6f816e0050e66bb482eef9,6113
+    pantry-tree:
+      sha256: f5c9da885261c7575f9658e56b4c74eb7158e1748ad6fd9db5c787d59e459dd1
+      size: 6452
+  original:
+    hackage: tls-2.1.2
 snapshots:
 - completed:
     sha256: 889b6bffaf21cd509a7c6017703281e77c2f6df0a0908a11c85fa97fcbf11d4e

yesod/ChangeLog.md

@@ -1,5 +1,9 @@
 # ChangeLog for yesod
 
+## 1.6.2.4
+
+* Support `data-default` 0.8 [#1936](https://github.com/yesodweb/yesod/pull/1936)
+
 ## 1.6.2.3
 
 * Support `yesod-core` 1.7

yesod/Yesod/Default/Util.hs

@@ -32,7 +32,11 @@ import Text.Julius (juliusFile, juliusFileReload)
 import Text.Cassius (cassiusFile, cassiusFileReload)
 import Text.Hamlet (HamletSettings, defaultHamletSettings)
 import Data.Maybe (catMaybes)
+#ifdef DataDefault
+import Data.Default (Default (def))
+#else
 import Data.Default.Class (Default (def))
+#endif
 
 -- | An implementation of 'addStaticContent' which stores the contents in an
 -- external file. Files are created in the given static folder with names based

yesod/yesod.cabal

@@ -1,5 +1,5 @@
 name:            yesod
-version:         1.6.2.3
+version:         1.6.2.4
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -13,6 +13,11 @@ build-type:      Simple
 homepage:        http://www.yesodweb.com/
 extra-source-files: README.md ChangeLog.md
 
+flag data-default
+  description: Use data-default 0.8 which includes data-default-class
+  default : False
+  manual : False
+
 library
     default-language: Haskell2010
     if os(windows)
@@ -22,7 +27,6 @@ library
                    , aeson
                    , bytestring
                    , conduit                   >= 1.3
-                   , data-default-class
                    , directory
                    , fast-logger
                    , file-embed                >= 0.0.10
@@ -49,6 +53,15 @@ library
                    , Yesod.Default.Handlers
     ghc-options:     -Wall
 
+    if flag(data-default)
+         build-depends:   data-default              >= 0.8.0.0
+                        -- transitive dependency on tls since earlier versions don't restrict data-default 0.8
+                        , tls                       >= 2.1.2
+                        , wai-extra                 >= 3.1.16
+         cpp-options: -DDataDefault
+    else
+         build-depends:   data-default-class
+
     if !os(windows)
          build-depends: unix