Skip to content

Commit 3640bde

Browse files
author
Mitsutoshi Aoe
authored
Merge pull request #80 from haskell/ghc-events-0.7
Relax upper version bound for ghc-events and work around build issues
2 parents 8616527 + f255f2d commit 3640bde

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ before_cache:
2929

3030
matrix:
3131
include:
32-
- compiler: "ghc-7.6.3"
33-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
34-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.6.3,libgtk2.0-dev], sources: [hvr-ghc]}}
3532
- compiler: "ghc-7.8.3"
3633
# env: TEST=--disable-tests BENCH=--disable-benchmarks
3734
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.3,libgtk2.0-dev], sources: [hvr-ghc]}}

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ install:
1212
- curl -ostack.zip -LsS --insecure https://www.stackage.org/stack/windows-x86_64
1313
- 7z x stack.zip stack.exe
1414
- stack setup > nul
15-
- stack exec -- pacman --noconfirm --needed -Sy bash pacman pacman-mirrors msys2-runtime msys2-runtime-devel
15+
- stack exec -- pacman --noconfirm --needed --ask 20 -Sy bash pacman pacman-mirrors msys2-runtime msys2-runtime-devel
1616
- stack exec -- pacman --noconfirm -Syu
1717
- stack exec -- pacman --noconfirm -Syuu
1818
- stack exec -- pacman --noconfirm -S base-devel mingw-w64-x86_64-pkg-config mingw-w64-x86_64-toolchain mingw-w64-x86_64-gtk2

threadscope.cabal

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ Cabal-version: >= 1.6
3535
Data-files: threadscope.ui, threadscope.png
3636
Extra-source-files: include/windows_cconv.h
3737
README.md
38-
Tested-with: GHC == 7.6.3,
39-
GHC == 7.8.3,
38+
Tested-with: GHC == 7.8.3,
4039
GHC == 7.10.2,
4140
GHC == 8.0.2,
4241
GHC == 8.2.1
@@ -56,7 +55,7 @@ Executable threadscope
5655
array < 0.6,
5756
mtl < 2.3,
5857
filepath < 1.5,
59-
ghc-events >= 0.5 && < 0.7,
58+
ghc-events >= 0.5 && < 0.8,
6059
containers >= 0.2 && < 0.6,
6160
deepseq >= 1.1,
6261
text < 1.3,

0 commit comments

Comments
 (0)