From 08f8be3cb4ce8dd28b2f605ef6d7643cd4241a8e Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 4 Jun 2018 14:54:24 -0700 Subject: [PATCH] make older ghcs mostly work with new base-compat (#794) Using the same base-compat version across all ghc versions is kind of the point of base-compat; now we can rely on whatever base-compat 0.10.1 provides. hledger-api has been commented with ghc 7.10, way too much hassle. --- stack-ghc7.10.yaml | 80 ++++++++++++++++++++++++++++++++++++++-------- stack-ghc8.0.yaml | 29 +++++++++++++++++ stack-ghc8.2.yaml | 10 ++++-- 3 files changed, 104 insertions(+), 15 deletions(-) diff --git a/stack-ghc7.10.yaml b/stack-ghc7.10.yaml index e1aaca9e4..c580d28aa 100644 --- a/stack-ghc7.10.yaml +++ b/stack-ghc7.10.yaml @@ -8,24 +8,78 @@ packages: - hledger - hledger-ui - hledger-web -- hledger-api +#- hledger-api extra-deps: -- attoparsec-iso8601-1.0.0.0 -- brick-0.24.2 -- cpphs-1.20.8 -- data-clist-0.1.2.0 - easytest-0.2 -- http-api-data-0.3.7.1 +# Many newer versions to allow using the latest base-compat with all ghc versions. +# This is just the first workable install plan I found. +- adjunctions-4.4 +- aeson-1.3.1.1 +- aeson-compat-0.3.7.1 +- attoparsec-0.13.2.2 +- attoparsec-iso8601-1.0.0.0 +- base-compat-0.10.1 +- base-compat-batteries-0.10.1 +- base-orphans-0.7 +- bifunctors-5.5.2 +- brick-0.37.1 +- config-ini-0.2.2.0 +- criterion-1.4.1.0 +- data-clist-0.1.2.1 +- exceptions-0.10.0 +- free-5.0.2 +- generics-sop-0.3.2.0 +- Glob-0.9.2 +- hashable-1.2.7.0 +- http-media-0.7.1.2 +- http-types-0.12.1 +- insert-ordered-containers-0.2.1.0 +- integer-logarithms-1.0.2.1 +- kan-extensions-5.1 +- lens-4.16.1 - megaparsec-6.4.1 -- natural-transformation-0.4 +- microstache-1.0.1.1 +- mmorph-1.1.2 +- monad-control-1.0.2.3 +- network-2.6.3.5 +- optparse-applicative-0.14.2.0 - parser-combinators-0.4.0 - persistent-2.7.0 -- persistent-template-2.5.2 -- servant-0.11 -- servant-server-0.11 -- text-zipper-0.10 -- th-orphans-0.13.4 -- vty-5.17.1 +- persistent-template-2.5.4 +- profunctors-5.2.2 +- resourcet-1.1.11 +- scientific-0.3.6.2 +- semigroupoids-5.2.2 +- semigroups-0.18.4 +- singleton-bool-0.1.4 +- statistics-0.14.0.2 +- tagged-0.8.5 +- text-1.2.3.0 +- text-zipper-0.10.1 +- th-abstraction-0.2.6.0 +- transformers-compat-0.6.1.4 +- unliftio-core-0.1.1.0 +- unordered-containers-0.2.9.0 +- vty-5.21 - word-wrap-0.4.1 - yesod-persistent-1.4.2 + +# - servant-0.13.0.1 +# - servant-server-0.13.0.1 +# - servant-swagger-1.1.5 +# - swagger2-2.2.2 +# # - attoparsec-iso8601-1.0.0.0 +# # - base-compat-0.9.3 +# - brick-0.24.2 +# - cpphs-1.20.8 +# - data-clist-0.1.2.0 +# - http-api-data-0.3.7.1 +# - natural-transformation-0.4 +# # - persistent-template-2.5.2 +# # - servant-0.11 +# # - servant-server-0.11 +# - text-zipper-0.10 +# - th-orphans-0.13.4 +# - vty-5.17.1 +# - word-wrap-0.4.1 diff --git a/stack-ghc8.0.yaml b/stack-ghc8.0.yaml index 1f941c704..36ea4c1d9 100644 --- a/stack-ghc8.0.yaml +++ b/stack-ghc8.0.yaml @@ -11,7 +11,36 @@ packages: extra-deps: - easytest-0.2 +# Many newer versions to allow using the latest base-compat with all ghc versions. +# This is just the first workable install plan I found. +- aeson-1.3.1.1 +- aeson-compat-0.3.7.1 +- attoparsec-0.13.2.2 +- attoparsec-iso8601-1.0.0.0 +- base-compat-0.10.1 +- base-compat-batteries-0.10.1 +- bifunctors-5.5.2 +- criterion-1.4.1.0 +- generics-sop-0.3.2.0 +- hashable-1.2.7.0 +- http-media-0.7.1.2 +- http-types-0.12.1 +- insert-ordered-containers-0.2.1.0 +- lens-4.16.1 - megaparsec-6.4.1 +- microstache-1.0.1.1 +- mmorph-1.1.2 +- network-2.6.3.5 - parser-combinators-0.4.0 +- persistent-template-2.5.4 +- scientific-0.3.6.2 +- servant-0.13.0.1 +- servant-server-0.13.0.1 +- servant-swagger-1.1.5 +- singleton-bool-0.1.4 +- statistics-0.14.0.2 +- swagger2-2.2.2 +- text-1.2.3.0 +- unordered-containers-0.2.9.0 # avoid hanging with windows symlinks https://github.com/simonmichael/hledger/issues/791 - directory-1.3.2.2 diff --git a/stack-ghc8.2.yaml b/stack-ghc8.2.yaml index ea866076b..15800cd86 100644 --- a/stack-ghc8.2.yaml +++ b/stack-ghc8.2.yaml @@ -1,6 +1,6 @@ # stack build plan using GHC 8.2.2 -resolver: lts-11.9 +resolver: lts-11.11 packages: - hledger-lib @@ -11,7 +11,13 @@ packages: extra-deps: - easytest-0.2 -# avoid hanging with windows symlinks https://github.com/simonmichael/hledger/issues/791 +# use the latest base-compat with all ghc versions +- aeson-1.3.1.1 +- base-compat-0.10.1 +- base-compat-batteries-0.10.1 +- criterion-1.4.1.0 +- swagger2-2.2.2 +# avoid https://github.com/simonmichael/hledger/issues/791 - directory-1.3.2.2 nix: