Skip to content

Commit

Permalink
Merge pull request #203 from IntersectMBO/erikd/ghc-9.12
Browse files Browse the repository at this point in the history
Support ghc-9.12
  • Loading branch information
erikd authored Jan 13, 2025
2 parents cfb3e07 + 3021fa0 commit 68e015f
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["8.10.7", "9.2.8", "9.6.5", "9.8.2", "9.10.1"]
os: [ubuntu-latest, macos-latest, windows-latest]
ghc: ["8.10.7", "9.2.8", "9.6", "9.8", "9.10", "9.12"]
os: [ubuntu-latest, macos-13, windows-latest]

steps:
- uses: actions/checkout@v1
Expand Down
14 changes: 13 additions & 1 deletion cabal.project
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
-- See CONTRIBUTING for Nix commands you need to run if you change it:
index-state: 2024-06-12T03:57:48Z
index-state: 2025-01-07T18:12:02Z

packages:
cardano-prelude
cardano-prelude-test

test-show-details: direct

if impl (ghc >= 9.12)
allow-newer:
-- Stuck on `cabal-3.14` issues and recalcitrant maintainers
-- https://github.com/haskell/aeson/issues/1124
, aeson:ghc-prim
, aeson:template-haskell

-- Stuck on `cabal-3.14` and unresponsive maintainers
-- https://github.com/well-typed/cborg/pull/339
, cborg:base
, cborg:ghc-prim
2 changes: 1 addition & 1 deletion cardano-prelude/cardano-prelude.cabal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 2.2

name: cardano-prelude
version: 0.2.0.0
version: 0.2.1.0
synopsis: A Prelude replacement for the Cardano project
description: A Prelude replacement for the Cardano project
author: IOHK
Expand Down
4 changes: 1 addition & 3 deletions cardano-prelude/src/Cardano/Prelude/Panic.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE Safe #-}

-- This module cargo-culted from `Protolude`.
Expand All @@ -10,12 +9,11 @@ module Cardano.Prelude.Panic (

import Control.Exception (Exception, throw)
import Data.Text (Text)
import Data.Typeable (Typeable)
import GHC.Stack (HasCallStack)

-- | Uncatchable exceptions thrown and never caught.
newtype FatalError = FatalError { fatalErrorMessage :: Text }
deriving (Show, Typeable)
deriving Show

instance Exception FatalError

Expand Down

0 comments on commit 68e015f

Please sign in to comment.