From b6ac64737b59e74d4aa2d889690e8fab3772d2c6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Apr 2018 09:16:05 -0400 Subject: 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. --- src/Propellor/Bootstrap.hs | 50 +++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 21 deletions(-) (limited to 'src/Propellor/Bootstrap.hs') diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index a8713535..04f23f85 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -138,17 +138,19 @@ depsCommand bs msys = "( " ++ intercalate " ; " (go bs) ++ ") || true" -- Below are the same deps listed in debian/control. , "ghc" , "cabal-install" - , "libghc-ansi-terminal-dev" , "libghc-async-dev" - , "libghc-concurrent-output-dev" - , "libghc-exceptions-dev" - , "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" + , "libghc-stm-dev" + , "libghc-text-dev" + , "libghc-hashable-dev" ] debdeps Stack = [ "gnupg" @@ -159,16 +161,19 @@ depsCommand bs msys = "( " ++ intercalate " ; " (go bs) ++ ") || true" [ "gnupg" , "ghc" , "hs-cabal-install" - , "hs-ansi-terminal" , "hs-async" - , "hs-exceptions" - , "hs-hashable" + , "hs-split" , "hs-hslogger" + , "hs-unix-compat" + , "hs-ansi-terminal" , "hs-IfElse" - , "hs-mtl" , "hs-network" - , "hs-split" - , "hs-unix-compat" + , "hs-mtl" + , "hs-transformers-base" + , "hs-exceptions" + , "hs-stm" + , "hs-text" + , "hs-hashable" ] fbsddeps Stack = [ "gnupg" @@ -179,17 +184,20 @@ depsCommand bs msys = "( " ++ intercalate " ; " (go bs) ++ ") || true" [ "gnupg" , "ghc" , "cabal-install" - , "haskell-hackage-security" - , "haskell-ansi-terminal" , "haskell-async" - , "haskell-exceptions" - , "hashell-hashable" - , "haskell-ifelse" - , "haskell-hslogger" - , "haskell-mtl" - , "haskell-network" , "haskell-split" + , "haskell-hslogger" , "haskell-unix-compat" + , "haskell-ansi-terminal" + , "haskell-hackage-security" + , "haskell-ifelse" + , "haskell-network" + , "haskell-mtl" + , "haskell-transformers-base" + , "haskell-exceptions" + , "haskell-stm" + , "haskell-text" + , "hashell-hashable" ] archlinuxdeps Stack = [ "gnupg" -- cgit v1.2.3