From ce456d48c7257ff882e8cc431816bf3adc8e216b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 20 Aug 2015 08:33:01 +0300 Subject: [PATCH] Correctly reverse package-db argument order (fixes #1057) --- yesod-bin/ChangeLog.md | 4 ++++ yesod-bin/GhcBuild.hs | 2 +- yesod-bin/yesod-bin.cabal | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/yesod-bin/ChangeLog.md b/yesod-bin/ChangeLog.md index 7063650c..b49be977 100644 --- a/yesod-bin/ChangeLog.md +++ b/yesod-bin/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.4.14 + +* Fix order of -package-db arguments to runghc [#1057](https://github.com/yesodweb/yesod/issues/1057) + ## 1.4.13 * Enable stack with yesod keter [#1041](https://github.com/yesodweb/yesod/pull/1041) diff --git a/yesod-bin/GhcBuild.hs b/yesod-bin/GhcBuild.hs index 284c3387..4d2497ce 100644 --- a/yesod-bin/GhcBuild.hs +++ b/yesod-bin/GhcBuild.hs @@ -88,7 +88,7 @@ getPackageArgs buildDir argv2 = do hideAll | gopt DF.Opt_HideAllPackages dflags1 = [ "-hide-all-packages"] | otherwise = [] ownPkg = packageString (DF.thisPackage dflags1) - return (extra dflags1 ++ hideAll ++ pkgFlags ++ [ownPkg]) + return (reverse (extra dflags1) ++ hideAll ++ pkgFlags ++ [ownPkg]) where #if __GLASGOW_HASKELL__ >= 710 convertPkgFlag (DF.ExposePackage (DF.PackageArg p) _) = "-package" ++ p diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index 1280477a..ffbf772f 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -1,5 +1,5 @@ name: yesod-bin -version: 1.4.13.3 +version: 1.4.14 license: MIT license-file: LICENSE author: Michael Snoyman