Merge branch 'master' into cabal-scripting-support

Author: typedrat

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,4 @@
+---
 Please include the following checklist in your PR:
 
 * [ ] Patches conform to the [coding conventions](https://github.com/haskell/cabal/#conventions).

.mailmap

@@ -35,12 +35,14 @@ Bram Schuur                 <[email protected]>
 Brendan Hay                 <[email protected]>              <[email protected]>
 Brent Yorgey                <[email protected]>                    <[email protected]>
 Brian Smith                 <[email protected]>                brianlsmith <[email protected]>
+Daniel Díaz Carrete         <[email protected]>
 Daniel Gröber               <[email protected]>                   <[email protected]>
 Daniel Wagner               <[email protected]>               <[email protected]>
 David Himmelstrup           <[email protected]>
 David Luposchainsky         <[email protected]>             <[email protected]>
 David Waern                 <[email protected]>               David Waern <unknown>
 Dennis Gosnell              <[email protected]>
+Dmitry Kovanikov            <[email protected]>                  ChShersh <[email protected]>
 Don Stewart                 <[email protected]>                     <[email protected]>
 Duncan Coutts               <[email protected]>
 Duncan Coutts               <[email protected]>         <Duncan Coutts [email protected]>
@@ -49,10 +51,11 @@ Duncan Coutts               <[email protected]>         <duncan@commu
 Duncan Coutts               <[email protected]>         <[email protected]>
 Duncan Coutts               <[email protected]>         <[email protected]>
 Duncan Coutts               <[email protected]>         unknown <unknown> # 04e9fcc80bc68b72126e33b20f08050df28e727d
-Edward Z. Yang              <[email protected]>               <[email protected]>
 Edward Z. Yang              <[email protected]>               <[email protected]>
+Edward Z. Yang              <[email protected]>               <[email protected]>
 Einar Karttunen             <[email protected]>
 Federico Mastellone         <[email protected]>
+Felix Yan                   <[email protected]>            Felix Yan <[email protected]>
 Francesco Gazzetta          <[email protected]>                 <[email protected]>
 Ganesh Sittampalam          <[email protected]> <[email protected]>
 Geoff Nixon                 <[email protected]> <[email protected]>
@@ -82,17 +85,17 @@ Jens Petersen               <[email protected]>                <petersen@red
 Jeremy Shaw                 <[email protected]>
 Jeremy Shaw                 <[email protected]>          <[email protected]>
 Jim Burton                  <[email protected]>
+Joe Quinn                   <[email protected]>
 Joel Bitrauser              <[email protected]>                      <[email protected]>
 Joel Bitrauser              <[email protected]>                      Bitrauser <[email protected]>
-Joe Quinn                   <[email protected]>
 Joel Stanley                <[email protected]>
 Joeri van Eekelen           <[email protected]>
 John D. Ramsdell            <[email protected]>
 John Dias                   <[email protected]>                dias <[email protected]>
 John Ericson                <[email protected]>
-John Ericson                <[email protected]>                John Ericson <[email protected]>
-John Ericson                <[email protected]>                <[email protected]>
 John Ericson                <[email protected]>                <[email protected]>
+John Ericson                <[email protected]>                <[email protected]>
+John Ericson                <[email protected]>                John Ericson <[email protected]>
 Josh Hoyt                   <[email protected]>
 Judah Jacobson              <[email protected]>
 Jürgen Nicklisch-Franken    <[email protected]>
@@ -146,5 +149,7 @@ Thomas Schilling            <[email protected]>                   <nominolo@goo
 Thomas Tuegel               <[email protected]>
 Thomas Tuegel               <[email protected]>                    <[email protected]>
 Thomas Tuegel               <[email protected]>                    <[email protected]>
-capsjac                     <[email protected]>                    # Goes by that name online
-vedksah                     <[email protected]> # Goes by that name online
+capsjac                     <[email protected]>                              # Goes by that name online
+ghthrowaway7                <[email protected]> # Goes by that name online
+quasicomputational          <[email protected]>                   # Goes by that name online
+vedksah                     <[email protected]>      # Goes by that name online

AUTHORS

@@ -14,6 +14,7 @@ Alex Washburn            <[email protected]>
 Alexander Kjeldaas       <[email protected]>
 Alexander Vershilov      <[email protected]>
 Alexei Pastuchov         <[email protected]>
+Alexis Williams          <[email protected]>
 Alistair Bailey          <[email protected]>
 Alson Kemp               <[email protected]>
 Amir Mohammad Saied      <[email protected]>
@@ -65,6 +66,7 @@ Conal Elliott            <[email protected]>
 Curtis Gagliardi         <[email protected]>
 Dan Burton               <[email protected]>
 Daniel Buckmaster        <[email protected]>
+Daniel Díaz Carrete      <[email protected]>
 Daniel Gröber            <[email protected]>
 Daniel Trstenjak         <[email protected]>
 Daniel Velkov            <[email protected]>
@@ -82,6 +84,7 @@ David Waern              <[email protected]>
 Dennis Gosnell           <[email protected]>
 Dino Morelli             <[email protected]>
 Dmitry Astapov           <[email protected]>
+Dmitry Kovanikov         <[email protected]>
 Dominic Steinitz         <[email protected]>
 Don Stewart              <[email protected]>
 Doug Beardsley           <[email protected]>
@@ -101,6 +104,7 @@ Eugene Sukhodolin        <[email protected]>
 Eyal Lotem               <[email protected]>
 Fabián Orccón            <[email protected]>
 Federico Mastellone      <[email protected]>
+Felix Yan                <[email protected]>
 Florian Hartwig          <[email protected]>
 Francesco Ariis          <[email protected]>
 Francesco Gazzetta       <[email protected]>
@@ -235,6 +239,7 @@ Peter Robinson           <[email protected]>
 Peter Selinger           <[email protected]>
 Peter Simons             <[email protected]>
 Peter Siska              <[email protected]>
+Peter Trommler           <[email protected]>
 Peter Trško              <[email protected]>
 Phil Ruffwind            <[email protected]>
 Philipp Schumann         <[email protected]>
@@ -251,6 +256,7 @@ Roberto Zunino           <[email protected]>
 Robin Green              <[email protected]>
 Robin KAY                <[email protected]>
 Roman Cheplyaka          <[email protected]>
+Roman Kashitcyn          <[email protected]>
 Ross Paterson            <[email protected]>
 Rudy Matela              <[email protected]>
 Ryan Desfosses           <[email protected]>
@@ -288,6 +294,7 @@ Thomas Tuegel            <[email protected]>
 Tillmann Rendel          <[email protected]>
 Tim Chevalier            <[email protected]>
 Tim Humphries            <[email protected]>
+Tim McGilchrist          <[email protected]>
 Tomas Vestelind          <[email protected]>
 Toshio Ito               <[email protected]>
 Travis Cardwell          <[email protected]>
@@ -300,6 +307,7 @@ Yitzchak Gale            <[email protected]>
 Yuras Shumovich          <[email protected]>
 Yuriy Syrovetskiy        <[email protected]>
 capsjac                  <[email protected]>
+ghthrowaway7             <[email protected]>
 quasicomputational       <[email protected]>
 vedksah                  <[email protected]>
 Łukasz Dąbek             <[email protected]>

Cabal/Cabal.cabal

@@ -165,43 +165,28 @@ source-repository head
 flag bundled-binary-generic
   default: False
 
-flag old-directory
-  description:  Use directory < 1.2 and old-time
-  default:      False
-
 library
   build-depends:
-    array      >= 0.4     && < 0.6,
-    base       >= 4.6     && < 5,
-    bytestring >= 0.9.2.1 && < 0.11,
-    containers >= 0.4.2.1 && < 0.7,
-    deepseq    >= 1.3     && < 1.5,
-    filepath   >= 1.3     && < 1.5,
-    pretty     >= 1.1.1   && < 1.2,
-    process    >= 1.1.0.1 && < 1.7,
-    time       >= 1.4     && < 1.10
-
-  if flag(old-directory)
-    build-depends: directory >= 1.1.0.2  && < 1.2,
-                   process   >= 1.0.1.1  && < 1.1.0.2,
-                   old-time  >= 1.1      && < 1.2
-  else
-    build-depends: directory >= 1.2      && < 1.4,
-                   process   >= 1.1.0.2  && < 1.7
+    array      >= 0.4.0.1  && < 0.6,
+    base       >= 4.6      && < 5,
+    bytestring >= 0.10.0.0 && < 0.11,
+    containers >= 0.5.0.0  && < 0.7,
+    deepseq    >= 1.3.0.1  && < 1.5,
+    directory  >= 1.2      && < 1.4,
+    filepath   >= 1.3.0.1  && < 1.5,
+    pretty     >= 1.1.1    && < 1.2,
+    process    >= 1.1.0.2  && < 1.7,
+    time       >= 1.4.0.1  && < 1.10
 
   if flag(bundled-binary-generic)
-    build-depends: binary >= 0.5.1 && < 0.7
+    build-depends: binary >= 0.5.1.1 && < 0.7
   else
     build-depends: binary >= 0.7 && < 0.9
 
-  -- Needed for GHC.Generics before GHC 7.6
-  if impl(ghc < 7.6)
-    build-depends: ghc-prim >= 0.2 && < 0.3
-
   if os(windows)
-    build-depends: Win32 >= 2.2.2 && < 2.7
+    build-depends: Win32 >= 2.3.0.0 && < 2.9
   else
-    build-depends: unix  >= 2.5.1 && < 2.9
+    build-depends: unix  >= 2.6.0.0 && < 2.9
 
   ghc-options: -Wall -fno-ignore-asserts -fwarn-tabs
   if impl(ghc >= 8.0)
@@ -229,8 +214,6 @@ library
     Distribution.Compat.Exception
     Distribution.Compat.Graph
     Distribution.Compat.Internal.TempFile
-    Distribution.Compat.Map.Lazy
-    Distribution.Compat.Map.Strict
     Distribution.Compat.Newtype
     Distribution.Compat.Prelude.Internal
     Distribution.Compat.ReadP
@@ -443,8 +426,6 @@ library
     Distribution.Utils.String
     Distribution.Simple.GHC.EnvironmentParser
     Distribution.Simple.GHC.Internal
-    Distribution.Simple.GHC.IPI642
-    Distribution.Simple.GHC.IPIConvert
     Distribution.Simple.GHC.ImplInfo
     Paths_Cabal
 
@@ -514,7 +495,7 @@ test-suite unit-tests
     directory,
     filepath,
     integer-logarithms >= 1.0.2 && <1.1,
-    tasty >= 1.0 && < 1.1,
+    tasty >= 1.1.0.3 && < 1.2,
     tasty-hunit,
     tasty-quickcheck,
     tagged,
@@ -532,10 +513,10 @@ test-suite parser-tests
   main-is: ParserTests.hs
   build-depends:
     base,
-    base-compat >=0.9.3 && <0.10,
+    base-compat >=0.10.4 && <0.11,
     bytestring,
     filepath,
-    tasty >= 1.0 && < 1.1,
+    tasty >= 1.1.0.3 && < 1.2,
     tasty-hunit,
     tasty-quickcheck,
     tasty-golden >=2.3.1.1 && <2.4,
@@ -561,7 +542,7 @@ test-suite check-tests
     base,
     bytestring,
     filepath,
-    tasty >= 1.0 && < 1.1,
+    tasty >= 1.1.0.3 && < 1.2,
     tasty-golden >=2.3.1.1 && <2.4,
     Diff >=0.3.4 && <0.4,
     Cabal
@@ -603,8 +584,8 @@ test-suite hackage-tests
     filepath
 
   build-depends:
-    base-compat          >=0.9.3    && <0.10,
-    base-orphans         >=0.6      && <0.7,
+    base-compat          >=0.10.4   && <0.11,
+    base-orphans         >=0.6      && <0.9,
     optparse-applicative >=0.13.2.0 && <0.15,
     tar                  >=0.5.0.3  && <0.6
 

Cabal/ChangeLog.md

@@ -1,15 +1,15 @@
 # 2.4.0.0 (current development version)
-  * `Distribution.Simple.Haddock` now checks to ensure that it 
-    does not erroneously call Haddock with no target modules. 
-    ([#5232](https://github.com/haskell/cabal/issues/5232), 
+  * `Distribution.Simple.Haddock` now checks to ensure that it
+    does not erroneously call Haddock with no target modules.
+    ([#5232](https://github.com/haskell/cabal/issues/5232),
     [#5459](https://github.com/haskell/cabal/issues/5459)).
-  * Add more Lens combinators (`to`, `traversed`, `filtered`, 
+  * Add more Lens combinators (`to`, `traversed`, `filtered`,
     `non`) and an optic to access the modules in a component
     of a `PackageDescription` by the `ComponentName`.
   * Add `readGhcEnvironmentFile` to parse GHC environment files.
   * Drop support for GHC 7.4, since it is out of our support window
     (and has been for over a year!)
-  * Deprecate `preSDist`, `sDistHook`, and `postSDist` in service of 
+  * Deprecate `preSDist`, `sDistHook`, and `postSDist` in service of
     `new-sdist`, since they violate key invariants of the new-build
     ecosystem. Use `autogen-modules` and `build-tool-depends` instead.
     ([#5389](https://github.com/haskell/cabal/pull/5389)).
@@ -77,6 +77,9 @@
     ([#5386](https://github.com/haskell/cabal/issues/5386)).
   * `Distribution.PackageDescription.Check.checkPackageFiles` now
     accepts a `Verbosity` argument.
+  * Added a parameter to
+    `Distribution.Backpack.ConfiguredComponent.toConfiguredComponent` in order to fix
+    [#5409](https://github.com/haskell/cabal/issues/5409).
 
 ----
 

Cabal/Distribution/Backpack/ConfiguredComponent.hs

@@ -159,14 +159,15 @@ toConfiguredComponent
     :: PackageDescription
     -> ComponentId
     -> ConfiguredComponentMap
+    -> ConfiguredComponentMap
     -> Component
     -> LogProgress ConfiguredComponent
-toConfiguredComponent pkg_descr this_cid dep_map component = do
+toConfiguredComponent pkg_descr this_cid lib_dep_map exe_dep_map component = do
     lib_deps <-
         if newPackageDepsBehaviour pkg_descr
             then forM (targetBuildDepends bi) $ \(Dependency name _) -> do
                     let (pn, cn) = fixFakePkgName pkg_descr name
-                    value <- case Map.lookup cn =<< Map.lookup pn dep_map of
+                    value <- case Map.lookup cn =<< Map.lookup pn lib_dep_map of
                         Nothing ->
                             dieProgress $
                                 text "Dependency on unbuildable (i.e. 'buildable: False')" <+>
@@ -180,15 +181,15 @@ toConfiguredComponent pkg_descr this_cid dep_map component = do
        lib_deps exe_deps component
   where
     bi = componentBuildInfo component
-    -- dep_map contains a mix of internal and external deps.
+    -- lib_dep_map contains a mix of internal and external deps.
     -- We want all the public libraries (dep_cn == CLibName)
     -- of all external deps (dep /= pn).  Note that this
     -- excludes the public library of the current package:
     -- this is not supported by old-style deps behavior
     -- because it would imply a cyclic dependency for the
     -- library itself.
     old_style_lib_deps = [ e
-                         | (pn, comp_map) <- Map.toList dep_map
+                         | (pn, comp_map) <- Map.toList lib_dep_map
                          , pn /= packageName pkg_descr
                          , (cn, e) <- Map.toList comp_map
                          , cn == CLibName ]
@@ -204,7 +205,7 @@ toConfiguredComponent pkg_descr this_cid dep_map component = do
         -- which the package is attempting to use (those deps are only
         -- fed in when cabal-install uses this codepath.)
         -- TODO: Let cabal-install request errors here
-        , Just exe <- [Map.lookup (CExeName cn) =<< Map.lookup pn dep_map]
+        , Just exe <- [Map.lookup (CExeName cn) =<< Map.lookup pn exe_dep_map]
         ]
 
 -- | Also computes the 'ComponentId', and sets cc_public if necessary.
@@ -224,7 +225,7 @@ toConfiguredComponent' use_external_internal_deps flags
                 dep_map component = do
     cc <- toConfiguredComponent
                 pkg_descr this_cid
-                dep_map component
+                dep_map dep_map component
     return $ if use_external_internal_deps
                 then cc { cc_public = True }
                 else cc
@@ -248,6 +249,11 @@ extendConfiguredComponentMap cc =
 -- list of internal components must be topologically sorted
 -- based on internal package dependencies, so that any internal
 -- dependency points to an entry earlier in the list.
+--
+-- TODO: This function currently restricts the input configured components to
+-- one version per package, by using the type ConfiguredComponentMap.  It cannot
+-- be used to configure a component that depends on one version of a package for
+-- a library and another version for a build-tool.
 toConfiguredComponents
     :: Bool -- use_external_internal_deps
     -> FlagAssignment

Cabal/Distribution/Compat/Binary.hs

@@ -18,10 +18,6 @@ module Distribution.Compat.Binary
 #endif
        ) where
 
-#if __GLASGOW_HASKELL__ < 706
-import Prelude hiding (catch)
-#endif
-
 import Control.Exception (catch, evaluate)
 #if __GLASGOW_HASKELL__ >= 711
 import Control.Exception (pattern ErrorCall)

Cabal/Distribution/Compat/Environment.hs

@@ -18,14 +18,10 @@ import Foreign.C.Error (throwErrnoIf_)
 #endif
 
 import qualified System.Environment as System
-#if __GLASGOW_HASKELL__ >= 706
 import System.Environment (lookupEnv)
 #if __GLASGOW_HASKELL__ >= 708
 import System.Environment (unsetEnv)
 #endif
-#else
-import Distribution.Compat.Exception (catchIO)
-#endif
 
 import Distribution.Compat.Stack
 
@@ -55,13 +51,6 @@ getEnvironment = fmap upcaseVars System.getEnvironment
 getEnvironment = System.getEnvironment
 #endif
 
-#if __GLASGOW_HASKELL__ < 706
--- | @lookupEnv var@ returns the value of the environment variable @var@, or
--- @Nothing@ if there is no such value.
-lookupEnv :: String -> IO (Maybe String)
-lookupEnv name = (Just `fmap` System.getEnv name) `catchIO` const (return Nothing)
-#endif /* __GLASGOW_HASKELL__ < 706 */
-
 -- | @setEnv name value@ sets the specified environment variable to @value@.
 --
 -- Throws `Control.Exception.IOException` if either @name@ or @value@ is the