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

Merge pull request #1730 from felixonmars/ghc9

Browse Source 
Fix compatibility with template-haskell 2.17 for yesod
This commit is contained in:
Michael Snoyman 2021-06-30 18:45:03 +03:00 committed by GitHub
commit bffa6de813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod/ChangeLog.md
View File

@ -1,5 +1,9 @@
# ChangeLog for yesod # ChangeLog for yesod
## 1.6.1.2
* Fix compatibility with template-haskell 2.17 [#1730](https://github.com/yesodweb/yesod/pull/1730)
## 1.6.1.1 ## 1.6.1.1
* Allow yesod-form 1.7 * Allow yesod-form 1.7

4
yesod/Yesod/Default/Util.hs
View File

@ -113,7 +113,11 @@ combine func file isReload tls = do
, show file , show file
, ", but no templates were found." , ", but no templates were found."
] ]
#if MIN_VERSION_template_haskell(2,17,0)
exps -> return $ DoE Nothing $ map NoBindS exps
#else
exps -> return $ DoE $ map NoBindS exps exps -> return $ DoE $ map NoBindS exps
#endif
where where
qmexps :: Q [Maybe Exp] qmexps :: Q [Maybe Exp]
qmexps = mapM go tls qmexps = mapM go tls

2
yesod/yesod.cabal
View File

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