|author||Joey Hess||2018-04-30 09:16:05 -0400|
|committer||Joey Hess||2018-04-30 09:16:05 -0400|
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')
1 files changed, 9 insertions, 23 deletions
diff --git a/propellor.cabal b/propellor.cabal
index cf9fe7ce..a5b8c8a3 100644
@@ -42,31 +42,14 @@ Library
- -- 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
+ -- propellor needs to support the ghc shipped in Debian stable,
+ -- and also only depends on packages in Debian stable.
base >= 4.9, base < 5,
- containers (>= 0.5),
- exceptions (>= 0.6),
+ 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
@@ -240,6 +223,9 @@ Library