diff --git a/Makefile b/Makefile index 836a8a4e2..64f470289 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ GHCI=ghci #-package ghc-datasize #-package ghc-heap-view # CABAL=cabal # CABALINSTALL=cabal install -w $(GHC) STACK=stack -#STACK=stack --stack-yaml=stack-ghc8.yaml +#STACK=stack --stack-yaml=stack-ghc7.yaml # -j16 sometimes gives "commitAndReleaseBuffer: resource vanished (Broken pipe)" but seems harmless SHELLTESTOPTS=--execdir -- -j16 --hide-successes diff --git a/stack-ghc7.yaml b/stack-ghc7.yaml new file mode 100644 index 000000000..5a917fb0c --- /dev/null +++ b/stack-ghc7.yaml @@ -0,0 +1,17 @@ +# Use this config if you prefer to build with GHC 7 & stackage lts-6 +# for some reason. +# $ stack --stack-yaml stack-ghc7.yaml install + +# Some older and newer lts-6 snapshots will also work here. +resolver: lts-6.22 + +packages: +- hledger-lib +- hledger +- hledger-ui +- hledger-web +- hledger-api + +extra-deps: +- brick-0.8 +- megaparsec-5.0.1 diff --git a/stack-ghc8.yaml b/stack-ghc8.yaml deleted file mode 100644 index 5576e9e35..000000000 --- a/stack-ghc8.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# $ stack --stack-yaml stack-ghc8.yaml install - -resolver: lts-7.0 - -packages: -- hledger-lib -- hledger -- hledger-ui -- hledger-web -- hledger-api - -flags: - -extra-deps: -# hledger-ui -- brick-0.8 -- text-zipper-0.4 -- vty-5.7.1 -# hledger-web -- wai-handler-launch-3.0.2.1 - -# cf https://github.com/commercialhaskell/stack/wiki/stack.yaml diff --git a/stack.yaml b/stack.yaml index b749aa12c..150e82c0f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,5 +1,5 @@ -# this or a newer snapshot is suggested (hledger-api/servant/aeson requires > lts-5) -resolver: lts-6.18 +# some older and newer lts-7 snapshots will also work here +resolver: lts-7.4 packages: - hledger-lib @@ -8,10 +8,12 @@ packages: - hledger-web - hledger-api -#flags: - extra-deps: +# for hledger-ui: - brick-0.8 -- megaparsec-5.0.1 +- text-zipper-0.4 +- vty-5.7.1 +# for hledger-web: +- wai-handler-launch-3.0.2.1 -# https://docs.haskellstack.org/en/stable/yaml_configuration/ +# cf https://github.com/commercialhaskell/stack/wiki/stack.yaml