Skip to content

Commit

Permalink
Add support for GHC 9.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@sellout
sellout committed Jan 11, 2024
1 parent 9ea76ed commit 323d878
Show file tree
Hide file tree
Showing 8 changed files with 64 additions and 29 deletions.
11 changes: 6 additions & 5 deletions core-test/yaya-test.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ build-type: Simple
cabal-version: >=1.10
tested-with: GHC == 8.6.1
, GHC == 8.8.1, GHC == 8.8.4
, GHC == 8.10.1, GHC == 8.10.7
, GHC == 9.0.1, GHC == 9.0.2
, GHC == 9.2.1, GHC == 9.2.4
, GHC == 9.4.1, GHC == 9.4.2, GHC == 9.4.8
, GHC == 9.6.1, GHC == 9.6.2
, GHC == 8.10.1,
, GHC == 9.0.1
, GHC == 9.2.1
, GHC == 9.4.1, GHC == 9.4.8
, GHC == 9.6.1
, GHC == 9.8.1

test-suite yaya-test
type: exitcode-stdio-1.0
Expand Down
5 changes: 5 additions & 0 deletions core/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to the [Haskell Package Versioning Policy](https://pvp.haskell.org/).

## 0.4.2.3 – 2024–01–11

### Changed
- added CPP to support GHC 9.8

## 0.4.2.2 – 2023–12–21

### Changed
Expand Down
4 changes: 3 additions & 1 deletion core/src/Yaya/Retrofit.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ import "this" Yaya.Fold
)
import "base" Prelude (error)

#if MIN_VERSION_template_haskell(2, 17, 0)
#if MIN_VERSION_template_haskell(2, 21, 0)
type TyVarBndr' = TyVarBndr BndrVis
#elif MIN_VERSION_template_haskell(2, 17, 0)
type TyVarBndr' = TyVarBndr ()
#else
type TyVarBndr' = TyVarBndr
Expand Down
13 changes: 7 additions & 6 deletions core/yaya.cabal
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: yaya
version: 0.4.2.2
version: 0.4.2.3
synopsis: Total recursion schemes.
description: Recursion schemes allow you to separate recursion from your
business logic – making your own operations simpler, more
Expand All @@ -20,11 +20,12 @@ extra-source-files: CHANGELOG.md
cabal-version: >=1.10
tested-with: GHC == 8.6.1
, GHC == 8.8.1, GHC == 8.8.4
, GHC == 8.10.1, GHC == 8.10.7
, GHC == 9.0.1, GHC == 9.0.2
, GHC == 9.2.1, GHC == 9.2.4
, GHC == 9.4.1, GHC == 9.4.2, GHC == 9.4.8
, GHC == 9.6.1, GHC == 9.6.2
, GHC == 8.10.1,
, GHC == 9.0.1
, GHC == 9.2.1
, GHC == 9.4.1, GHC == 9.4.8
, GHC == 9.6.1
, GHC == 9.8.1

library
hs-source-dirs: src
Expand Down
27 changes: 25 additions & 2 deletions flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,30 @@

haskellDependencies = final: prev: hfinal: hprev:
(
if nixpkgs.lib.versionAtLeast hprev.ghc.version "8.10.0"
if nixpkgs.lib.versionAtLeast hprev.ghc.version "9.8.0"
then let
hspecVersion = "2_11_7";
in {
## The default versions in Nixpkgs 23.11 don’t support GHC 9.8.
doctest = hfinal.doctest_0_22_2;
hedgehog = hfinal."hedgehog_1_4";
hspec = hfinal."hspec_${hspecVersion}";
hspec-core = hfinal."hspec-core_${hspecVersion}";
hspec-discover = hfinal."hspec-discover_${hspecVersion}";
hspec-meta = hfinal."hspec-meta_${hspecVersion}";
semigroupoids = hfinal.semigroupoids_6_0_0_1;
tagged = hfinal.tagged_0_8_8;
th-abstraction = hfinal.th-abstraction_0_6_0_0;
## `Control.Monad.Trans.List` is gone with GHC 9.8, but
## `lifted-base` hasn’t updated its tests to avoid it.
lifted-base = final.haskell.lib.dontCheck hprev.lifted-base;
## The default versions in Nixpkgs 23.11 don’t support
## th-abstraction 0.6.
aeson = final.haskell.lib.doJailbreak hprev.aeson;
bifunctors = hfinal.bifunctors_5_6_1;
free = hfinal.free_5_2;
}
else if nixpkgs.lib.versionAtLeast hprev.ghc.version "8.10.0"
then {}
else
{
Expand Down Expand Up @@ -165,7 +188,7 @@
testedGhcVersions = system:
[
self.lib.defaultCompiler
# "ghc981" # Hedgehog doesn’t yet support GHC 9.8.
"ghc981"
# "ghcHEAD" # doctest doesn’t work on current HEAD
]
## dependency compiler-rt-libc-7.1.0 is broken in on aarch64-darwin.
Expand Down
11 changes: 6 additions & 5 deletions hedgehog/yaya-hedgehog.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ extra-source-files: CHANGELOG.md
cabal-version: >=1.10
tested-with: GHC == 8.6.1
, GHC == 8.8.1, GHC == 8.8.4
, GHC == 8.10.1, GHC == 8.10.7
, GHC == 9.0.1, GHC == 9.0.2
, GHC == 9.2.1, GHC == 9.2.4
, GHC == 9.4.1, GHC == 9.4.2, GHC == 9.4.8
, GHC == 9.6.1, GHC == 9.6.2
, GHC == 8.10.1,
, GHC == 9.0.1
, GHC == 9.2.1
, GHC == 9.4.1, GHC == 9.4.8
, GHC == 9.6.1
, GHC == 9.8.1

library
hs-source-dirs: src
Expand Down
11 changes: 6 additions & 5 deletions unsafe-test/yaya-unsafe-test.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ build-type: Simple
cabal-version: >=1.10
tested-with: GHC == 8.6.1
, GHC == 8.8.1, GHC == 8.8.4
, GHC == 8.10.1, GHC == 8.10.7
, GHC == 9.0.1, GHC == 9.0.2
, GHC == 9.2.1, GHC == 9.2.4
, GHC == 9.4.1, GHC == 9.4.2, GHC == 9.4.8
, GHC == 9.6.1, GHC == 9.6.2
, GHC == 8.10.1,
, GHC == 9.0.1
, GHC == 9.2.1
, GHC == 9.4.1, GHC == 9.4.8
, GHC == 9.6.1
, GHC == 9.8.1

test-suite yaya-unsafe-test
type: exitcode-stdio-1.0
Expand Down
11 changes: 6 additions & 5 deletions unsafe/yaya-unsafe.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ extra-source-files: CHANGELOG.md
cabal-version: >=1.10
tested-with: GHC == 8.6.1
, GHC == 8.8.1, GHC == 8.8.4
, GHC == 8.10.1, GHC == 8.10.7
, GHC == 9.0.1, GHC == 9.0.2
, GHC == 9.2.1, GHC == 9.2.4
, GHC == 9.4.1, GHC == 9.4.2, GHC == 9.4.8
, GHC == 9.6.1, GHC == 9.6.2
, GHC == 8.10.1,
, GHC == 9.0.1
, GHC == 9.2.1
, GHC == 9.4.1, GHC == 9.4.8
, GHC == 9.6.1
, GHC == 9.8.1

library
hs-source-dirs: src
Expand Down

0 comments on commit 323d878

Please sign in to comment.