haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1812 from jezen/master

Browse Source 
Fix SubSub compilation for GHC >= 9.0.1
This commit is contained in:
Michael Snoyman 2023-07-26 06:39:48 -04:00 committed by GitHub
commit 7a10dd3628
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod-core/ChangeLog.md
View File

@ -1,5 +1,9 @@
# ChangeLog for yesod-core # 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 ## 1.6.24.3
* Fix subsite-to-subsite dispatch [#1805](https://github.com/yesodweb/yesod/pull/1805) * Fix subsite-to-subsite dispatch [#1805](https://github.com/yesodweb/yesod/pull/1805)

8
yesod-core/test/YesodCoreTest/SubSub.hs
View File

@ -18,6 +18,10 @@ import YesodCoreTest.SubSubData
data App = App { getOuter :: OuterSubSite } data App = App { getOuter :: OuterSubSite }
mkYesod "App" [parseRoutes|
/ OuterSubSiteR OuterSubSite getOuter
|]
instance Yesod App instance Yesod App
getSubR :: SubHandlerFor InnerSubSite master T.Text getSubR :: SubHandlerFor InnerSubSite master T.Text
@ -29,10 +33,6 @@ instance YesodSubDispatch OuterSubSite master where
instance YesodSubDispatch InnerSubSite master where instance YesodSubDispatch InnerSubSite master where
yesodSubDispatch = $(mkYesodSubDispatch resourcesInnerSubSite) yesodSubDispatch = $(mkYesodSubDispatch resourcesInnerSubSite)
mkYesod "App" [parseRoutes|
/ OuterSubSiteR OuterSubSite getOuter
|]
app :: App app :: App
app = App { getOuter = OuterSubSite { getInner = InnerSubSite }} app = App { getOuter = OuterSubSite { getInner = InnerSubSite }}

2
yesod-core/yesod-core.cabal
View File

@ -1,5 +1,5 @@
name: yesod-core name: yesod-core
version: 1.6.24.3 version: 1.6.24.4
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>