Skip to content

Commit

Permalink
Allow building with GHC 8.0
Browse files Browse the repository at this point in the history 
Fixes commercialhaskell/stackage#1476

Conflicts:
	examples/blank-canvas-examples.cabal
  • Loading branch information
@RyanGlScott
RyanGlScott committed Sep 26, 2017
1 parent bd90513 commit 68395fc
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ matrix:
- env: CABALVER=1.22 GHCVER=7.10.3
compiler: ": #GHC 7.10.3"
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
- env: CABALVER=1.24 GHCVER=8.0.1
compiler: ": #GHC 8.0.1"
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
- env: CABALVER=head GHCVER=head
compiler: ": #GHC head"
addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
Expand Down
10 changes: 5 additions & 5 deletions blank-canvas.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Library
default-language: Haskell2010
build-depends: aeson >= 0.7 && < 0.12,
base64-bytestring == 1.0.*,
base >= 4.6 && < 4.9,
base >= 4.6 && < 4.10,
base-compat >= 0.8.1 && < 1,
bytestring == 0.10.*,
colour >= 2.2 && < 3.0,
Expand All @@ -83,7 +83,7 @@ Library
stm >= 2.2 && < 2.5,
text >= 1.1 && < 1.3,
text-show >= 2 && < 4,
transformers >= 0.3 && < 0.5,
transformers >= 0.3 && < 0.6,
wai == 3.*,
wai-extra >= 3.0.1 && < 3.1,
warp == 3.*,
Expand All @@ -94,15 +94,15 @@ Library


test-suite wiki-suite
build-depends: base >= 4.6 && < 4.9,
build-depends: base >= 4.6 && < 4.10,
blank-canvas == 0.6.*,
containers == 0.5.*,
process == 1.2.*,
process >= 1.2 && < 1.5,
directory >= 1.2,
shake >= 0.13,
stm >= 2.2 && < 2.5,
text >= 1.1 && < 1.3,
time >= 1.4 && < 1.6,
time >= 1.4 && < 1.7,
unix == 2.7.*,
vector >= 0.10 && < 0.12

Expand Down
22 changes: 11 additions & 11 deletions examples/blank-canvas-examples.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ executable blank-canvas-example-trivial
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.6 && < 4.9,
build-depends: base >= 4.6 && < 4.10,
blank-canvas == 0.6.*
hs-source-dirs: trivial
default-language: Haskell2010
Expand All @@ -48,7 +48,7 @@ executable blank-canvas-example-html5canvastutorial
buildable: False
main-is: Main.hs
other-modules: Paths_blank_canvas_examples
build-depends: base >= 4.6 && < 4.9,
build-depends: base >= 4.6 && < 4.10,
base-compat >= 0.8.1 && < 1,
blank-canvas == 0.6.*,
text >= 1.1 && < 1.3
Expand All @@ -62,7 +62,7 @@ executable blank-canvas-example-keyread
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.6 && < 4.9,
build-depends: base >= 4.6 && < 4.10,
blank-canvas == 0.6.*,
text >= 1.1 && < 1.3
hs-source-dirs: keyread
Expand All @@ -75,7 +75,7 @@ executable blank-canvas-example-rotate-square
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.6 && < 4.9,
build-depends: base >= 4.6 && < 4.10,
blank-canvas == 0.6.*
hs-source-dirs: rotate-square
default-language: Haskell2010
Expand All @@ -87,7 +87,7 @@ executable blank-canvas-example-splat
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.6 && < 4.9,
build-depends: base >= 4.6 && < 4.10,
blank-canvas == 0.6.*
hs-source-dirs: splat
default-language: Haskell2010
Expand All @@ -99,7 +99,7 @@ executable blank-canvas-example-square
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.6 && < 4.9,
build-depends: base >= 4.6 && < 4.10,
blank-canvas == 0.6.*
hs-source-dirs: square
default-language: Haskell2010
Expand All @@ -111,7 +111,7 @@ executable blank-canvas-example-text
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.6 && < 4.9,
build-depends: base >= 4.6 && < 4.10,
blank-canvas == 0.6.*,
text >= 1.1 && < 1.3
hs-source-dirs: text
Expand All @@ -124,7 +124,7 @@ executable blank-canvas-example-tictactoe
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.6 && < 4.9,
build-depends: base >= 4.6 && < 4.10,
blank-canvas == 0.6.*,
containers >= 0.5 && < 0.6,
text >= 1.1 && < 1.3
Expand All @@ -139,7 +139,7 @@ executable blank-canvas-example-bounce
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.6 && < 4.9,
build-depends: base >= 4.6 && < 4.10,
blank-canvas == 0.6.*,
text >= 1.1 && < 1.3
hs-source-dirs: bounce
Expand All @@ -153,7 +153,7 @@ executable blank-canvas-example-audio
buildable: False
main-is: Main.hs
other-modules: Paths_blank_canvas_examples
build-depends: base >= 4.6 && < 4.9,
build-depends: base >= 4.6 && < 4.10,
blank-canvas == 0.6.*
hs-source-dirs: audio
default-language: Haskell2010
Expand All @@ -166,7 +166,7 @@ executable blank-canvas-example-cursor
buildable: False
main-is: Main.hs
other-modules: Paths_blank_canvas_examples
build-depends: base >= 4.6 && < 4.9,
build-depends: base >= 4.6 && < 4.10,
blank-canvas == 0.6.*,
keys >= 3.10,
text >= 1.1 && < 1.3
Expand Down
6 changes: 3 additions & 3 deletions wiki-suite/wiki-suite.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ data-files: images/Haskell.jpg
images/House.jpg

executable wiki-suite
build-depends: base >= 4.6 && < 4.9,
build-depends: base >= 4.6 && < 4.10,
blank-canvas == 0.6.*,
containers == 0.5.*,
process == 1.2.*,
process >= 1.2 && < 1.5,
stm >= 2.2 && < 2.5,
text >= 1.1 && < 1.3,
time >= 1.4 && < 1.6,
time >= 1.4 && < 1.7,
unix == 2.7.*,
vector >= 0.10 && < 0.12

Expand Down

0 comments on commit 68395fc

Please sign in to comment.