From 4a3df6297909e62e7672435993ce5bc78e7e6a02 Mon Sep 17 00:00:00 2001 From: Jezen Thomas Date: Wed, 26 Jul 2023 12:16:12 +0300 Subject: [PATCH] Fix SubSub compilation for GHC >= 9.0.1 Resolves #1811. Related: - https://stackoverflow.com/questions/73719275/evaluation-of-template-haskell-in-yesod?noredirect=1&lq=1 - https://github.com/yesodweb/yesodweb.com-content/pull/269 --- yesod-core/ChangeLog.md | 4 ++++ yesod-core/test/YesodCoreTest/SubSub.hs | 8 ++++---- yesod-core/yesod-core.cabal | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/yesod-core/ChangeLog.md b/yesod-core/ChangeLog.md index 0e903df3..9e640920 100644 --- a/yesod-core/ChangeLog.md +++ b/yesod-core/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog for yesod-core +## 1.6.24.4 + +* Fix test-suite compilation error for GHC >= 9.0.1 [#1812](https://github.com/yesodweb/yesod/pull/1812) + ## 1.6.24.3 * Fix subsite-to-subsite dispatch [#1805](https://github.com/yesodweb/yesod/pull/1805) diff --git a/yesod-core/test/YesodCoreTest/SubSub.hs b/yesod-core/test/YesodCoreTest/SubSub.hs index 2c3ad06c..4f02d48b 100644 --- a/yesod-core/test/YesodCoreTest/SubSub.hs +++ b/yesod-core/test/YesodCoreTest/SubSub.hs @@ -18,6 +18,10 @@ import YesodCoreTest.SubSubData data App = App { getOuter :: OuterSubSite } +mkYesod "App" [parseRoutes| +/ OuterSubSiteR OuterSubSite getOuter +|] + instance Yesod App getSubR :: SubHandlerFor InnerSubSite master T.Text @@ -29,10 +33,6 @@ instance YesodSubDispatch OuterSubSite master where instance YesodSubDispatch InnerSubSite master where yesodSubDispatch = $(mkYesodSubDispatch resourcesInnerSubSite) -mkYesod "App" [parseRoutes| -/ OuterSubSiteR OuterSubSite getOuter -|] - app :: App app = App { getOuter = OuterSubSite { getInner = InnerSubSite }} diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 18f6c2e6..85fd8b1b 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.6.24.3 +version: 1.6.24.4 license: MIT license-file: LICENSE author: Michael Snoyman