Skip to content

G
gargantext-ihaskell
Commit 2d016bfd authored by Vaibhav Sagar's avatar Vaibhav Sagar
Browse files
Options

Switch to lts-13 as the default resolver

parent 819ccbe9
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
.travis.yml
View file @ 2d016bfd
...@@ -161,7 +161,7 @@ matrix: ...@@ -161,7 +161,7 @@ matrix:
# Images are rendered differently on different systems, so filter them out in the comparison # Images are rendered differently on different systems, so filter them out in the comparison
diff <(egrep -v 'image/png|version|pygments' ~/ihaskell-out.ipynb) <(egrep -v 'image/png|version|pygments' notebooks/IHaskell.ipynb) diff <(egrep -v 'image/png|version|pygments' ~/ihaskell-out.ipynb) <(egrep -v 'image/png|version|pygments' notebooks/IHaskell.ipynb)
fi fi
- env: DISPLAY=true USE_STACK_YAML="stack.yaml" # GHC 8.4.3 - env: DISPLAY=true USE_STACK_YAML="stack-8.4.yaml" # GHC 8.4.3
language: python language: python
# Test against different stack LTS versions. # Test against different stack LTS versions.
...@@ -240,7 +240,7 @@ matrix: ...@@ -240,7 +240,7 @@ matrix:
# Images are rendered differently on different systems, so filter them out in the comparison # Images are rendered differently on different systems, so filter them out in the comparison
diff <(egrep -v 'image/png|version|pygments' ~/ihaskell-out.ipynb) <(egrep -v 'image/png|version|pygments' notebooks/IHaskell.ipynb) diff <(egrep -v 'image/png|version|pygments' ~/ihaskell-out.ipynb) <(egrep -v 'image/png|version|pygments' notebooks/IHaskell.ipynb)
fi fi
- env: DISPLAY=false USE_STACK_YAML="stack-8.6.yaml" # GHC 8.6.2 - env: DISPLAY=false USE_STACK_YAML="stack.yaml" # GHC 8.6.3
language: python language: python
# Test against different stack LTS versions. # Test against different stack LTS versions.
......
Dockerfile
View file @ 2d016bfd
FROM fpco/stack-build:lts-12.26 FROM fpco/stack-build:lts-13.1
# Install all necessary Ubuntu packages # Install all necessary Ubuntu packages
RUN apt-get update && apt-get install -y python3-pip libgmp-dev libmagic-dev libtinfo-dev libzmq3-dev libcairo2-dev libpango1.0-dev libblas-dev liblapack-dev gcc g++ && \ RUN apt-get update && apt-get install -y python3-pip libgmp-dev libmagic-dev libtinfo-dev libzmq3-dev libcairo2-dev libpango1.0-dev libblas-dev liblapack-dev gcc g++ && \
......
docker/Dockerfile
View file @ 2d016bfd
FROM fpco/stack-build:lts-12.26 FROM fpco/stack-build:lts-13.1
# docker build -t ihaskell-dev docker # docker build -t ihaskell-dev docker
# Install all necessary Ubuntu packages # Install all necessary Ubuntu packages
......
stack-8.6.yaml → stack-8.4.yaml
View file @ 2d016bfd
resolver: lts-13.1 resolver: lts-12.26
flags: {} flags: {}
packages: packages:
...@@ -7,27 +7,27 @@ packages: ...@@ -7,27 +7,27 @@ packages:
- ./ghc-parser - ./ghc-parser
- ./ihaskell-display/ihaskell-aeson - ./ihaskell-display/ihaskell-aeson
- ./ihaskell-display/ihaskell-blaze - ./ihaskell-display/ihaskell-blaze
# - ./ihaskell-display/ihaskell-charts - ./ihaskell-display/ihaskell-charts
# - ./ihaskell-display/ihaskell-diagrams - ./ihaskell-display/ihaskell-diagrams
- ./ihaskell-display/ihaskell-gnuplot - ./ihaskell-display/ihaskell-gnuplot
# - ./ihaskell-display/ihaskell-hatex - ./ihaskell-display/ihaskell-hatex
- ./ihaskell-display/ihaskell-juicypixels - ./ihaskell-display/ihaskell-juicypixels
# - ./ihaskell-display/ihaskell-magic - ./ihaskell-display/ihaskell-magic
# - ./ihaskell-display/ihaskell-plot - ./ihaskell-display/ihaskell-plot
# - ./ihaskell-display/ihaskell-static-canvas - ./ihaskell-display/ihaskell-static-canvas
# - ./ihaskell-display/ihaskell-widgets - ./ihaskell-display/ihaskell-widgets
extra-deps: extra-deps:
# - magic-1.1 - magic-1.1
# - Chart-1.9 - Chart-1.9
# - Chart-cairo-1.9 - Chart-cairo-1.9
# - plot-0.2.3.9 - plot-0.2.3.9
ghc-options: ghc-options:
# Eventually we want "$locals": -Wall -Wpartial-fields -Werror # Eventually we want "$locals": -Wall -Wpartial-fields -Werror
ghc-parser: -Wall -Wpartial-fields -Werror ghc-parser: -Wall -Wpartial-fields -Werror
ihaskell: -Wall -Wpartial-fields -Werror ihaskell: -Wall -Wpartial-fields -Werror
# ihaskell-widgets: -Wall -Wpartial-fields -Werror ihaskell-widgets: -Wall -Wpartial-fields -Werror
nix: nix:
enable: false enable: false
......
stack.yaml
View file @ 2d016bfd
resolver: lts-12.26 resolver: lts-13.1
flags: {} flags: {}
packages: packages:
...@@ -7,27 +7,27 @@ packages: ...@@ -7,27 +7,27 @@ packages:
- ./ghc-parser - ./ghc-parser
- ./ihaskell-display/ihaskell-aeson - ./ihaskell-display/ihaskell-aeson
- ./ihaskell-display/ihaskell-blaze - ./ihaskell-display/ihaskell-blaze
- ./ihaskell-display/ihaskell-charts # - ./ihaskell-display/ihaskell-charts
- ./ihaskell-display/ihaskell-diagrams # - ./ihaskell-display/ihaskell-diagrams
- ./ihaskell-display/ihaskell-gnuplot - ./ihaskell-display/ihaskell-gnuplot
- ./ihaskell-display/ihaskell-hatex # - ./ihaskell-display/ihaskell-hatex
- ./ihaskell-display/ihaskell-juicypixels - ./ihaskell-display/ihaskell-juicypixels
- ./ihaskell-display/ihaskell-magic # - ./ihaskell-display/ihaskell-magic
- ./ihaskell-display/ihaskell-plot # - ./ihaskell-display/ihaskell-plot
- ./ihaskell-display/ihaskell-static-canvas # - ./ihaskell-display/ihaskell-static-canvas
- ./ihaskell-display/ihaskell-widgets # - ./ihaskell-display/ihaskell-widgets
extra-deps: extra-deps:
- magic-1.1 # - magic-1.1
- Chart-1.9 # - Chart-1.9
- Chart-cairo-1.9 # - Chart-cairo-1.9
- plot-0.2.3.9 # - plot-0.2.3.9
ghc-options: ghc-options:
# Eventually we want "$locals": -Wall -Wpartial-fields -Werror # Eventually we want "$locals": -Wall -Wpartial-fields -Werror
ghc-parser: -Wall -Wpartial-fields -Werror ghc-parser: -Wall -Wpartial-fields -Werror
ihaskell: -Wall -Wpartial-fields -Werror ihaskell: -Wall -Wpartial-fields -Werror
ihaskell-widgets: -Wall -Wpartial-fields -Werror # ihaskell-widgets: -Wall -Wpartial-fields -Werror
nix: nix:
enable: false enable: false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment