From a077594770132b4a07b168936d07385ff0c618d6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 10 Jun 2020 15:08:44 -0400 Subject: Revert "Added dependency on concurrent-output; removed embedded copy." This reverts commit dbd3ba3400a3097498252097540ffe8075b00833. Still has the same problem as in 2018! --- src/Propellor/Bootstrap.hs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/Propellor/Bootstrap.hs') diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index 66192e36..d772d7c7 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -148,9 +148,12 @@ depsCommand bs msys = "( " ++ intercalate " ; " (go bs) ++ ") || true" , Dep "libghc-ifelse-dev" , Dep "libghc-network-dev" , Dep "libghc-mtl-dev" + , Dep "libghc-transformers-dev" , Dep "libghc-exceptions-dev" + , Dep "libghc-text-dev" , Dep "libghc-hashable-dev" - , Dep "libghc-concurrent-output-dev" + -- Deps that are only needed on old systems. + , OldDep "libghc-stm-dev" ] debdeps Stack = [ Dep "gnupg" @@ -169,7 +172,10 @@ depsCommand bs msys = "( " ++ intercalate " ; " (go bs) ++ ") || true" , "hs-IfElse" , "hs-network" , "hs-mtl" + , "hs-transformers-base" , "hs-exceptions" + , "hs-stm" + , "hs-text" , "hs-hashable" ] fbsddeps Stack = @@ -190,7 +196,10 @@ depsCommand bs msys = "( " ++ intercalate " ; " (go bs) ++ ") || true" , "haskell-ifelse" , "haskell-network" , "haskell-mtl" + , "haskell-transformers-base" , "haskell-exceptions" + , "haskell-stm" + , "haskell-text" , "haskell-hashable" , "haskell-type-errors" ] -- cgit v1.2.3