From 3911ddfb38385641c6c0c343c8ca173129edd6c5 Mon Sep 17 00:00:00 2001 From: Matt Renaud Date: Mon, 25 Dec 2017 23:03:21 -0800 Subject: [PATCH 1/2] Add stack.yaml file to containers. `stack setup` fails due to ChasingBottoms missing from Stackage We default to lts-9.20 because lts-10.0 is currently not supported by many development tools (such as intero) because ghc-mod does not yet support GHC 8.2 (https://github.com/DanielG/ghc-mod/issues/900). This was tested and works with resolvers lts-10.0 and lts-9.20. Using older resolvers <=lts-7.24 causes a conflict with the package ranges specified in containers.cabal. --- stack.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 stack.yaml diff --git a/stack.yaml b/stack.yaml new file mode 100644 index 000000000..2c736a2f7 --- /dev/null +++ b/stack.yaml @@ -0,0 +1,11 @@ +flags: {} +packages: +- '.' + +### Uncoment the resolver you want to use and re-run `stack build/test/bench`. +# resolver: lts-10.0 +resolver: lts-9.20 + +### ChasingBottoms is only in Stackage snapshots lts-7.24 and below. +extra-deps: +- ChasingBottoms-1.3.1.3 From d27a4d6f6c5f425809307d987f9d3ab1dbe1b166 Mon Sep 17 00:00:00 2001 From: Matt Renaud Date: Mon, 25 Dec 2017 23:39:37 -0800 Subject: [PATCH 2/2] Remove `stack init` step in CONTRIBUTING.md. The stack.yaml file is now provided when the containers repo is cloned. --- CONTRIBUTING.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d09ec3d85..f7b467212 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,7 +22,6 @@ cabal test ### With [Stack](https://docs.haskellstack.org/en/stable/README/) ``` -stack init # If you haven't previously initialized stack stack build stack test ```