Switched to data-default instead of data-default-class

Fixed issue with dependencies for data-default branch
yesodweb · Nov 21, 2024 · 2a0fb19 · 2a0fb19
1 parent 49e7dbe
commit 2a0fb19
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 8 deletions.
diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,5 @@
 resolver: lts-18.3
+
 packages:
 - ./yesod-core
 - ./yesod-static
@@ -19,3 +20,6 @@ extra-deps:
 - attoparsec-aeson-2.1.0.0
 - crypton-1.0.0
 - crypton-conduit-0.2.3
+- data-default-0.8.0.0@sha256:ba77cbe437508d5dfe4dec1e929121a92f0d6fc004c30fabb94c78172c0606dc,1016
+- xml-conduit-1.9.1.4@sha256:554bb02f0e236fb0c99c4c9be5ddb0893ad294decc1cff3964c900e31462fbdd,3008
+- cabal-doctest-1.0.10@sha256:ebe93d13ffa657e8fa512ecc462ccafd59c497456be4355496914a11db03cb1f,2047
diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -11,6 +11,41 @@ packages:
       size: 114
   original:
     hackage: attoparsec-aeson-2.1.0.0
+- completed:
+    hackage: crypton-1.0.0@sha256:637e58581978c84ef1288d14fa9cac1d2905ef60e319924293bc11250aca882d,14527
+    pantry-tree:
+      sha256: 4b5e5511567c0fe735a224cb8b2b278e1caa79344f2940d030d169e69b1b81e1
+      size: 23275
+  original:
+    hackage: crypton-1.0.0
+- completed:
+    hackage: crypton-conduit-0.2.3@sha256:31f44243b42f344c65be6cd2c39c07994d9186d19d15988656620d1de85aca37,1946
+    pantry-tree:
+      sha256: 06781001956f2ccfae0e6b4f33c213bd3121c6462f8534e9dca87bf51e4663e0
+      size: 592
+  original:
+    hackage: crypton-conduit-0.2.3
+- 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@sha256:ba77cbe437508d5dfe4dec1e929121a92f0d6fc004c30fabb94c78172c0606dc,1016
+- completed:
+    hackage: xml-conduit-1.9.1.4@sha256:554bb02f0e236fb0c99c4c9be5ddb0893ad294decc1cff3964c900e31462fbdd,3008
+    pantry-tree:
+      sha256: d9dbdfa342756c10debc093bc982e75f2dd5eb2786ccd52aa2d1fc10df13ba88
+      size: 836
+  original:
+    hackage: xml-conduit-1.9.1.4@sha256:554bb02f0e236fb0c99c4c9be5ddb0893ad294decc1cff3964c900e31462fbdd,3008
+- completed:
+    hackage: cabal-doctest-1.0.10@sha256:ebe93d13ffa657e8fa512ecc462ccafd59c497456be4355496914a11db03cb1f,2047
+    pantry-tree:
+      sha256: 48068b7cc064b5ec74ee9bcae5e91c5bf5e07faa163447a2b8f3c1135b7405df
+      size: 335
+  original:
+    hackage: cabal-doctest-1.0.10@sha256:ebe93d13ffa657e8fa512ecc462ccafd59c497456be4355496914a11db03cb1f,2047
 snapshots:
 - completed:
     sha256: 694573e96dca34db5636edb1fe6c96bb233ca0f9fb96c1ead1671cdfa9bd73e9

diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal
@@ -1,5 +1,5 @@
 name:            yesod-bin
-version:         1.6.2.3
+version:         1.6.2.4
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <[email protected]>
@@ -31,7 +31,7 @@ executable             yesod
                      , conduit            >= 1.3
                      , conduit-extra      >= 1.3
                      , containers         >= 0.2
-                     , data-default-class
+                     , data-default       >= 0.8
                      , directory          >= 1.2.1
                      , file-embed
                      , filepath           >= 1.1

diff --git a/yesod-sitemap/yesod-sitemap.cabal b/yesod-sitemap/yesod-sitemap.cabal
@@ -16,10 +16,10 @@ extra-source-files: README.md ChangeLog.md
 library
     build-depends:   base                      >= 4.10     && < 5
                    , conduit
-                   , data-default
+                   , data-default              >=0.8
                    , text
                    , time                      >= 1.1.4
-                   , xml-conduit               >= 1.0
+                   , xml-conduit               >= 1.9.1.4 
                    , xml-types
                    , yesod-core                >= 1.6      && < 1.7
     exposed-modules: Yesod.Sitemap

diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal
@@ -64,7 +64,7 @@ test-suite test
                           , containers
                           , html-conduit
                           , yesod-core
-                          , yesod-form >= 1.6
+                          , yesod-form >= 1.7.9
                           , text
                           , wai
                           , wai-extra

diff --git a/yesod/Yesod/Default/Util.hs b/yesod/Yesod/Default/Util.hs
@@ -28,7 +28,7 @@ import Text.Julius (juliusFile, juliusFileReload)
 import Text.Cassius (cassiusFile, cassiusFileReload)
 import Text.Hamlet (HamletSettings, defaultHamletSettings)
 import Data.Maybe (catMaybes)
-import Data.Default.Class (Default (def))
+import Data.Default (Default (def))
 
 -- | An implementation of 'addStaticContent' which stores the contents in an
 -- external file. Files are created in the given static folder with names based

diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
@@ -1,5 +1,5 @@
 name:            yesod
-version:         1.6.2.1
+version:         1.6.2.2
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <[email protected]>
@@ -22,7 +22,7 @@ library
                    , aeson
                    , bytestring
                    , conduit                   >= 1.3
-                   , data-default-class
+                   , data-default              >= 0.8
                    , directory
                    , fast-logger
                    , file-embed