Skip to content

Commit

Permalink
Merge pull request #6 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 fc4ff40 + 0d38417 commit 0d002db
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 28 deletions.
6 changes: 4 additions & 2 deletions .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 Expand Up @@ -91,10 +92,11 @@ jobs:
(cat << EOF
packages: .
constraints:
base == 4.13,
base == 4.15.1.0,
monad-logger == 0.3.36,
safe-exceptions == 0.1.7.1,
transformers == 0.5.6.2
EOF
) > cabal.project
rm cabal.project.freeze
cabal configure --enable-tests --disable-optimization
Expand Down
42 changes: 21 additions & 21 deletions cabal.project.freeze
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
active-repositories: hackage.haskell.org:merge, owensmurray:merge
constraints: any.array ==0.5.6.0,
constraints: any.array ==0.5.7.0,
any.async ==2.2.5,
async -bench,
any.attoparsec ==0.14.4,
attoparsec -developer,
any.auto-update ==0.2.0,
any.base ==4.19.1.0,
any.auto-update ==0.2.1,
any.base ==4.20.0.0,
any.base-orphans ==0.9.2,
any.binary ==0.8.9.1,
any.binary ==0.8.9.2,
any.bitvec ==1.1.5.0,
bitvec +simd,
any.bytestring ==0.12.1.0,
any.conduit ==1.3.5,
any.conduit-extra ==1.3.6,
any.containers ==0.6.8,
any.containers ==0.7,
any.deepseq ==1.5.0.0,
any.directory ==1.3.8.1,
any.directory ==1.3.8.3,
any.easy-file ==0.2.5,
any.exceptions ==0.10.7,
any.fast-logger ==3.2.3,
any.filepath ==1.4.200.1,
any.filepath ==1.5.2.0,
any.ghc-bignum ==1.3,
any.ghc-boot-th ==9.8.2,
any.ghc-boot-th ==9.10.1,
any.ghc-internal ==9.1001.0,
any.ghc-prim ==0.11.0,
any.hashable ==1.4.4.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.integer-logarithms ==1.0.3.1,
Expand All @@ -37,14 +38,14 @@ constraints: any.array ==0.5.6.0,
monad-loops +base4,
any.mono-traversable ==1.0.17.0,
any.mtl ==2.3.1,
any.network ==3.2.0.0,
any.network ==3.2.1.0,
network -devel,
any.old-locale ==1.0.0.7,
any.old-time ==1.1.0.4,
any.os-string ==2.0.3,
any.os-string ==2.0.2,
any.pretty ==1.1.3.6,
any.primitive ==0.9.0.0,
any.process ==1.6.18.0,
any.process ==1.6.19.0,
any.random ==1.2.1.2,
any.resourcet ==1.3.0,
any.rts ==1.0.2,
Expand All @@ -54,23 +55,22 @@ constraints: any.array ==0.5.6.0,
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.template-haskell ==2.21.0.0,
any.template-haskell ==2.22.0.0,
any.text ==2.1.1,
any.time ==1.12.2,
any.transformers ==0.6.1.0,
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.4.0,
any.unix-compat ==0.7.1,
unix-compat -old-time,
any.unix-time ==0.4.14,
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,
Expand All @@ -81,4 +81,4 @@ constraints: any.array ==0.5.6.0,
any.vector-stream ==0.1.0.1,
any.zlib ==0.7.1.0,
zlib -bundled-c-zlib +non-blocking-ffi -pkg-config
index-state: hackage.haskell.org 2024-06-02T23:45:05Z
index-state: hackage.haskell.org 2024-08-12T21:56:17Z
10 changes: 5 additions & 5 deletions om-fail.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: om-fail
version: 0.1.0.4
version: 0.1.0.5
synopsis: Monad transformer providing MonadFail.
-- description:
homepage: https://github.com/owensmurray/om-fail
Expand All @@ -19,10 +19,10 @@ library
-- other-modules:
-- other-extensions:
build-depends:
, base >= 4.13 && < 4.20
, monad-logger >= 0.3.36 && < 0.4
, safe-exceptions >= 0.1.7.1 && < 0.2
, transformers >= 0.5.6.2 && < 0.7
, base >= 4.15.1.0 && < 4.21
, monad-logger >= 0.3.36 && < 0.4
, safe-exceptions >= 0.1.7.1 && < 0.2
, transformers >= 0.5.6.2 && < 0.7
hs-source-dirs: src
default-language: Haskell2010

0 comments on commit 0d002db

Please sign in to comment.