Skip to content

Commit

Permalink
Allow building with base-4.20.* (GHC 9.10)
Browse files Browse the repository at this point in the history
  • Loading branch information
@RyanGlScott
RyanGlScott committed Apr 20, 2024
1 parent 15c491c commit 9e3f6c6
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion blank-canvas.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Library
default-language: Haskell2010
build-depends: aeson >= 1.4.4 && < 2.3,
base64-bytestring >= 1.0 && < 1.3,
base >= 4.11 && < 4.20,
base >= 4.11 && < 4.21,
base-compat >= 0.11 && < 0.14,
bytestring >= 0.10 && < 0.13,
colour >= 2.2 && < 2.4,
Expand Down
2 changes: 1 addition & 1 deletion cabal.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ package blank-canvas-examples
source-repository-package
type: git
location: https://github.com/ku-fpg/javascript-bridge
tag: 077294e5d73753c0ddaab42a6d0c5b49504fe991
tag: 683aff351c70c1ccb7cff6227fc14241ac4ada48
26 changes: 13 additions & 13 deletions examples/blank-canvas-examples.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ executable blank-canvas-example-trivial
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.11&& < 4.20,
build-depends: base >= 4.11&& < 4.21,
blank-canvas
hs-source-dirs: trivial
default-language: Haskell2010
Expand All @@ -61,7 +61,7 @@ executable blank-canvas-example-html5canvastutorial
buildable: False
main-is: Main.hs
other-modules: Paths_blank_canvas_examples
build-depends: base >= 4.11 && < 4.20,
build-depends: base >= 4.11 && < 4.21,
base-compat >= 0.11 && < 0.14,
blank-canvas,
text >= 1.1 && < 2.2
Expand All @@ -75,7 +75,7 @@ executable blank-canvas-example-keyread
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.11 && < 4.20,
build-depends: base >= 4.11 && < 4.21,
base-compat >= 0.11 && < 0.14,
blank-canvas,
text >= 1.1 && < 2.2
Expand All @@ -89,7 +89,7 @@ executable blank-canvas-example-rotate-square
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.11&& < 4.20,
build-depends: base >= 4.11&& < 4.21,
blank-canvas,
open-browser >= 0.2.1,
text
Expand All @@ -103,7 +103,7 @@ executable blank-canvas-example-splat
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.11&& < 4.20,
build-depends: base >= 4.11&& < 4.21,
blank-canvas
hs-source-dirs: splat
default-language: Haskell2010
Expand All @@ -115,7 +115,7 @@ executable blank-canvas-example-square
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.11&& < 4.20,
build-depends: base >= 4.11&& < 4.21,
blank-canvas
hs-source-dirs: square
default-language: Haskell2010
Expand All @@ -127,7 +127,7 @@ executable blank-canvas-example-text
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.11 && < 4.20,
build-depends: base >= 4.11 && < 4.21,
base-compat >= 0.11 && < 0.14,
blank-canvas,
text >= 1.1 && < 2.2
Expand All @@ -141,7 +141,7 @@ executable blank-canvas-example-tictactoe
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.11&& < 4.20,
build-depends: base >= 4.11&& < 4.21,
blank-canvas,
containers >= 0.5 && < 0.8,
text >= 1.1 && < 2.2
Expand All @@ -156,7 +156,7 @@ executable blank-canvas-example-bounce
else
buildable: False
main-is: Main.hs
build-depends: base >= 4.11&& < 4.20,
build-depends: base >= 4.11&& < 4.21,
blank-canvas,
streams >= 0.1,
text >= 1.1 && < 2.2
Expand All @@ -171,7 +171,7 @@ executable blank-canvas-example-bounce
-- buildable: False
-- main-is: Main.hs
-- other-modules: Paths_blank_canvas_examples
-- build-depends: base >= 4.11&& < 4.20,
-- build-depends: base >= 4.11&& < 4.21,
-- blank-canvas,
-- text >= 1.1 && < 2.2
-- hs-source-dirs: audio
Expand All @@ -184,7 +184,7 @@ executable blank-canvas-example-bounce
-- else
-- buildable: False
-- main-is: Main.hs
-- build-depends: base >= 4.11&& < 4.20,
-- build-depends: base >= 4.11&& < 4.21,
-- blank-canvas,
-- text >= 1.1 && < 2.2
-- hs-source-dirs: bounceAudio
Expand All @@ -198,7 +198,7 @@ executable blank-canvas-example-bounce
-- buildable: False
-- main-is: Main.hs
-- other-modules: Paths_blank_canvas_examples
-- build-depends: base >= 4.11&& < 4.20,
-- build-depends: base >= 4.11&& < 4.21,
-- blank-canvas,
-- text >= 1.1 && < 2.2,
-- stm >= 2.2 && < 2.6
Expand All @@ -213,7 +213,7 @@ executable blank-canvas-example-cursor
buildable: False
main-is: Main.hs
other-modules: Paths_blank_canvas_examples
build-depends: base >= 4.11 && < 4.20,
build-depends: base >= 4.11 && < 4.21,
base-compat >= 0.11 && < 0.14,
blank-canvas,
keys >= 3.10,
Expand Down
2 changes: 1 addition & 1 deletion wiki-suite/wiki-suite.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ data-files: images/Haskell.jpg
images/House.jpg

executable wiki-suite
build-depends: base >= 4.11 && < 4.20,
build-depends: base >= 4.11 && < 4.21,
base-compat >= 0.11 && < 0.14,
blank-canvas,
containers >= 0.5 && < 0.8,
Expand Down

0 comments on commit 9e3f6c6

Please sign in to comment.