git.iko.soy/typeable/stackage2nix
on master help sign in
Fix Travis
393cfefDmitry Bushev
.travis.yml+1−1
compare with master
unifiedsplit
@@ -20,7 +20,7 @@ env:
20jobs:
20jobs:
21 include:
21 include:
22 - stage: bootstrap
22 - stage: bootstrap
23− env: STACK_YAML=stack-ghc-802.yaml
23+ env: STACK_YAML=stack-ghc-822.yaml
24 install:
24 install:
25 # Install Nix
25 # Install Nix
26 - mkdir -p ~/.nix
26 - mkdir -p ~/.nix
ci-stackage2nix+2−1
@@ -5,7 +5,7 @@ set -e
5STACKAGE2NIX_WORK_DIR=${STACKAGE2NIX_WORK_DIR:-$HOME}
5STACKAGE2NIX_WORK_DIR=${STACKAGE2NIX_WORK_DIR:-$HOME}
6STACKAGE_REPO=${STACKAGE_REPO:-$STACKAGE2NIX_WORK_DIR/lts-haskell}
6STACKAGE_REPO=${STACKAGE_REPO:-$STACKAGE2NIX_WORK_DIR/lts-haskell}
7ALL_CABAL_HASHES_DIR=${ALL_CABAL_HASHES_DIR:-$STACKAGE2NIX_WORK_DIR/all-cabal-hashes}
7ALL_CABAL_HASHES_DIR=${ALL_CABAL_HASHES_DIR:-$STACKAGE2NIX_WORK_DIR/all-cabal-hashes}
8−STACK_FILE=${STACK_FILE:-.}
8+STACK_FILE=${STACK_YAML:-.}
9
9
10if [ ! -d "$STACKAGE_REPO" ]; then
10if [ ! -d "$STACKAGE_REPO" ]; then
11 git clone --depth 1 https://github.com/fpco/lts-haskell.git "$STACKAGE_REPO"
11 git clone --depth 1 https://github.com/fpco/lts-haskell.git "$STACKAGE_REPO"
@@ -20,6 +20,7 @@ time stack exec -- stackage2nix \
20 --lts-haskell "$STACKAGE_REPO" \
20 --lts-haskell "$STACKAGE_REPO" \
21 --all-cabal-hashes "$ALL_CABAL_HASHES_DIR" \
21 --all-cabal-hashes "$ALL_CABAL_HASHES_DIR" \
22 --hackage-db "$HOME/.cabal/packages/hackage.haskell.org/01-index.tar" \
22 --hackage-db "$HOME/.cabal/packages/hackage.haskell.org/01-index.tar" \
23+ --with-stackage-closure \
23 "$STACK_FILE"
24 "$STACK_FILE"
24
25
25nix-build -o "result-$(basename $STACK_FILE)" -A stackage2nix "$@"
26nix-build -o "result-$(basename $STACK_FILE)" -A stackage2nix "$@"