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

fix: allow GHC 9.12 #582

Merged
merged 2 commits into from
Jan 20, 2025
Merged

fix: allow GHC 9.12 #582

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
760dc36
ci: add GHC 9.12.1 to the CI matrix
ncaq Jan 20, 2025
8d57422
fix: allow GHC 9.12 library versions
ncaq Jan 20, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
- "9.6.6"
- "9.8.2"
- "9.10.1"
- "9.12.1"

exclude:
- os: macOS-latest
Expand Down
2 changes: 2 additions & 0 deletions src/Stan/Ghc/Compat.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ import Stan.Ghc.Compat906 as Compat
import Stan.Ghc.Compat906 as Compat
#elif __GLASGOW_HASKELL__ == 910
import Stan.Ghc.Compat906 as Compat
#elif __GLASGOW_HASKELL__ == 912
import Stan.Ghc.Compat906 as Compat
#endif
2 changes: 1 addition & 1 deletion src/Stan/Ghc/Compat906.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{-# OPTIONS_GHC -Wno-orphans #-}

module Stan.Ghc.Compat906
#if __GLASGOW_HASKELL__ == 906 || __GLASGOW_HASKELL__ == 908 || __GLASGOW_HASKELL__ == 910
#if __GLASGOW_HASKELL__ == 906 || __GLASGOW_HASKELL__ == 908 || __GLASGOW_HASKELL__ == 910 || __GLASGOW_HASKELL__ == 912
( -- * Modules
Module
, ModuleName
Expand Down
2 changes: 2 additions & 0 deletions src/Stan/Hie/Compat.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ import Stan.Hie.Compat904 as Compat
import Stan.Hie.Compat904 as Compat
#elif __GLASGOW_HASKELL__ == 910
import Stan.Hie.Compat904 as Compat
#elif __GLASGOW_HASKELL__ == 912
import Stan.Hie.Compat904 as Compat
#endif
3 changes: 1 addition & 2 deletions src/Stan/Hie/Compat904.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# LANGUAGE CPP #-}

module Stan.Hie.Compat904
#if __GLASGOW_HASKELL__ == 904 || __GLASGOW_HASKELL__ == 906 || __GLASGOW_HASKELL__ == 908 || __GLASGOW_HASKELL__== 910
#if __GLASGOW_HASKELL__ == 904 || __GLASGOW_HASKELL__ == 906 || __GLASGOW_HASKELL__ == 908 || __GLASGOW_HASKELL__== 910 || __GLASGOW_HASKELL__== 912
( -- * Main HIE types
ContextInfo (..)
, HieArgs (..)
Expand Down Expand Up @@ -108,4 +108,3 @@ eqDeclType (DeclType d1) d2 = d1 == d2
#else
() where
#endif

2 changes: 2 additions & 0 deletions src/Stan/Hie/Debug.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ import Stan.Hie.Debug902 as Compat
import Stan.Hie.Debug908 as Compat
#elif __GLASGOW_HASKELL__ == 910
import Stan.Hie.Debug908 as Compat
#elif __GLASGOW_HASKELL__ == 912
import Stan.Hie.Debug908 as Compat
#endif
2 changes: 1 addition & 1 deletion src/Stan/Hie/Debug908.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package to dependencies and use the @pPrint@ function from the
-}

module Stan.Hie.Debug908
#if __GLASGOW_HASKELL__ == 908 || __GLASGOW_HASKELL__ == 910
#if __GLASGOW_HASKELL__ == 908 || __GLASGOW_HASKELL__ == 910 || __GLASGOW_HASKELL__ == 912
( debugHieFile
) where

Expand Down
6 changes: 3 additions & 3 deletions stan.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ source-repository head
location: https://github.com/kowainik/stan.git

common common-options
build-depends: base >= 4.13 && < 4.21 && (< 4.16.3.0 || >= 4.17)
build-depends: base >= 4.13 && < 4.22 && (< 4.16.3.0 || >= 4.17)
-- ^^ .hie files don't contain enough type
-- information on ghc-9.2.[4-8] (base >=
-- 4.16.3.0 && < 4.17)
Expand Down Expand Up @@ -151,8 +151,8 @@ library
, directory ^>= 1.3
, extensions ^>= 0.0.0.1 || ^>= 0.1.0.0
, filepath >= 1.4 && < 1.6
, ghc >= 8.8 && < 9.11
, ghc-boot-th >= 8.8 && < 9.11
, ghc >= 8.8 && < 9.13
, ghc-boot-th >= 8.8 && < 9.13
, gitrev ^>= 1.3.1
, microaeson ^>= 0.1.0.0
, optparse-applicative >= 0.15 && < 0.19
Expand Down
Loading