From 133060e2b8ecec0d7b021f529e183ade26b2bcca Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Sat, 20 Apr 2024 14:58:41 -0400 Subject: [PATCH] Allow building with base-4.20.* (GHC 9.10) --- blank-canvas.cabal | 2 +- examples/blank-canvas-examples.cabal | 22 +++++++++++----------- wiki-suite/wiki-suite.cabal | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/blank-canvas.cabal b/blank-canvas.cabal index 7e634d1..ed38d62 100644 --- a/blank-canvas.cabal +++ b/blank-canvas.cabal @@ -79,7 +79,7 @@ Library default-language: Haskell2010 build-depends: aeson >= 1.4.4 && < 2.3, base64-bytestring >= 1.0 && < 1.3, - base >= 4.9 && < 4.20, + base >= 4.9 && < 4.21, base-compat-batteries >= 0.10 && < 0.14, bytestring >= 0.10 && < 0.13, colour >= 2.2 && < 2.4, diff --git a/examples/blank-canvas-examples.cabal b/examples/blank-canvas-examples.cabal index 0d10814..0274a2b 100644 --- a/examples/blank-canvas-examples.cabal +++ b/examples/blank-canvas-examples.cabal @@ -45,7 +45,7 @@ executable blank-canvas-example-trivial else buildable: False main-is: Main.hs - build-depends: base >= 4.9 && < 4.20, + build-depends: base >= 4.9 && < 4.21, blank-canvas hs-source-dirs: trivial default-language: Haskell2010 @@ -58,7 +58,7 @@ executable blank-canvas-example-html5canvastutorial buildable: False main-is: Main.hs other-modules: Paths_blank_canvas_examples - build-depends: base >= 4.9 && < 4.20, + build-depends: base >= 4.9 && < 4.21, base-compat-batteries >= 0.10 && < 0.14, blank-canvas, text >= 1.1 && < 2.2 @@ -72,7 +72,7 @@ executable blank-canvas-example-keyread else buildable: False main-is: Main.hs - build-depends: base >= 4.9 && < 4.20, + build-depends: base >= 4.9 && < 4.21, base-compat-batteries >= 0.10 && < 0.14, blank-canvas, text >= 1.1 && < 2.2 @@ -86,7 +86,7 @@ executable blank-canvas-example-rotate-square else buildable: False main-is: Main.hs - build-depends: base >= 4.9 && < 4.20, + build-depends: base >= 4.9 && < 4.21, blank-canvas hs-source-dirs: rotate-square default-language: Haskell2010 @@ -98,7 +98,7 @@ executable blank-canvas-example-splat else buildable: False main-is: Main.hs - build-depends: base >= 4.9 && < 4.20, + build-depends: base >= 4.9 && < 4.21, blank-canvas hs-source-dirs: splat default-language: Haskell2010 @@ -110,7 +110,7 @@ executable blank-canvas-example-square else buildable: False main-is: Main.hs - build-depends: base >= 4.9 && < 4.20, + build-depends: base >= 4.9 && < 4.21, blank-canvas hs-source-dirs: square default-language: Haskell2010 @@ -122,7 +122,7 @@ executable blank-canvas-example-text else buildable: False main-is: Main.hs - build-depends: base >= 4.9 && < 4.20, + build-depends: base >= 4.9 && < 4.21, base-compat-batteries >= 0.10 && < 0.14, blank-canvas, text >= 1.1 && < 2.2 @@ -136,7 +136,7 @@ executable blank-canvas-example-tictactoe else buildable: False main-is: Main.hs - build-depends: base >= 4.9 && < 4.20, + build-depends: base >= 4.9 && < 4.21, blank-canvas, containers >= 0.5 && < 0.8, text >= 1.1 && < 2.2 @@ -151,7 +151,7 @@ executable blank-canvas-example-bounce else buildable: False main-is: Main.hs - build-depends: base >= 4.9 && < 4.20, + build-depends: base >= 4.9 && < 4.21, blank-canvas, streams >= 0.1, text >= 1.1 && < 2.2 @@ -166,7 +166,7 @@ executable blank-canvas-example-audio buildable: False main-is: Main.hs other-modules: Paths_blank_canvas_examples - build-depends: base >= 4.9 && < 4.20, + build-depends: base >= 4.9 && < 4.21, blank-canvas hs-source-dirs: audio default-language: Haskell2010 @@ -179,7 +179,7 @@ executable blank-canvas-example-cursor buildable: False main-is: Main.hs other-modules: Paths_blank_canvas_examples - build-depends: base >= 4.9 && < 4.20, + build-depends: base >= 4.9 && < 4.21, base-compat-batteries >= 0.10 && < 0.14, blank-canvas, keys >= 3.10, diff --git a/wiki-suite/wiki-suite.cabal b/wiki-suite/wiki-suite.cabal index 0ba52bc..8fc6973 100644 --- a/wiki-suite/wiki-suite.cabal +++ b/wiki-suite/wiki-suite.cabal @@ -22,7 +22,7 @@ data-files: images/Haskell.jpg images/House.jpg executable wiki-suite - build-depends: base >= 4.9 && < 4.20, + build-depends: base >= 4.9 && < 4.21, base-compat-batteries >= 0.10 && < 0.14, blank-canvas, containers >= 0.5 && < 0.8,