diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-04-30 09:16:05 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-04-30 09:16:05 -0400 |
| commit | b6ac64737b59e74d4aa2d889690e8fab3772d2c6 (patch) | |
| tree | 2077a9c2f0a204835dd2ada7a79b6ed4065395c5 /propellor.cabal | |
| parent | 9849d20b0028dc8e0a65cdc6edb3977577080ddf (diff) | |
Revert "Added dependency on concurrent-output; removed embedded copy."
This reverts commit 02eca2ae4cf51d8e83d94d8359e15ac053451109.
This seems to have broken propellor badly, in testing I'm seeing it
crash at the end of a run with "thread blocked indefinitely in an STM
transaction" and also during the run it printed out some odd output
like:
apache2:
apache2:
dummy IN SSHFP 4 1 35df80973f5877e4041f1b70947385eb2f6a0822
dummy IN SSHFP 4 2 3a0bb426e76eebc5c56e3b0f1428aa9d18539e9621bf8f9e3b7f56a4e7d81c85
Which seems like it might be output of commands that
propellor is supposed to be reading?
Seems likely that there's a bug or two that have crept
into then concurrent-output library since the version embedded in
propellor.
Diffstat (limited to 'propellor.cabal')
| -rw-r--r-- | propellor.cabal | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/propellor.cabal b/propellor.cabal index cf9fe7ce..a5b8c8a3 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -42,31 +42,14 @@ Library GHC-Options: -fno-warn-redundant-constraints Default-Extensions: TypeOperators Hs-Source-Dirs: src - -- propellor needs to support the ghc shipped in Debian stable, - -- and also only depends on packages in Debian stable. - -- - -- When updating dependencies here, also update the lists in - -- Propellor.Bootstrap Build-Depends: - ansi-terminal, - async, + -- propellor needs to support the ghc shipped in Debian stable, + -- and also only depends on packages in Debian stable. base >= 4.9, base < 5, - bytestring, - concurrent-output, - containers (>= 0.5), - directory, - exceptions (>= 0.6), - filepath, - hashable, - hslogger, - IfElse, - mtl, - network, - process, - split, - time, - unix, - unix-compat + directory, filepath, IfElse, process, bytestring, hslogger, split, + unix, unix-compat, ansi-terminal, containers (>= 0.5), network, async, + time, mtl, transformers, exceptions (>= 0.6), stm, text, hashable + Exposed-Modules: Propellor Propellor.Base @@ -240,6 +223,9 @@ Library Utility.Tmp Utility.Tuple Utility.UserInfo + System.Console.Concurrent + System.Console.Concurrent.Internal + System.Process.Concurrent Paths_propellor Executable propellor-config |