summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2018-04-23 13:56:56 -0400
committerJoey Hess2018-04-23 13:58:40 -0400
commit02eca2ae4cf51d8e83d94d8359e15ac053451109 (patch)
tree8a3cb9751506a6eafb3bdb52cc9f3909413d0ac6 /src/Propellor
parentab91fd81a9e026751fe32af69e95fd97e68cbf3e (diff)
Added dependency on concurrent-output; removed embedded copy.
Removed deps on transformers, text, stm. Updated debian/control and Propellor.Bootstrap accordingly. Sorted the lists of deps to make it easier to keep them in sync. This commit was sponsored by Nick Daly on Patreon.
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Bootstrap.hs50
1 files changed, 21 insertions, 29 deletions
diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs
index 04f23f85..a8713535 100644
--- a/src/Propellor/Bootstrap.hs
+++ b/src/Propellor/Bootstrap.hs
@@ -138,19 +138,17 @@ 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-split-dev"
+ , "libghc-concurrent-output-dev"
+ , "libghc-exceptions-dev"
+ , "libghc-hashable-dev"
, "libghc-hslogger-dev"
- , "libghc-unix-compat-dev"
- , "libghc-ansi-terminal-dev"
, "libghc-ifelse-dev"
- , "libghc-network-dev"
, "libghc-mtl-dev"
- , "libghc-transformers-dev"
- , "libghc-exceptions-dev"
- , "libghc-stm-dev"
- , "libghc-text-dev"
- , "libghc-hashable-dev"
+ , "libghc-network-dev"
+ , "libghc-split-dev"
+ , "libghc-unix-compat-dev"
]
debdeps Stack =
[ "gnupg"
@@ -161,19 +159,16 @@ depsCommand bs msys = "( " ++ intercalate " ; " (go bs) ++ ") || true"
[ "gnupg"
, "ghc"
, "hs-cabal-install"
+ , "hs-ansi-terminal"
, "hs-async"
- , "hs-split"
+ , "hs-exceptions"
+ , "hs-hashable"
, "hs-hslogger"
- , "hs-unix-compat"
- , "hs-ansi-terminal"
, "hs-IfElse"
- , "hs-network"
, "hs-mtl"
- , "hs-transformers-base"
- , "hs-exceptions"
- , "hs-stm"
- , "hs-text"
- , "hs-hashable"
+ , "hs-network"
+ , "hs-split"
+ , "hs-unix-compat"
]
fbsddeps Stack =
[ "gnupg"
@@ -184,20 +179,17 @@ depsCommand bs msys = "( " ++ intercalate " ; " (go bs) ++ ") || true"
[ "gnupg"
, "ghc"
, "cabal-install"
- , "haskell-async"
- , "haskell-split"
- , "haskell-hslogger"
- , "haskell-unix-compat"
- , "haskell-ansi-terminal"
, "haskell-hackage-security"
- , "haskell-ifelse"
- , "haskell-network"
- , "haskell-mtl"
- , "haskell-transformers-base"
+ , "haskell-ansi-terminal"
+ , "haskell-async"
, "haskell-exceptions"
- , "haskell-stm"
- , "haskell-text"
, "hashell-hashable"
+ , "haskell-ifelse"
+ , "haskell-hslogger"
+ , "haskell-mtl"
+ , "haskell-network"
+ , "haskell-split"
+ , "haskell-unix-compat"
]
archlinuxdeps Stack =
[ "gnupg"