From 5355447e044be6de51e3cbe69086ab77e36b3e01 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 22 Jul 2016 18:08:34 -0700 Subject: [PATCH] stack: update ghc 7 & 8 stack configs --- stack-ghc8.yaml | 21 ++++----------------- stack.yaml | 18 ++++-------------- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/stack-ghc8.yaml b/stack-ghc8.yaml index 0520b6722..b08dca716 100644 --- a/stack-ghc8.yaml +++ b/stack-ghc8.yaml @@ -1,26 +1,18 @@ -# stack config for building with GHC 8, tested 2016/5/27 -# https://ghc.haskell.org/trac/ghc/wiki/Migration/8.0 +# stack config for building with GHC 8, tested 2016/7/22 # $ stack --stack-yaml stack-ghc8.yaml install -# cf https://github.com/commercialhaskell/stack/wiki/stack.yaml - -resolver: nightly-2016-06-17 +resolver: nightly-2016-07-19 packages: - hledger-lib - hledger - hledger-ui - hledger-web +- hledger-api flags: extra-deps: -# hledger -- control-monad-free-0.6.1 -- tabular-0.2.2.7 -- wizards-1.0.2 -# hledger --bench -- timeit-1.0.0.0 # hledger-ui - brick-0.6.4 - text-zipper-0.4 @@ -28,9 +20,4 @@ extra-deps: - json-0.9.1 - wai-handler-launch-3.0.2.1 -# ghc-options: -# # All packages -# "*": -Wall -auto-all -# rebuild-ghc-options: true -# apply-ghc-options: everything - +# cf https://github.com/commercialhaskell/stack/wiki/stack.yaml diff --git a/stack.yaml b/stack.yaml index 0c2d23649..45e50d5ef 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,7 +1,5 @@ -# docs: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md - # this or a newer snapshot is suggested (hledger-api/servant/aeson requires > lts-5) -resolver: lts-6.0 +resolver: lts-6.8 packages: - hledger-lib @@ -10,16 +8,8 @@ packages: - hledger-web - hledger-api -extra-deps: -- brick-0.6 -- aeson-0.11.2.0 -- servant-swagger-1.0.3 -- swagger2-2.0.2 -- vty-5.5.0 -- wai-handler-launch-3.0.2 - #flags: -# ghc-options: -# rtsopts: -# all +extra-deps: + +# https://docs.haskellstack.org/en/stable/yaml_configuration/