yesod-bin 1.4.18.6 → 1.4.18.7

raw patch · 3 files changed

+11/−5 lines, 3 files

Files

• ChangeLog.md +4/−0
• GhcBuild.hs +6/−4
• yesod-bin.cabal +1/−1

@@ -1,3 +1,7 @@+## 1.4.18.7++* Actually release the changes for #1284+ ## 1.4.18.6  * Fix support for GHC 8.0.1 [#1284](https://github.com/yesodweb/yesod/issues/1284)

@@ -100,7 +100,7 @@         hideAll | gopt DF.Opt_HideAllPackages dflags1 = [ "-hide-all-packages"]                 | otherwise                           = []         ownPkg = packageString (DF.thisPackage dflags1)-    return (reverse (extra dflags1) ++ hideAll ++ trustPkgFlags ++ ignorePkgFlags ++ pkgFlags ++ [ownPkg])+    return (reverse (extra dflags1) ++ hideAll ++ trustPkgFlags ++ ignorePkgFlags ++ pkgFlags ++ ownPkg)   where #if __GLASGOW_HASKELL__ >= 800     convertIgnorePkgFlag (DF.IgnorePackage p)  = "-ignore-package" ++ p@@ -124,11 +124,13 @@ #endif     convertPkgFlag (DF.HidePackage p)     = "-hide-package" ++ p #if __GLASGOW_HASKELL__ >= 800-    packageString flags = "-package-id" ++ Module.unitIdString flags+    -- See: https://github.com/yesodweb/yesod/issues/1284+    packageString _flags = []+    --packageString flags = "-package-id" ++ Module.unitIdString flags #elif __GLASGOW_HASKELL__ == 710-    packageString flags = "-package-key" ++ Module.packageKeyString flags+    packageString flags = ["-package-key" ++ Module.packageKeyString flags] #else-    packageString flags = "-package-id" ++ Module.packageIdString flags ++ "-inplace"+    packageString flags = ["-package-id" ++ Module.packageIdString flags ++ "-inplace"] #endif #if __GLASGOW_HASKELL__ >= 705     extra df = inplaceConf ++ extra'

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