Skip to content

Commit

Permalink
Merge pull request #905 from Hi-Angel/master
Browse files Browse the repository at this point in the history
Improvement of .yaml files, and a fix for runtime error
  • Loading branch information
ethercrow committed Sep 2, 2016
2 parents aa5197e + 070638e commit 51855c9
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 27 deletions.
14 changes: 8 additions & 6 deletions example-configs/yi-emacs-vty-static/lts.yaml
@@ -1,10 +1,12 @@
resolver: lts-6.9
packages:
- '.'
- '../../yi-core'
- '../../yi-frontend-vty'
- '../../yi-keymap-emacs'
- '../../yi-misc-modes'
- '../../yi-mode-haskell'
- location: '../../'
subdirs:
- 'yi-core'
- 'yi-frontend-vty'
- 'yi-keymap-emacs'
- 'yi-misc-modes'
- 'yi-mode-haskell'
extra-deps:
- ListLike-4.5
- ListLike-4.5
4 changes: 2 additions & 2 deletions example-configs/yi-emacs-vty-static/package.yaml
Expand Up @@ -5,7 +5,7 @@ maintainer: Yi developers <yi-devel@googlegroups.com>
github: yi-editor/yi
category: Yi

ghc-options: -Wall -ferror-spans
ghc-options: -Wall -ferror-spans -threaded

dependencies:
- base >= 4.8
Expand All @@ -21,4 +21,4 @@ dependencies:
executables:
yi-emacs-vty:
main: Main.hs
source-dirs: .
source-dirs: .
14 changes: 8 additions & 6 deletions example-configs/yi-emacs-vty-static/stack.yaml
@@ -1,9 +1,11 @@
resolver: nightly-2016-07-28
packages:
- '.'
- '../../yi-core'
- '../../yi-frontend-vty'
- '../../yi-keymap-emacs'
- '../../yi-misc-modes'
- '../../yi-mode-haskell'
extra-deps: []
- location: '../../'
subdirs:
- 'yi-core'
- 'yi-frontend-vty'
- 'yi-keymap-emacs'
- 'yi-misc-modes'
- 'yi-mode-haskell'
extra-deps: []
14 changes: 8 additions & 6 deletions example-configs/yi-vim-vty-static/lts.yaml
@@ -1,10 +1,12 @@
resolver: lts-6.9
packages:
- '.'
- '../../yi-core'
- '../../yi-frontend-vty'
- '../../yi-keymap-vim'
- '../../yi-misc-modes'
- '../../yi-mode-haskell'
- location: '../../'
subdirs:
- 'yi-core'
- 'yi-frontend-vty'
- 'yi-keymap-vim'
- 'yi-misc-modes'
- 'yi-mode-haskell'
extra-deps:
- ListLike-4.5
- ListLike-4.5
2 changes: 1 addition & 1 deletion example-configs/yi-vim-vty-static/package.yaml
Expand Up @@ -5,7 +5,7 @@ maintainer: Yi developers <yi-devel@googlegroups.com>
github: yi-editor/yi
category: Yi

ghc-options: -Wall -ferror-spans
ghc-options: -Wall -ferror-spans -threaded

dependencies:
- base >= 4.8
Expand Down
14 changes: 8 additions & 6 deletions example-configs/yi-vim-vty-static/stack.yaml
@@ -1,9 +1,11 @@
resolver: nightly-2016-07-28
packages:
- '.'
- '../../yi-core'
- '../../yi-frontend-vty'
- '../../yi-keymap-vim'
- '../../yi-misc-modes'
- '../../yi-mode-haskell'
extra-deps: []
- location: '../../'
subdirs:
- 'yi-core'
- 'yi-frontend-vty'
- 'yi-keymap-vim'
- 'yi-misc-modes'
- 'yi-mode-haskell'
extra-deps: []

0 comments on commit 51855c9

Please sign in to comment.