Merge branch 'concurrent-output' into 'master'

Add concurrent-output patch

See merge request !187

ci/MakeConstraints.hs

@@ -35,6 +35,16 @@ allowNewer pkgs =
   where
     pkgsDoc = PP.vcat $ PP.punctuate "," $ map prettyPackageName $ S.toList pkgs
 
+installedConstraints :: S.Set Cabal.PackageName -> S.Set Cabal.PackageName -> Doc
+installedConstraints bootPkgs patchedPkgs =
+  "constraints:" PP.<$$> PP.indent 2 pkgsDoc
+  where
+    pkgsDoc = PP.vcat $ PP.punctuate ","
+      [ prettyPackageName bootPkg <+> "installed"
+      | bootPkg <- S.toList bootPkgs
+      , bootPkg `S.notMember` patchedPkgs
+      ]
+
 versionConstraints :: [(Cabal.PackageName, Version)] -> Doc
 versionConstraints pkgs =
   "constraints:" PP.<$$> PP.indent 2 body
@@ -62,9 +72,12 @@ makeConstraints :: FilePath -- ^ patch directory
                 -> IO Doc
 makeConstraints patchDir = do
   patches <- findPatchedPackages patchDir
-  let doc = PP.vcat
+  let patchedPkgs = S.fromList $ map fst patches
+      doc = PP.vcat
         [ allowNewer bootPkgs
         , ""
+        , installedConstraints bootPkgs patchedPkgs
+        , ""
         , versionConstraints patches
         ]
   return doc

patches/concurrent-output-1.10.12.patch

+diff --git a/System/Console/Regions.hs b/System/Console/Regions.hs
+index d936b70..7b60f76 100644
+--- a/System/Console/Regions.hs
++++ b/System/Console/Regions.hs
+@@ -130,7 +130,7 @@ import qualified System.Console.Terminal.Size as Console
+ import System.IO
+ import System.IO.Unsafe (unsafePerformIO)
+ import Text.Read
+-import Data.List
++import Data.List (intercalate, nubBy)
+ #ifndef mingw32_HOST_OS
+ import System.Posix.Signals
+ import System.Posix.Signals.Exts