Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build issues with GHC 9.6 #308

Merged
merged 1 commit into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions monomer.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ library
, formatting >=6.0 && <8.0
, http-client >=0.6 && <0.9
, lens >=4.16 && <6
, mtl >=2.1 && <2.3
, mtl >=2.1 && <2.4
, nanovg >=0.8.1 && <1.0
, process ==1.6.*
, sdl2 >=2.5.0 && <2.6
Expand Down Expand Up @@ -230,7 +230,7 @@ executable books
, http-client >=0.6 && <0.9
, lens >=4.16 && <6
, monomer
, mtl >=2.1 && <2.3
, mtl >=2.1 && <2.4
, nanovg >=0.8.1 && <1.0
, process ==1.6.*
, sdl2 >=2.5.0 && <2.6
Expand Down Expand Up @@ -273,7 +273,7 @@ executable dev-test-app
, http-client >=0.6 && <0.9
, lens >=4.16 && <6
, monomer
, mtl >=2.1 && <2.3
, mtl >=2.1 && <2.4
, nanovg >=0.8.1 && <1.0
, process ==1.6.*
, sdl2 >=2.5.0 && <2.6
Expand Down Expand Up @@ -315,7 +315,7 @@ executable generative
, http-client >=0.6 && <0.9
, lens >=4.16 && <6
, monomer
, mtl >=2.1 && <2.3
, mtl >=2.1 && <2.4
, nanovg >=0.8.1 && <1.0
, process ==1.6.*
, random >=1.1 && <1.3
Expand Down Expand Up @@ -360,7 +360,7 @@ executable opengl
, http-client >=0.6 && <0.9
, lens >=4.16 && <6
, monomer
, mtl >=2.1 && <2.3
, mtl >=2.1 && <2.4
, nanovg >=0.8.1 && <1.0
, process ==1.6.*
, random >=1.1 && <1.3
Expand Down Expand Up @@ -407,7 +407,7 @@ executable ticker
, http-client >=0.6 && <0.9
, lens >=4.16 && <6
, monomer
, mtl >=2.1 && <2.3
, mtl >=2.1 && <2.4
, nanovg >=0.8.1 && <1.0
, process ==1.6.*
, sdl2 >=2.5.0 && <2.6
Expand Down Expand Up @@ -453,7 +453,7 @@ executable todo
, http-client >=0.6 && <0.9
, lens >=4.16 && <6
, monomer
, mtl >=2.1 && <2.3
, mtl >=2.1 && <2.4
, nanovg >=0.8.1 && <1.0
, process ==1.6.*
, sdl2 >=2.5.0 && <2.6
Expand Down Expand Up @@ -504,7 +504,7 @@ executable tutorial
, http-client >=0.6 && <0.9
, lens >=4.16 && <6
, monomer
, mtl >=2.1 && <2.3
, mtl >=2.1 && <2.4
, nanovg >=0.8.1 && <1.0
, process ==1.6.*
, random >=1.1 && <1.3
Expand Down Expand Up @@ -603,7 +603,7 @@ test-suite monomer-test
, http-client >=0.6 && <0.9
, lens >=4.16 && <6
, monomer
, mtl >=2.1 && <2.3
, mtl >=2.1 && <2.4
, nanovg >=0.8.1 && <1.0
, process ==1.6.*
, sdl2 >=2.5.0 && <2.6
Expand Down
2 changes: 1 addition & 1 deletion package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies:
- http-client >= 0.6 && < 0.9
- JuicyPixels >= 3.2.9 && < 3.5
- lens >= 4.16 && < 6
- mtl >= 2.1 && < 2.3
- mtl >= 2.1 && < 2.4
- nanovg >= 0.8.1 && < 1.0
- OpenGLRaw >= 3.3 && < 3.4
- process >= 1.6 && < 1.7
Expand Down
1 change: 1 addition & 0 deletions src/Monomer/Main/Platform.hs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ module Monomer.Main.Platform (
) where

import Control.Exception (finally)
import Control.Monad (when, void, forM_)
import Control.Monad.Extra (whenJust)
import Control.Monad.State
import Data.Maybe
Expand Down
3 changes: 2 additions & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
#resolver: lts-14.27
#resolver: lts-17.15
#resolver: lts-18.27
resolver: lts-20.21
#resolver: lts-20.21
resolver: nightly-2023-11-26

# User packages to be built.
# Various formats can be used as shown in the example below.
Expand Down
8 changes: 4 additions & 4 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
hackage: nanovg-0.8.1.0@sha256:bfcbe0dc0020aaa80db895966c9cf1b8aa4f13ac5253e713d728165fea7e9fc1,4914
snapshots:
- completed:
sha256: 401a0e813162ba62f04517f60c7d25e93a0f867f94a902421ebf07d1fb5a8c46
size: 650044
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/21.yaml
original: lts-20.21
sha256: 27a947b3046cc724c67af689f023b1c59ff22c55df3452d7cdcca793b668e054
size: 699418
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/11/26.yaml
original: nightly-2023-11-26
1 change: 1 addition & 0 deletions test/unit/Monomer/TestUtil.hs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ module Monomer.TestUtil where
import Control.Concurrent (newMVar)
import Control.Concurrent.STM.TChan (newTChanIO)
import Control.Lens ((&), (^.), (.~), (.=), (+~))
import Control.Monad (foldM)
import Control.Monad.State
import Data.Default
import Data.Maybe
Expand Down