Workaround for broken Setup.hs files #370

Author: snoyberg

src/Stack/Build/Execute.hs

@@ -455,7 +455,7 @@ withSingleContext :: M env m
 withSingleContext ActionContext {..} ExecuteEnv {..} task@Task {..} inner0 =
     withPackage $ \package cabalfp pkgDir ->
     withLogFile package $ \mlogFile ->
-    withCabal pkgDir mlogFile $ \cabal ->
+    withCabal package pkgDir mlogFile $ \cabal ->
     inner0 package cabalfp pkgDir cabal announce console mlogFile
   where
     announce x = $logInfo $ T.concat
@@ -499,15 +499,21 @@ withSingleContext ActionContext {..} ExecuteEnv {..} task@Task {..} inner0 =
                 (liftIO . hClose)
                 $ \h -> inner (Just (logPath, h))
 
-    withCabal pkgDir mlogFile inner = do
+    withCabal package pkgDir mlogFile inner = do
         config <- asks getConfig
         menv <- liftIO $ configEnvOverride config EnvSettings
             { esIncludeLocals = taskLocation task == Local
             , esIncludeGhcPackagePath = False
             }
         exeName <- liftIO $ join $ findExecutable menv "runhaskell"
         distRelativeDir' <- distRelativeDir
-        msetuphs <- liftIO $ getSetupHs pkgDir
+        msetuphs <-
+            -- Avoid broken Setup.hs files causing problems for simple build
+            -- types, see:
+            -- https://github.com/commercialhaskell/stack/issues/370
+            if packageSimpleType package
+                then return Nothing
+                else liftIO $ getSetupHs pkgDir
         let setuphs = fromMaybe eeSetupHs msetuphs
         inner $ \stripTHLoading args -> do
             let fullArgs =

src/Stack/Package.hs

@@ -122,6 +122,7 @@ data Package =
           ,packageExes :: !(Set Text)                     -- ^ names of executables
           ,packageOpts :: !GetPackageOpts                 -- ^ Args to pass to GHC.
           ,packageHasExposedModules :: !Bool              -- ^ Does the package have exposed modules?
+          ,packageSimpleType :: !Bool                     -- ^ Does the package of build-type: Simple
           }
  deriving (Show,Typeable)
 
@@ -245,6 +246,7 @@ resolvePackage packageConfig gpkg = Package
     , packageOpts = GetPackageOpts $ \cabalfp ->
         generatePkgDescOpts cabalfp pkg
     , packageHasExposedModules = maybe False (not . null . exposedModules) (library pkg)
+    , packageSimpleType = buildType (packageDescription gpkg) == Just Simple
     }
 
   where

test/integration/tests/370-invalid-setup-hs/Main.hs

@@ -0,0 +1,4 @@
+import StackTest
+
+main :: IO ()
+main = stack ["build"]

test/integration/tests/370-invalid-setup-hs/files/LICENSE

@@ -0,0 +1,30 @@
+Copyright (c) 2015
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Your name here nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

test/integration/tests/370-invalid-setup-hs/files/Setup.hs

@@ -0,0 +1,2 @@
+import Distribution.Make (defaultMain)
+main = defaultMain

test/integration/tests/370-invalid-setup-hs/files/new-template.cabal

@@ -0,0 +1,18 @@
+name:                new-template
+version:             0.1.0.0
+synopsis:            Initial project template from stack
+description:         Please see README.md
+homepage:            http://github.com/name/project
+license:             BSD3
+license-file:        LICENSE
+author:              Your name here
+maintainer:          [email protected]
+category:            Web
+build-type:          Simple
+cabal-version:       >=1.10
+
+library
+  hs-source-dirs:      src
+  exposed-modules:     Lib
+  build-depends:       base >= 4.7 && < 5
+  default-language:    Haskell2010

test/integration/tests/370-invalid-setup-hs/files/src/Lib.hs

@@ -0,0 +1,6 @@
+module Lib
+    ( someFunc
+    ) where
+
+someFunc :: IO ()
+someFunc = putStrLn "someFunc"

test/integration/tests/370-invalid-setup-hs/files/stack.yaml

@@ -0,0 +1 @@
+resolver: ghc-7.8