Merge branch 'master' into varosi/mingw_bin

Author: mgsloan

CONTRIBUTING.md

@@ -7,10 +7,10 @@ and use the provided template to include all necessary details.
 
 The more detailed your report, the faster it can be resolved and will ensure it
 is resolved in the right way. Once your bug has been resolved, the responsible
-will tag the issue as _Needs confirmation_ and assign the issue back to you.
-Once you have tested and confirmed that the issue is resolved, close the issue.
-If you are not a member of the project, you will be asked for confirmation and
-we will close it.
+person will tag the issue as _Needs confirmation_ and assign the issue back to
+you. Once you have tested and confirmed that the issue is resolved, close the 
+issue. If you are not a member of the project, you will be asked for
+confirmation and we will close it.
 
 
 ## Documentation

ChangeLog.md

@@ -49,6 +49,11 @@ Other enhancements:
   a method to ensure PVP compliance without having to proactively fix
   bounds issues for Stackage maintenance.
 * Expose a `save-hackage-creds` configuration option
+* On GHC <= 7.8, filters out spurious linker warnings on windows
+  See [#3127](https://github.com/commercialhaskell/stack/pull/3127)
+* Better error messages when creating or building packages which alias
+  wired-in packages. See
+  [#3172](https://github.com/commercialhaskell/stack/issues/3172).
 * MinGW bin folder now is searched for dynamic libraries. See [#3126](https://github.com/commercialhaskell/stack/issues/3126)
 
 Bug fixes:
@@ -74,6 +79,11 @@ Bug fixes:
 * Switching a package between extra-dep and local package now forces
   rebuild (previously it wouldn't if versions were the same).
   See [#2147](https://github.com/commercialhaskell/stack/issues/2147)
+* `stack upload` no longer reveals your password when you type it on
+  MinTTY-based Windows shells, such as Cygwin and MSYS2.
+  See [#3142](https://github.com/commercialhaskell/stack/issues/3142)
+* `stack script`'s import parser will now properly parse files that
+  have Windows-style line endings (CRLF)
 
 
 ## 1.4.0
@@ -168,6 +178,8 @@ Other enhancements:
 * Upgraded `http-client-tls` version, which now offers support for the
   `socks5://` and `socks5h://` values in the `http_proxy` and `https_proxy`
   environment variables.
+* Binary "stack upgrade" will now warn if the installed executable is not
+  on the PATH or shadowed by another entry.
 
 Bug fixes:
 

doc/yaml_configuration.md

@@ -16,8 +16,9 @@ and [non-project-specific](#non-project-specific-config) options in:
 - The project file itself may also contain non-project specific options
 
 *Note:* When stack is invoked outside a stack project it will source project
-specific options from `~/.stack/global-project/stack.yaml`.  Options in this file will
-be ignored for a project with its own `<project dir>/stack.yaml`.
+specific options from `~/.stack/global-project/stack.yaml`. When stack is
+invoked inside a stack project, only options from `<project dir>/stack.yaml` are
+used, and `~/.stack/global-project/stack.yaml` is ignored.
 
 ## Project-specific config
 

etc/dockerfiles/stack-build/lts-8.0/Dockerfile

@@ -42,8 +42,9 @@ RUN stack --system-ghc --resolver=$LTS_SLUG --local-bin-path=/usr/local/bin inst
 # Install proper 'pid1' init daemon
 #
 
-RUN wget -O- "https://github.com/fpco/pid1/releases/download/pid1%2F$PID1_VERSION/pid1-$PID1_VERSION-linux-x86_64.tar.gz" |tar xzf - -C /usr/local
-
+RUN wget -O- "https://github.com/fpco/pid1/releases/download/pid1%2F$PID1_VERSION/pid1-$PID1_VERSION-linux-x86_64.tar.gz" | tar xzf - -C /usr/local && \
+    chown root:root /usr/local/sbin && \
+    chown root:root /usr/local/sbin/pid1
 #
 # Set up pid1 entrypoint and default command
 #

src/Path/CheckInstall.hs

@@ -0,0 +1,60 @@
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Path.CheckInstall where
+
+import           Control.Monad (unless)
+import           Control.Monad.Extra (anyM, (&&^))
+import           Control.Monad.IO.Class
+import           Control.Monad.Logger
+import           Data.Foldable (forM_)
+import           Data.Text (Text)
+import qualified Data.Text as T
+import qualified System.Directory as D
+import qualified System.FilePath as FP
+
+-- | Checks if the installed executable will be available on the user's
+-- PATH. This doesn't use @envSearchPath menv@ because it includes paths
+-- only visible when running in the stack environment.
+warnInstallSearchPathIssues :: (MonadIO m, MonadLogger m) => FilePath -> [Text] -> m ()
+warnInstallSearchPathIssues destDir installed = do
+    searchPath <- liftIO FP.getSearchPath
+    destDirIsInPATH <- liftIO $
+        anyM (\dir -> D.doesDirectoryExist dir &&^ fmap (FP.equalFilePath destDir) (D.canonicalizePath dir)) searchPath
+    if destDirIsInPATH
+        then forM_ installed $ \exe -> do
+            mexePath <- (liftIO . D.findExecutable . T.unpack) exe
+            case mexePath of
+                Just exePath -> do
+                    exeDir <- (liftIO . fmap FP.takeDirectory . D.canonicalizePath) exePath
+                    unless (exeDir `FP.equalFilePath` destDir) $ do
+                        $logWarn ""
+                        $logWarn $ T.concat
+                            [ "WARNING: The \""
+                            , exe
+                            , "\" executable found on the PATH environment variable is "
+                            , T.pack exePath
+                            , ", and not the version that was just installed."
+                            ]
+                        $logWarn $ T.concat
+                            [ "This means that \""
+                            , exe
+                            , "\" calls on the command line will not use this version."
+                            ]
+                Nothing -> do
+                    $logWarn ""
+                    $logWarn $ T.concat
+                        [ "WARNING: Installation path "
+                        , T.pack destDir
+                        , " is on the PATH but the \""
+                        , exe
+                        , "\" executable that was just installed could not be found on the PATH."
+                        ]
+        else do
+            $logWarn ""
+            $logWarn $ T.concat
+                [ "WARNING: Installation path "
+                , T.pack destDir
+                , " not found on the PATH environment variable"
+                ]

src/Stack/Build/ConstructPlan.hs

@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric #-}
@@ -10,6 +11,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE ViewPatterns #-}
+{-# LANGUAGE StandaloneDeriving #-}
 -- | Construct a @Plan@ for how to build
 module Stack.Build.ConstructPlan
     ( constructPlan
@@ -24,7 +26,9 @@ import           Control.Monad.State.Strict (execState)
 import           Control.Monad.Trans.Resource
 import           Data.Either
 import           Data.Function
+import qualified Data.HashSet as HashSet
 import           Data.List
+import           Data.List.Extra (nubOrd)
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
 import qualified Data.Map.Strict as Map
@@ -892,7 +896,9 @@ data ConstructPlanException
     | DependencyPlanFailures Package (Map PackageName (VersionRange, LatestApplicableVersion, BadDependency))
     | UnknownPackage PackageName -- TODO perhaps this constructor will be removed, and BadDependency will handle it all
     -- ^ Recommend adding to extra-deps, give a helpful version number?
-    deriving (Typeable, Eq, Show)
+    deriving (Typeable, Eq, Ord, Show)
+
+deriving instance Ord VersionRange
 
 -- | For display purposes only, Nothing if package not found
 type LatestApplicableVersion = Maybe Version
@@ -902,7 +908,7 @@ data BadDependency
     = NotInBuildPlan
     | Couldn'tResolveItsDependencies Version
     | DependencyMismatch Version
-    deriving (Typeable, Eq, Show)
+    deriving (Typeable, Eq, Ord, Show)
 
 -- TODO: Consider intersecting version ranges for multiple deps on a
 -- package.  This is why VersionRange is in the parent map.
@@ -926,7 +932,7 @@ pprintExceptions exceptions stackYaml parentMap wanted =
         line <>
         "You may also want to try the 'stack solver' command"
   where
-    exceptions' = nub exceptions
+    exceptions' = nubOrd exceptions
 
     extras = Map.unions $ map getExtras exceptions'
     getExtras (DependencyCycleDetected _) = Map.empty
@@ -940,11 +946,16 @@ pprintExceptions exceptions stackYaml parentMap wanted =
     pprintExtra (name, version) =
       fromString (concat ["- ", packageNameString name, "-", versionString version])
 
+    allNotInBuildPlan = Set.fromList $ concatMap toNotInBuildPlan exceptions'
+    toNotInBuildPlan (DependencyPlanFailures _ pDeps) =
+      map fst $ filter (\(_, (_, _, badDep)) -> badDep == NotInBuildPlan) $ Map.toList pDeps
+    toNotInBuildPlan _ = []
+
     pprintException (DependencyCycleDetected pNames) = Just $
         "Dependency cycle detected in packages:" <> line <>
         indent 4 (encloseSep "[" "]" "," (map (errorRed . fromString . packageNameString) pNames))
-    pprintException (DependencyPlanFailures pkg (Map.toList -> pDeps)) =
-        case mapMaybe pprintDep pDeps of
+    pprintException (DependencyPlanFailures pkg pDeps) =
+        case mapMaybe pprintDep (Map.toList pDeps) of
             [] -> Nothing
             depErrors -> Just $
                 "In the dependencies for" <+> pkgIdent <>
@@ -961,9 +972,12 @@ pprintExceptions exceptions stackYaml parentMap wanted =
                             [pkgIdent]
               where
                 pkgIdent = displayCurrentPkgId (packageIdentifier pkg)
-        -- TODO: optionally show these?
-    -- Skip these because they are redundant with 'NotInBuildPlan' info.
-    pprintException (UnknownPackage _) = Nothing
+    -- Skip these when they are redundant with 'NotInBuildPlan' info.
+    pprintException (UnknownPackage name)
+        | name `Set.member` allNotInBuildPlan = Nothing
+        | name `HashSet.member` wiredInPackages =
+            Just $ "Can't build a package with same name as a wired-in-package:" <+> displayCurrentPkgName name
+        | otherwise = Just $ "Unknown package:" <+> displayCurrentPkgName name
 
     pprintFlags flags
         | Map.null flags = ""