summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoeyHess <>2017-05-19 15:37:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-05-19 15:37:00 (GMT)
commit1278c3c0e0c823582779dc5d07979ed71c40882d (patch)
tree28ca9489e8cf6c6fce01e5706a80948490ff4252
parent2a5943ab55e55d48373ae79aea590d3ec9737402 (diff)
version 1.9.21.9.2
-rw-r--r--CHANGELOG6
-rw-r--r--System/Console/Concurrent/Internal.hs11
-rw-r--r--System/Console/Regions.hs4
-rw-r--r--concurrent-output.cabal4
4 files changed, 19 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index df9893b..cc11517 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+concurrent-output (1.9.2) unstable; urgency=medium
+
+ * Allow process-1.6.0.0.
+
+ -- Joey Hess <id@joeyh.name> Fri, 19 May 2017 11:36:35 -0400
+
concurrent-output (1.9.1) unstable; urgency=medium
* Documentation fix: createProcessConcurrent has been available on
diff --git a/System/Console/Concurrent/Internal.hs b/System/Console/Concurrent/Internal.hs
index 1a254cf..a19b358 100644
--- a/System/Console/Concurrent/Internal.hs
+++ b/System/Console/Concurrent/Internal.hs
@@ -147,15 +147,20 @@ instance Outputable String where
-- | Displays a value to stdout.
--
--- No newline is appended to the value, so if you want a newline, be sure
--- to include it yourself.
---
-- Uses locking to ensure that the whole output occurs atomically
-- even when other threads are concurrently generating output.
--
+-- No newline is appended to the value, so if you want a newline, be sure
+-- to include it yourself.
+--
-- When something else is writing to the console at the same time, this does
-- not block. It buffers the value, so it will be displayed once the other
-- writer is done.
+--
+-- When outputConcurrent is used within a call to
+-- `System.Console.Regions.displayConsoleRegions`, the output is displayed
+-- above the currently open console regions. Only lines ending in a newline
+-- are displayed in this case (it uses `waitCompleteLines`).
outputConcurrent :: Outputable v => v -> IO ()
outputConcurrent = outputConcurrent' StdOut
diff --git a/System/Console/Regions.hs b/System/Console/Regions.hs
index e94e2a7..5c0797f 100644
--- a/System/Console/Regions.hs
+++ b/System/Console/Regions.hs
@@ -9,7 +9,9 @@
-- License: BSD-2-clause
--
-- Console regions are displayed near the bottom of the console, and can be
--- updated concurrently by threads. Any other output displayed using
+-- updated concurrently by threads.
+--
+-- Any other output lines displayed using
-- `outputConcurrent` and `createProcessConcurrent`
-- will scroll up above the open console regions.
--
diff --git a/concurrent-output.cabal b/concurrent-output.cabal
index 4455b23..c6ba3ff 100644
--- a/concurrent-output.cabal
+++ b/concurrent-output.cabal
@@ -1,5 +1,5 @@
Name: concurrent-output
-Version: 1.9.1
+Version: 1.9.2
Cabal-Version: >= 1.8
License: BSD2
Maintainer: Joey Hess <id@joeyh.name>
@@ -34,7 +34,7 @@ Library
, text (>= 0.11.0 && < 1.3.0)
, async (>= 2.0 && < 2.2)
, stm (>= 2.0 && < 2.5)
- , process (>= 1.1.0 && < 1.5.0)
+ , process (>= 1.1.0 && < 1.7.0)
, directory (>= 1.2.0 && < 1.4.0)
, transformers (>= 0.3.0 && < 0.6.0)
, exceptions (>= 0.6.0 && < 0.9.0)