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.

Sign up for GitHub

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

Update for ghc 9.6.2 #302

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update for ghc 9.6.2 #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f693522
Fix compilation errors
alhirzel Aug 10, 2023
8efb6b9
Allow later versions of mtl (adds support for GHC 9.6.2)
alhirzel Aug 10, 2023
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
20 changes: 10 additions & 10 deletions monomer.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.1.
-- This file has been generated from package.yaml by hpack version 0.35.2.
--
-- see: https://github.com/sol/hpack

Expand Down 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 && <3
, 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 && <3
, 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 && <3
, 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 && <3
, 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 && <3
, 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 && <3
, 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 && <3
, 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 && <3
, 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 && <3
, 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
View file
Open in desktop
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 && < 3
- nanovg >= 0.8.1 && < 1.0
- OpenGLRaw >= 3.3 && < 3.4
- process >= 1.6 && < 1.7
Expand Down
5 changes: 3 additions & 2 deletions src/Monomer/Main/Platform.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Portability : non-portable

Helper functions for SDL platform related operations.
-}
{-# LANGUAGE Strict #-}
{-# LANGUAGE ForeignFunctionInterface, Strict #-}

module Monomer.Main.Platform (
defaultWindowSize,
Expand All @@ -23,7 +23,8 @@ module Monomer.Main.Platform (
) where

import Control.Exception (finally)
import Control.Monad.Extra (whenJust)
import Control.Monad (void)
import Control.Monad.Extra (forM_, when, whenJust)
import Control.Monad.State
import Data.Maybe
import Data.Text (Text)
Expand Down