Merge pull request #818 from gibiansky/switch-resolver

Change default resolver to lts-10
This commit is contained in:
Vaibhav Sagar 2018-02-09 17:05:25 +10:00 committed by GitHub
commit 0b41e66565
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions

View File

@ -3,7 +3,7 @@ matrix:
- language: nix
fast_finish: true
include:
- env: DISPLAY=true USE_STACK_YAML="stack.yaml" # GHC 8.0.2
- env: DISPLAY=true USE_STACK_YAML="stack-8.0.yaml" # GHC 8.0.2
language: python
# Test against different stack LTS versions.
@ -82,7 +82,7 @@ matrix:
# Images are rendered differently on different systems, so filter them out in the comparison
diff <(grep -v image/png ~/ihaskell-out.ipynb) <(grep -v image/png notebooks/IHaskell.ipynb)
fi
- env: DISPLAY=true USE_STACK_YAML="stack-8.2.yaml" # GHC 8.2.1
- env: DISPLAY=true USE_STACK_YAML="stack.yaml" # GHC 8.2.2
language: python
# Test against different stack LTS versions.

View File

@ -14,10 +14,11 @@ packages:
- ./ihaskell-display/ihaskell-plot
- ./ihaskell-display/ihaskell-static-canvas
- ./ihaskell-display/ihaskell-widgets
resolver: lts-10.4
allow-newer: true
extra-deps:
- static-canvas-0.2.0.3
resolver: lts-9.21
extra-deps: []
flags:
ihaskell:
binpkgdb: false
nix:
enable: false

View File

@ -14,11 +14,10 @@ packages:
- ./ihaskell-display/ihaskell-plot
- ./ihaskell-display/ihaskell-static-canvas
- ./ihaskell-display/ihaskell-widgets
resolver: lts-9.21
extra-deps: []
flags:
ihaskell:
binpkgdb: false
resolver: lts-10.4
allow-newer: true
extra-deps:
- static-canvas-0.2.0.3
nix:
enable: false