Skip to content

Commit

Permalink
Merge pull request #15 from rickowens/pr
Browse files Browse the repository at this point in the history
feat: Support ghc-9.10.
  • Loading branch information
rickowens authored Aug 13, 2024
2 parents 934fc32 + e841fd7 commit ef54c00
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 57 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ jobs:
- '9.4'
- '9.6'
- '9.8'
cabal-version: ['3.10.2.0']
- '9.10'
cabal-version: ['3.12.1.0']
steps:
# Checkout
- uses: actions/checkout@v3
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
/cabal.project.local
/.tags.lock
/tags
*.full-imports
109 changes: 55 additions & 54 deletions cabal.project.freeze
Original file line number Diff line number Diff line change
@@ -1,55 +1,57 @@
active-repositories: hackage.haskell.org:merge, owensmurray:merge
constraints: any.OneTuple ==0.4.1.1,
any.QuickCheck ==2.14.3,
constraints: any.OneTuple ==0.4.2,
any.QuickCheck ==2.15.0.1,
QuickCheck -old-random +templatehaskell,
any.StateVar ==1.2.2,
any.aeson ==2.2.1.0,
any.aeson ==2.2.3.0,
aeson +ordered-keymap,
any.array ==0.5.6.0,
any.assoc ==1.1,
assoc +tagged,
any.array ==0.5.7.0,
any.assoc ==1.1.1,
assoc -tagged,
any.async ==2.2.5,
async -bench,
any.attoparsec ==0.14.4,
attoparsec -developer,
any.auto-update ==0.1.6,
any.base ==4.19.0.0,
any.base-orphans ==0.9.1,
any.bifunctors ==5.6.1,
any.auto-update ==0.2.1,
any.base ==4.20.0.0,
any.base-orphans ==0.9.2,
any.bifunctors ==5.6.2,
bifunctors +tagged,
any.binary ==0.8.9.1,
any.binary ==0.8.9.2,
any.bitvec ==1.1.5.0,
bitvec +simd,
any.bytestring ==0.12.0.2,
any.bytestring ==0.12.1.0,
any.character-ps ==0.1,
any.comonad ==5.0.8,
comonad +containers +distributive +indexed-traversable,
any.conduit ==1.3.5,
any.conduit-extra ==1.3.6,
any.containers ==0.6.8,
any.containers ==0.7,
any.contravariant ==1.5.5,
contravariant +semigroups +statevar +tagged,
any.data-fix ==0.3.2,
any.data-fix ==0.3.4,
any.deepseq ==1.5.0.0,
any.directory ==1.3.8.1,
any.directory ==1.3.8.3,
any.distributive ==0.6.2.1,
distributive +semigroups +tagged,
any.dlist ==1.0,
dlist -werror,
any.easy-file ==0.2.5,
any.exceptions ==0.10.7,
any.fast-logger ==3.2.2,
any.filepath ==1.4.100.4,
any.fast-logger ==3.2.3,
any.filepath ==1.5.2.0,
any.generically ==0.1.1,
any.ghc-bignum ==1.3,
any.ghc-boot-th ==9.8.1,
any.ghc-boot-th ==9.10.1,
any.ghc-internal ==9.1001.0,
any.ghc-prim ==0.11.0,
any.hashable ==1.4.3.0,
hashable +integer-gmp -random-initial-seed,
any.hashable ==1.4.7.0,
hashable -arch-native +integer-gmp -random-initial-seed,
any.hsc2hs ==0.68.10,
hsc2hs -in-ghc-tree,
any.indexed-traversable ==0.1.3,
any.indexed-traversable-instances ==0.1.1.2,
any.integer-conversion ==0.1.0.1,
any.indexed-traversable ==0.1.4,
any.indexed-traversable-instances ==0.1.2,
any.integer-conversion ==0.1.1,
any.integer-logarithms ==1.0.3.1,
integer-logarithms -check-bounds +integer-gmp,
any.lifted-base ==0.2.3.12,
Expand All @@ -58,68 +60,67 @@ constraints: any.OneTuple ==0.4.1.1,
monad-logger +template_haskell,
any.monad-loops ==0.4.3,
monad-loops +base4,
any.mono-traversable ==1.0.15.3,
any.mono-traversable ==1.0.17.0,
any.mtl ==2.3.1,
any.network ==3.1.4.0,
any.network ==3.2.1.0,
network -devel,
any.network-uri ==2.6.4.2,
any.old-locale ==1.0.0.7,
any.old-time ==1.1.0.4,
any.om-show ==0.1.2.9,
any.om-show ==0.1.2.10,
any.os-string ==2.0.2,
any.parsec ==3.1.17.0,
any.pretty ==1.1.3.6,
any.primitive ==0.9.0.0,
any.process ==1.6.18.0,
any.random ==1.2.1.1,
any.process ==1.6.19.0,
any.random ==1.2.1.2,
any.resourcet ==1.3.0,
any.rts ==1.0.2,
any.scientific ==0.3.7.0,
scientific -bytestring-builder -integer-simple,
any.semialign ==1.3,
any.scientific ==0.3.8.0,
scientific -integer-simple,
any.semialign ==1.3.1,
semialign +semigroupoids,
any.semigroupoids ==6.0.0.1,
any.semigroupoids ==6.0.1,
semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
any.split ==0.2.5,
any.splitmix ==0.1.0.5,
splitmix -optimised-mixer,
any.stm ==2.5.2.1,
any.stm ==2.5.3.1,
any.stm-chans ==3.0.0.9,
any.streaming-commons ==0.2.2.6,
streaming-commons -use-bytestring-builder,
any.strict ==0.5,
any.strict ==0.5.1,
any.tagged ==0.8.8,
tagged +deepseq +transformers,
any.template-haskell ==2.21.0.0,
any.text ==2.1,
any.text-iso8601 ==0.1,
any.text-short ==0.1.5,
any.template-haskell ==2.22.0.0,
any.text ==2.1.1,
any.text-iso8601 ==0.1.1,
any.text-short ==0.1.6,
text-short -asserts,
any.th-abstraction ==0.6.0.0,
any.th-compat ==0.1.4,
any.these ==1.2,
any.th-abstraction ==0.7.0.0,
any.th-compat ==0.1.5,
any.these ==1.2.1,
any.time ==1.12.2,
any.time-compat ==1.9.6.1,
time-compat -old-locale,
any.transformers ==0.6.1.0,
any.time-compat ==1.9.7,
any.transformers ==0.6.1.1,
any.transformers-base ==0.4.6,
transformers-base +orphaninstances,
any.transformers-compat ==0.7.2,
transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
any.typed-process ==0.2.11.1,
any.unix ==2.8.3.0,
any.unix-compat ==0.7.1,
unix-compat -old-time,
any.unix-time ==0.4.11,
any.unix ==2.8.5.1,
any.unix-compat ==0.7.2,
any.unix-time ==0.4.15,
any.unliftio-core ==0.2.1.0,
any.unordered-containers ==0.2.20,
unordered-containers -debug,
any.uuid-types ==1.0.5.1,
any.uuid-types ==1.0.6,
any.vector ==0.13.1.0,
vector +boundschecks -internalchecks -unsafechecks -wall,
any.vector-algorithms ==0.9.0.1,
any.vector-algorithms ==0.9.0.2,
vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
any.vector-stream ==0.1.0.1,
any.witherable ==0.4.2,
any.zlib ==0.6.3.0,
zlib -bundled-c-zlib -non-blocking-ffi -pkg-config
index-state: hackage.haskell.org 2024-01-14T02:56:25Z
any.witherable ==0.5,
any.zlib ==0.7.1.0,
zlib -bundled-c-zlib +non-blocking-ffi -pkg-config
index-state: hackage.haskell.org 2024-08-13T13:21:13Z
4 changes: 2 additions & 2 deletions om-logging.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: om-logging
version: 1.1.0.8
version: 1.1.0.9
synopsis: Opinionated logging utilities.
description: A set of logging combinators for use with monad-logger.
homepage: https://github.com/owensmurray/om-logging
Expand All @@ -18,7 +18,7 @@ extra-source-files:
common dependencies
build-depends:
, aeson >= 2.0.3.0 && < 2.3
, base >= 4.15.1.0 && < 4.20
, base >= 4.15.1.0 && < 4.21
, bytestring >= 0.11.3.1 && < 0.13
, fast-logger >= 3.1.1 && < 3.3
, monad-logger >= 0.3.36 && < 0.4
Expand Down

0 comments on commit ef54c00

Please sign in to comment.