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 /debian | |
| 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 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 32 |
2 files changed, 18 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index 42871285..9308a7bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,6 @@ propellor (5.3.6) UNRELEASED; urgency=medium * Dropped support for building propellor with ghc 7 (as in debian oldstable), to avoid needing to depend on the semigroups transitional package, but also because it's just too old to be worth supporting. - * Added dependency on concurrent-output; removed embedded copy. * stack.yaml: Updated to lts-9.21. -- Joey Hess <id@joeyh.name> Mon, 23 Apr 2018 13:12:25 -0400 diff --git a/debian/control b/debian/control index 77bd7eae..5a041c90 100644 --- a/debian/control +++ b/debian/control @@ -6,17 +6,19 @@ Build-Depends: git, ghc (>= 7.6), cabal-install, - libghc-ansi-terminal-dev, libghc-async-dev, - libghc-concurrent-output-dev, - libghc-exceptions-dev (>= 0.6), - libghc-hashable-dev, + libghc-split-dev, libghc-hslogger-dev, + libghc-unix-compat-dev, + libghc-ansi-terminal-dev, libghc-ifelse-dev, - libghc-mtl-dev, libghc-network-dev, - libghc-split-dev, - libghc-unix-compat-dev, + libghc-mtl-dev, + libghc-transformers-dev, + libghc-exceptions-dev (>= 0.6), + libghc-stm-dev, + libghc-text-dev, + libghc-hashable-dev, Maintainer: Joey Hess <id@joeyh.name> Standards-Version: 3.9.8 Vcs-Git: git://git.joeyh.name/propellor @@ -28,17 +30,19 @@ Section: admin Depends: ${misc:Depends}, ${shlibs:Depends}, ghc (>= 7.4), cabal-install, - libghc-ansi-terminal-dev, libghc-async-dev, - libghc-concurrent-output-dev, - libghc-exceptions-dev (>= 0.6), - libghc-hashable-dev, + libghc-split-dev, libghc-hslogger-dev, + libghc-unix-compat-dev, + libghc-ansi-terminal-dev, libghc-ifelse-dev, - libghc-mtl-dev, libghc-network-dev, - libghc-split-dev, - libghc-unix-compat-dev, + libghc-mtl-dev, + libghc-transformers-dev, + libghc-exceptions-dev (>= 0.6), + libghc-stm-dev, + libghc-text-dev, + libghc-hashable-dev, git, Description: property-based host configuration management in haskell Propellor ensures that the system it's run in satisfies a list of |