Skip to content

Commit

Permalink
Merge pull request #1 from kushagarr/ghc_9.6_compatible
Browse files Browse the repository at this point in the history
Works with ghc 9.6
  • Loading branch information
sigrdrifa authored Jul 13, 2024
2 parents 78f515d + a4c1330 commit 088f394
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions hastl.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ library
build-depends:
katip == 0.8.8.0,
aeson >= 2.2.2 && < 2.3,
base >= 4.17.2 && < 4.18,
base ^>= {4.17.2, 4.18.2},
containers >= 0.6.7 && < 0.7,
random >= 1.2.1 && < 1.3,
bytestring >= 0.11.5 && < 0.12,
mtl >= 2.2.2 && < 2.3,
transformers >= 0.5.6 && < 0.6,
text >= 2.0.2 && < 2.1,
mtl ^>= {2.2.2, 2.3.1},
transformers ^>= {0.5.6, 0.6.1},
text >= 2.0.2 && < 2.2,
unordered-containers >= 0.2.20 && < 0.3,
time >= 1.12.2 && < 1.13,
dani-servant-lucid2 >= 0.1.0 && < 0.2,
Expand Down Expand Up @@ -79,7 +79,7 @@ executable hastl
-- other-modules:
-- other-extensions:
build-depends:
base ^>=4.17.2.1,
base ^>= {4.17.2, 4.18.2},
hastl

hs-source-dirs: app
Expand All @@ -97,7 +97,7 @@ test-suite hastl-test
main-is: Main.hs
build-tool-depends: hspec-discover:hspec-discover
build-depends:
base ^>=4.17.2.1
base ^>= {4.17.2, 4.18.2}
, hastl
, hspec
, persistent-postgresql
Expand All @@ -115,7 +115,7 @@ test-suite hastl-test-integration
main-is: Main.hs
other-modules: TestHttpSpec
build-depends:
base ^>=4.17.2.1,
base ^>= {4.17.2, 4.18.2},
hastl,
hspec,
testcontainers,
Expand Down
2 changes: 1 addition & 1 deletion lib/Api/Base.hs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import Api.Templates.Base.Home (renderHome)
import Api.Templates.Helpers.Alpine (useAlpine)
import Api.Templates.Helpers.Htmx (useHtmxJsExt, useHtmxVersion)
import Config (AppT)
import Control.Monad.Cont (MonadIO)
import Control.Monad.IO.Class (MonadIO)
import Data.Text (Text)
import Servant.API.ContentTypes.Lucid (HTML)

Expand Down
2 changes: 1 addition & 1 deletion lib/Api/User.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module Api.User where

import Control.Monad.Except (MonadIO (liftIO))
import Control.Monad.IO.Class (MonadIO (liftIO))
import Control.Monad.Logger (logDebugNS, logErrorNS)
import Database.Persist.Postgresql (
Entity (..),
Expand Down

0 comments on commit 088f394

Please sign in to comment.