Merge remote-tracking branch 'origin/master' into v1.7.0

Author: borsboom

ChangeLog.md

@@ -11,12 +11,34 @@ Behavior changes:
 
 Other enhancements:
 
+* `stack unpack` now supports a `--to /target/directory` option to
+  specify where to unpack the package into
+* `stack hoogle` now supports a new flag `--server` that launches local
+  Hoogle server on port 8080. See
+  [#2310](https://github.com/commercialhaskell/stack/issues/2310)
+
 Bug fixes:
 
+* When a package contained sublibraries, stack was always recompiling the
+  package. This has been fixed now, no recompilation is being done because of
+  sublibraries. See [#3899](https://github.com/commercialhaskell/stack/issues/3899).
+* The `get-stack.sh` install script now matches manual instructions
+  when it comes to Debian/Fedora/CentOS install dependencies.
+* Compile Cabal-simple with gmp when using Nix.
+  See [#2944](https://github.com/commercialhaskell/stack/issues/2944)
+* `stack ghci` now replaces the stack process with ghci. This improves
+  signal handling behavior. In particular, handling of Ctrl-C.  To make
+  this possible, the generated files are now left behind after exit.
+  The paths are based on hashing file contents, and it's stored in the
+  system temporary directory, so this shouldn't result in too much
+  garbage. See
+  [#3821](https://github.com/commercialhaskell/stack/issues/3821).
+* 1.6.1 introduced a change that made some precompiled cache files use
+  longer paths, sometimes causing builds to fail on windows. This has been
+  fixed. See [#3649](https://github.com/commercialhaskell/stack/issues/3649)
 
-## v1.7.0.1 (release candidate)
 
-Release notes:
+## v1.7.0.1 (release candidate)
 
 Major changes:
 
@@ -91,9 +113,6 @@ Bug fixes:
 ## v1.6.5
 
 Bug fixes:
-* 1.6.1 introduced a change that made some precompiled cache files use
-  longer paths, sometimes causing builds to fail on windows. This has been
-  fixed. See [#3649](https://github.com/commercialhaskell/stack/issues/3649)
 * Some unnecessary rebuilds when no files were changed are now avoided, by
   having a separate build cache for each component of a package. See
   [#3732](https://github.com/commercialhaskell/stack/issues/3732).

doc/GUIDE.md

@@ -517,6 +517,15 @@ Unpacked yackage-0.8.0 to /var/home/harendra/yackage-0.8.0/
 cueball:~$ cd yackage-0.8.0/
 ```
 
+Note that you can also unpack to the directory of your liking instead of
+the current one by issueing:
+
+```
+cueball:~$ stack unpack yackage-0.8.0 --to ~/work
+```
+
+This will create a `yackage-0.8.0` directory inside `~/work`
+
 ### stack init
 This new directory does not have a `stack.yaml` file, so we need to make one
 first. We could do it by hand, but let's be lazy instead with the `stack init`
@@ -1715,7 +1724,8 @@ users. Here's a quick rundown:
   upstream packages available).
 * `stack unpack` is a command we've already used quite a bit for examples, but
   most users won't use it regularly. It does what you'd expect: downloads a
-  tarball and unpacks it.
+  tarball and unpacks it. It accept optional `--to` argument to specify
+  the destination directory.
 * `stack sdist` generates an uploading tarball containing your package code
 * `stack upload` uploads an sdist to Hackage. As of
   version [1.1.0](https://docs.haskellstack.org/en/v1.1.0/ChangeLog/) stack

doc/install_and_upgrade.md

@@ -14,7 +14,7 @@ Distribution packages are available for [Ubuntu](#ubuntu), [Debian](#debian),
 [Fedora](#fedora),
 [Arch Linux](#arch-linux) and [FreeBSD](#freebsd).
 Binaries for other operating systems are listed below, and available on
-[the Github releases page](https://github.com/fpco/stack/releases). For the
+[the GitHub release page](https://github.com/fpco/stack/releases). For the
 future, we are open to supporting more OSes (to request one, please
 [submit an issue](https://github.com/commercialhaskell/stack/issues/new)).
 
@@ -175,7 +175,7 @@ install it by simply doing:
     sudo pacman -S stack
 
 Note that this version may slightly lag behind, but it should be updated within
-the day. The package is also always rebuilt and updated when one of it's
+the day. The package is also always rebuilt and updated when one of its
 dependencies gets an update.
 
   - [stack](https://www.archlinux.org/packages/community/x86_64/stack/) _latest stable version_

doc/yaml_configuration.md

@@ -164,11 +164,6 @@ does not rely on correct ordering in the package index, while revision
 number is likely simpler to use. In practice, both should guarantee
 equally reproducible build plans.
 
-If unspecified, `subdirs` defaults to `['.']` (i.e. look only in the top-level
-directory).  Note that if you specify a value of `subdirs`, then `'.'` is _not_
-included by default and needs to be explicitly specified if a required package
-is found in the top-level directory of the repository.
-
 #### Local file path
 
 Like `packages`, local file paths can be used in `extra-deps`, and
@@ -231,8 +226,11 @@ extra-deps:
   - wai
 ```
 
-If unspecified, `subdirs` defaults to `subdirs: [.]`, or looking for a
-package in the root of the repo.
+If unspecified, `subdirs` defaults to `['.']` meaning looking for a
+package in the root of the repo..  Note that if you specify a value of
+`subdirs`, then `'.'` is _not_ included by default and needs to be
+explicitly specified if a required package is found in the top-level
+directory of the repository.
 
 #### Archives (HTTP(S) or local filepath)
 

etc/scripts/get-stack.sh

@@ -164,7 +164,7 @@ do_ubuntu_install() {
 do_debian_install() {
 
   install_dependencies() {
-    apt_install_dependencies g++ gcc libc6-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev
+    apt_install_dependencies g++ gcc libc6-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg
   }
 
   if is_arm ; then
@@ -188,7 +188,7 @@ do_debian_install() {
 # and install the necessary dependencies explicitly.
 do_fedora_install() {
   install_dependencies() {
-    dnf_install_pkgs perl make automake gcc gmp-devel libffi zlib xz tar
+    dnf_install_pkgs perl make automake gcc gmp-devel libffi zlib-devel xz tar git gnupg
   }
 
   if is_64_bit ; then
@@ -208,7 +208,7 @@ do_fedora_install() {
 # and install the necessary dependencies explicitly.
 do_centos_install() {
   install_dependencies() {
-    yum_install_pkgs perl make automake gcc gmp-devel libffi zlib xz tar
+    yum_install_pkgs perl make automake gcc gmp-devel libffi zlib xz tar git gnupg
   }
 
   if is_64_bit ; then

src/Stack/Build/Cache.hs

@@ -120,6 +120,7 @@ buildCacheFile dir component = do
     let nonLibComponent prefix name = prefix <> "-" <> T.unpack name
     cacheFileName <- parseRelFile $ case component of
         CLib -> "lib"
+        CInternalLib name -> nonLibComponent "internal-lib" name
         CExe name -> nonLibComponent "exe" name
         CTest name -> nonLibComponent "test" name
         CBench name -> nonLibComponent "bench" name

src/Stack/Build/Execute.hs

@@ -1317,11 +1317,12 @@ singleBuild ac@ActionContext {..} ee@ExecuteEnv {..} task@Task {..} installedMap
                           ])
                       (const (return ()))
 
-                  readProcessNull ghcPkgExe
+                  void $ proc ghcPkgExe
                       [ "register"
                       , "--force"
                       , libpath
                       ]
+                      readProcess_
         liftIO $ forM_ exes $ \exe -> do
             D.createDirectoryIfMissing True bindir
             let dst = bindir FP.</> FP.takeFileName exe

src/Stack/Build/Installed.hs

@@ -230,25 +230,37 @@ isAllowed opts mcache sourceMap mloc dp
     | otherwise =
         case Map.lookup name sourceMap of
             Nothing ->
-                case mloc of
-                    -- The sourceMap has nothing to say about this global
-                    -- package, so we can use it
-                    Nothing -> Allowed
-                    Just ExtraGlobal -> Allowed
-                    -- For non-global packages, don't include unknown packages.
-                    -- See:
-                    -- https://github.com/commercialhaskell/stack/issues/292
-                    Just _ -> UnknownPkg
-            Just pii
-                | not (checkLocation (piiLocation pii)) -> WrongLocation mloc (piiLocation pii)
-                | version /= piiVersion pii -> WrongVersion version (piiVersion pii)
-                | otherwise -> Allowed
+                -- If the sourceMap has nothing to say about this package,
+                -- check if it represents a sublibrary first
+                -- See: https://github.com/commercialhaskell/stack/issues/3899
+                case dpParentLibIdent dp of
+                  Just (PackageIdentifier parentLibName version') ->
+                    case Map.lookup parentLibName sourceMap of
+                      Nothing -> checkNotFound
+                      Just pii
+                        | version' == version -> checkFound pii
+                        | otherwise -> checkNotFound -- different versions
+                  Nothing -> checkNotFound
+            Just pii -> checkFound pii
   where
     PackageIdentifier name version = dpPackageIdent dp
     -- Ensure that the installed location matches where the sourceMap says it
     -- should be installed
     checkLocation Snap = mloc /= Just (InstalledTo Local) -- we can allow either global or snap
     checkLocation Local = mloc == Just (InstalledTo Local) || mloc == Just ExtraGlobal -- 'locally' installed snapshot packages can come from extra dbs
+    -- Check if a package is allowed if it is found in the sourceMap
+    checkFound pii
+      | not (checkLocation (piiLocation pii)) = WrongLocation mloc (piiLocation pii)
+      | version /= piiVersion pii = WrongVersion version (piiVersion pii)
+      | otherwise = Allowed
+    -- check if a package is allowed if it is not found in the sourceMap
+    checkNotFound = case mloc of
+      -- The sourceMap has nothing to say about this global package, so we can use it
+      Nothing -> Allowed
+      Just ExtraGlobal -> Allowed
+      -- For non-global packages, don't include unknown packages.
+      -- See: https://github.com/commercialhaskell/stack/issues/292
+      Just _ -> UnknownPkg
 
 data LoadHelper = LoadHelper
     { lhId   :: !GhcPkgId

src/Stack/Build/Source.hs

@@ -167,6 +167,7 @@ splitComponents =
   where
     go a b c [] = (Set.fromList $ a [], Set.fromList $ b [], Set.fromList $ c [])
     go a b c (CLib:xs) = go a b c xs
+    go a b c (CInternalLib x:xs) = go (a . (x:)) b c xs
     go a b c (CExe x:xs) = go (a . (x:)) b c xs
     go a b c (CTest x:xs) = go a (b . (x:)) c xs
     go a b c (CBench x:xs) = go a b (c . (x:)) xs
@@ -434,9 +435,9 @@ getPackageFilesForTargets
     -> Set NamedComponent
     -> RIO env (Map NamedComponent (Set (Path Abs File)), [PackageWarning])
 getPackageFilesForTargets pkg cabalFP nonLibComponents = do
-    (_,compFiles,otherFiles,warnings) <-
+    (components',compFiles,otherFiles,warnings) <-
         getPackageFiles (packageFiles pkg) cabalFP
-    let components = Set.insert CLib nonLibComponents
+    let components = M.keysSet components' `Set.union` nonLibComponents
         componentsFiles =
             M.map (\files -> Set.union otherFiles (Set.map dotCabalGetPath files)) $
                 M.filterWithKey (\component _ -> component `Set.member` components) compFiles

src/Stack/Build/Target.hs

@@ -230,6 +230,7 @@ resolveRawTarget globals snap deps locals (ri, rt) =
     -- Helper function: check if a 'NamedComponent' matches the given 'ComponentName'
     isCompNamed :: ComponentName -> NamedComponent -> Bool
     isCompNamed _ CLib = False
+    isCompNamed t1 (CInternalLib t2) = t1 == t2
     isCompNamed t1 (CExe t2) = t1 == t2
     isCompNamed t1 (CTest t2) = t1 == t2
     isCompNamed t1 (CBench t2) = t1 == t2