fraport/fradrive-old
fraport/fradrive-old
Archived
3
1
Fork 0
Code Issues 65 Pull Requests 5 Actions Packages Projects Releases 197 Wiki Activity

Draft: Resolve "GHC und Dependencies auf die neuste Version bringen" #206

Open
savau wants to merge 583 commits from 144-ghc-update into master
pull from: 144-ghc-update
merge into: fraport:master
Conversation 127 Commits 583 Files Changed 196 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36d5ebfa4a - Show all commits

4
src/Settings/StaticFiles/Webpack.hs
View File

@ -16,7 +16,7 @@ import qualified Data.Yaml as Yaml
import qualified Data.Map as Map
import Yesod.Core (Route, MonadLogger, MonadWidget, HandlerSite, logDebugS, logErrorS)
import Yesod.Core (Route, MonadWidget, HandlerSite, logDebugS, logErrorS)
import Yesod.EmbeddedStatic (EmbeddedStatic)
import Yesod.EmbeddedStatic.Types
import Network.Mime (MimeType)
@ -69,7 +69,7 @@ mkWebpackEntrypoints manifest mkGen stDir = do
, funD entryName
[ clause [] (normalB . listE . map (\(n, mime) -> tupE [varE n, TH.lift mime]) $ nubOrdOn fst entries) []
]
, sigD widgetName [t|forall m. (MonadLogger m, MonadWidget m) => (Route EmbeddedStatic -> Route (HandlerSite m)) -> m ()|]
, sigD widgetName [t|forall m. MonadWidget m => (Route EmbeddedStatic -> Route (HandlerSite m)) -> m ()|]
, funD widgetName
[ clause [varP staticR] (normalB [e|
do