Skip to content

Commit 94959ca

Browse files
author
Jaro Reinders
committed
Allow yi to build with ghc-8.2 (without pango)
1 parent 4cf5289 commit 94959ca

6 files changed

+61
-21
lines changed

.travis.yml

+16-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@ cache:
1111

1212
matrix:
1313
include:
14-
- env: RESOLVER="lts-8"
1514
- env: RESOLVER="lts-9"
15+
addons:
16+
apt:
17+
packages:
18+
- libpango1.0-dev
19+
- libgtk2.0-dev
1620
- env: RESOLVER="nightly"
1721
allow_failures:
1822
- env: RESOLVER="nightly"
@@ -25,8 +29,16 @@ before_install:
2529

2630
install:
2731
# install dependencies of yi-core separately to safe memory
28-
- stack --no-terminal --install-ghc --resolver $RESOLVER test yi-core --only-dependencies
29-
- stack --no-terminal --install-ghc --resolver $RESOLVER test --only-dependencies
32+
- stack test yi-core --no-terminal
33+
--install-ghc
34+
--stack-yaml $RESOLVER.yaml
35+
--resolver $RESOLVER
36+
--only-dependencies
37+
- stack test --no-terminal
38+
--install-ghc
39+
--stack-yaml $RESOLVER.yaml
40+
--resolver $RESOLVER
41+
--only-dependencies
3042

3143
script:
32-
- stack --no-terminal --resolver $RESOLVER test
44+
- stack --no-terminal --stack-yaml $RESOLVER.yaml --resolver $RESOLVER test

lts-9.yaml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
packages:
2+
- yi-core
3+
- yi-dynamic-configuration
4+
- yi-frontend-vty
5+
- yi-frontend-pango
6+
- yi-fuzzy-open
7+
- yi-keymap-cua
8+
- yi-keymap-emacs
9+
- yi-keymap-vim
10+
- yi-mode-haskell
11+
- yi-mode-javascript
12+
- yi-misc-modes
13+
- yi-intero
14+
- yi-ireader
15+
- yi-language
16+
- yi-snippet
17+
- yi
18+
extra-deps:
19+
- yi-rope-0.10
20+
resolver: lts-9.8

nightly.yaml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
resolver: nightly-2017-10-11
2+
3+
packages:
4+
- yi-core
5+
- yi-dynamic-configuration
6+
- yi-frontend-vty
7+
# - yi-frontend-pango
8+
- yi-fuzzy-open
9+
- yi-keymap-cua
10+
- yi-keymap-emacs
11+
- yi-keymap-vim
12+
- yi-mode-haskell
13+
- yi-mode-javascript
14+
- yi-misc-modes
15+
- yi-ireader
16+
- yi-language
17+
- yi-snippet
18+
- yi

stack-ghc-8.2.yaml

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2017-08-20
1+
resolver: nightly-2017-10-11
22

33
packages:
44
- yi-core
@@ -15,14 +15,4 @@ packages:
1515
- yi-ireader
1616
- yi-language
1717
- yi-snippet
18-
# - yi
19-
extra-deps:
20-
- Hclip-3.0.0.4
21-
- yi-rope-0.10
22-
- dynamic-state-0.3
23-
# - gtk-0.14.6
24-
# - cairo-0.13.3.1
25-
# - gio-0.13.3.1
26-
# - glib-0.13.4.1
27-
# - gtk2hs-buildtools-0.13.2.2
28-
# - pango-0.13.3.1
18+
- yi

stack.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ packages:
55
- yi-core
66
- yi-dynamic-configuration
77
- yi-frontend-vty
8-
# - yi-frontend-pango
8+
- yi-frontend-pango
99
- yi-fuzzy-open
1010
- yi-keymap-cua
1111
- yi-keymap-emacs
@@ -17,15 +17,15 @@ packages:
1717
- yi-ireader
1818
- yi-language
1919
- yi-snippet
20-
# - yi
20+
- yi
2121
extra-deps:
2222
- yi-rope-0.10
23-
resolver: lts-8.18
23+
resolver: lts-9.8
2424
build:
2525
library-profiling: false
2626
executable-profiling: false
2727

2828
# needed for macOS
2929
# flags:
3030
# gtk:
31-
# have-quartz-gtk: true
31+
# have-quartz-gtk: true

yi/yi.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ executable yi
5252
cpp-options: -DVTY
5353
build-depends:
5454
yi-frontend-vty >= 0.17
55-
if flag(pango)
55+
if flag(pango) && impl(ghc < 8.2)
5656
cpp-options: -DPANGO
5757
build-depends:
5858
yi-frontend-pango >= 0.17

0 commit comments

Comments
 (0)