393cfef · typeable/stackage2nix

git.iko.soy/typeable/stackage2nix

Fix Travis

commit393cfeff7eb5db196bb8b6f6b89cfb6ac92c053c authorDmitry Bushev <bushevdv@gmail.com> dateThu 18 Jan 2018, 16:50 (9 years ago) parent6a71959

2 files changed+3−2

unifiedsplit

.travis.yml+1−1

@@ -20,7 +20,7 @@ env:

2020jobs:

2121 include:

2222 - stage: bootstrap

23− env: STACK_YAML=stack-ghc-802.yaml

23+ env: STACK_YAML=stack-ghc-822.yaml

2424 install:

2525 # Install Nix

2626 - mkdir -p ~/.nix

ci-stackage2nix+2−1

@@ -5,7 +5,7 @@ set -e

55STACKAGE2NIX_WORK_DIR=${STACKAGE2NIX_WORK_DIR:-$HOME}

66STACKAGE_REPO=${STACKAGE_REPO:-$STACKAGE2NIX_WORK_DIR/lts-haskell}

77ALL_CABAL_HASHES_DIR=${ALL_CABAL_HASHES_DIR:-$STACKAGE2NIX_WORK_DIR/all-cabal-hashes}

8−STACK_FILE=${STACK_FILE:-.}

8+STACK_FILE=${STACK_YAML:-.}

1010if [ ! -d "$STACKAGE_REPO" ]; then

1111 git clone --depth 1 https://github.com/fpco/lts-haskell.git "$STACKAGE_REPO"

@@ -20,6 +20,7 @@ time stack exec -- stackage2nix \

2020 --lts-haskell "$STACKAGE_REPO" \

2121 --all-cabal-hashes "$ALL_CABAL_HASHES_DIR" \

2222 --hackage-db "$HOME/.cabal/packages/hackage.haskell.org/01-index.tar" \

23+ --with-stackage-closure \

2324 "$STACK_FILE"

2425

2526nix-build -o "result-$(basename $STACK_FILE)" -A stackage2nix "$@"