Commit 5b7e03b2 authored by Vaibhav Sagar's avatar Vaibhav Sagar

Use LTS-16.23

parent 6825bb9c
......@@ -38,8 +38,8 @@ jobs:
- stack-yaml: 'stack-8.0.yaml'
- stack-yaml: 'stack-8.2.yaml'
- stack-yaml: 'stack-8.4.yaml'
- stack-yaml: 'stack-8.6.yaml'
- stack-yaml: 'stack.yaml'
- stack-yaml: 'stack-8.8.yaml'
steps:
- uses: actions/checkout@v2
......
FROM ubuntu:18.04
ARG STACK_VERSION=2.3.1
ARG RESOLVER=lts-14.27
ARG STACK_VERSION=2.5.1
ARG RESOLVER=lts-16.23
# 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++ wget && \
......
......@@ -126,7 +126,7 @@ docker build -t ihaskell:latest .
docker run --rm -it -p8888:8888 ihaskell:latest
```
Or use the continously updated Docker image
Or use the continuously updated Docker image
[on Docker Hub](https://hub.docker.com/r/gibiansky/ihaskell).
```sh
......@@ -145,11 +145,11 @@ a `stack.yaml` file.
A simple version would be:
```yaml
resolver: lts-14.27
resolver: lts-16.23
packages: []
```
It's recommended to use the same LTS version as the iHaskell image is using itself
It's recommended to use the same LTS version as the IHaskell image is using itself
(as can be seen in [its stack.yaml](./stack.yaml)).
This guarantees that stack doesn't have to first perform
a lengthy installation of GHC before running your notebook.
......@@ -269,7 +269,7 @@ For more examples of using IHaskell with Nix, see https://github.com/vaibhavsaga
Stack manages separate environments for every package. By default your notebooks
will only have access to a few packages that happen to be required for
ihaskell. To make packages available add them to the stack.yaml in the ihaskell
IHaskell. To make packages available add them to the stack.yaml in the IHaskell
directory and run `stack solver && stack install`.
Packages should be added to the `packages:` section and can take the following
......
......@@ -10,6 +10,7 @@
{-# LANGUAGE InstanceSigs #-}
{-# LANGUAGE EmptyCase #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE TypeApplications #-}
module IHaskell.Display.Widgets.Singletons where
......
resolver: lts-15.10
resolver: lts-14.27
flags: {}
packages:
- .
- ./ipython-kernel
- ./ghc-parser
# - ./ihaskell-display/ihaskell-aeson
# - ./ihaskell-display/ihaskell-blaze
# - ./ihaskell-display/ihaskell-charts
# - ./ihaskell-display/ihaskell-diagrams
# - ./ihaskell-display/ihaskell-gnuplot
# - ./ihaskell-display/ihaskell-hatex
# - ./ihaskell-display/ihaskell-juicypixels
# - ./ihaskell-display/ihaskell-magic
- ./ihaskell-display/ihaskell-aeson
- ./ihaskell-display/ihaskell-blaze
- ./ihaskell-display/ihaskell-charts
- ./ihaskell-display/ihaskell-diagrams
- ./ihaskell-display/ihaskell-gnuplot
- ./ihaskell-display/ihaskell-hatex
- ./ihaskell-display/ihaskell-juicypixels
- ./ihaskell-display/ihaskell-magic
# - ./ihaskell-display/ihaskell-plot
# - ./ihaskell-display/ihaskell-static-canvas
# - ./ihaskell-display/ihaskell-widgets
- ./ihaskell-display/ihaskell-widgets
# extra-deps:
# - Chart-cairo-1.9.1
# - diagrams-cairo-1.4.1
# - cairo-0.13.6.0
# - pango-0.13.6.0
# - glib-0.13.7.0
# - gtk2hs-buildtools-0.13.5.0
# - magic-1.1
extra-deps:
- Chart-cairo-1.9.1
- diagrams-cairo-1.4.1
- cairo-0.13.6.0
- pango-0.13.6.1
- glib-0.13.7.1
- gtk2hs-buildtools-0.13.5.4
- magic-1.1
# - plot-0.2.3.9
ghc-options:
# Eventually we want "$locals": -Wall -Wpartial-fields -Werror
# ghc-parser: -Wall -Wpartial-fields -Werror
# ihaskell: -Wall -Wpartial-fields -Werror
# ihaskell-widgets: -Wall -Wpartial-fields -Werror
ghc-parser: -Wall -Wpartial-fields -Werror
ihaskell: -Wall -Wpartial-fields -Werror
ihaskell-widgets: -Wall -Wpartial-fields -Werror
docker:
repo: "ihaskell-dev:latest"
......
resolver: lts-14.27
resolver: lts-16.23
flags: {}
packages:
......@@ -13,25 +13,27 @@ packages:
- ./ihaskell-display/ihaskell-hatex
- ./ihaskell-display/ihaskell-juicypixels
- ./ihaskell-display/ihaskell-magic
# - ./ihaskell-display/ihaskell-plot
- ./ihaskell-display/ihaskell-plot
# - ./ihaskell-display/ihaskell-static-canvas
- ./ihaskell-display/ihaskell-widgets
extra-deps:
- Chart-cairo-1.9.1
- diagrams-cairo-1.4.1
- cairo-0.13.6.0
- pango-0.13.6.1
- glib-0.13.7.1
- gtk2hs-buildtools-0.13.5.4
- Chart-cairo-1.9.3
- diagrams-cairo-1.4.1.1
- cairo-0.13.8.1
- pango-0.13.8.1
- glib-0.13.8.1
- gtk2hs-buildtools-0.13.8.0
- magic-1.1
# - plot-0.2.3.9
- plot-0.2.3.11
# - static-canvas-0.2.0.3
- vinyl-0.13.0
ghc-options:
# Eventually we want "$locals": -Wall -Wpartial-fields -Werror
ghc-parser: -Wall -Wpartial-fields -Werror
ihaskell: -Wall -Wpartial-fields -Werror
ihaskell-widgets: -Wall -Wpartial-fields -Werror
# ghc-parser: -Wall -Wpartial-fields -Werror
# ihaskell: -Wall -Wpartial-fields -Werror
# ihaskell-widgets: -Wall -Wpartial-fields -Werror
docker:
repo: "ihaskell-dev:latest"
......
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