From dea4d1b7ed9464b74979017cee7282409f4cdad3 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Wed, 8 Jan 2025 11:46:44 +1100 Subject: [PATCH 1/5] Support ghc-9.12 --- cabal.project | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index b5f1528..a92ce96 100644 --- a/cabal.project +++ b/cabal.project @@ -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 From 8df2ffc31927fb5344f9ce373c61ba7b1bf27f17 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Wed, 8 Jan 2025 11:46:54 +1100 Subject: [PATCH 2/5] CI: Only use mac-13 to avoid failure of ghc-8.10.7 build --- .github/workflows/haskell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 8200003..a04c6f6 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -14,7 +14,7 @@ jobs: 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] + os: [ubuntu-latest, macos-13, windows-latest] steps: - uses: actions/checkout@v1 From 4e0a02396b3fd8b6f43ca87e242dd8ebff8c3e55 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Wed, 8 Jan 2025 11:47:03 +1100 Subject: [PATCH 3/5] CI: Add ghc 9.12 to the build matrix --- .github/workflows/haskell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index a04c6f6..54134bd 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["8.10.7", "9.2.8", "9.6.5", "9.8.2", "9.10.1"] + ghc: ["8.10.7", "9.2.8", "9.6", "9.8", "9.10", "9.12"] os: [ubuntu-latest, macos-13, windows-latest] steps: From c5a44be64641c1ebd4cf91efc6d32ff0675336ee Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Mon, 13 Jan 2025 14:44:40 +1100 Subject: [PATCH 4/5] Remove all derived Typeable instances --- cardano-prelude/src/Cardano/Prelude/Panic.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cardano-prelude/src/Cardano/Prelude/Panic.hs b/cardano-prelude/src/Cardano/Prelude/Panic.hs index 4fde3a8..42cf7fd 100644 --- a/cardano-prelude/src/Cardano/Prelude/Panic.hs +++ b/cardano-prelude/src/Cardano/Prelude/Panic.hs @@ -1,5 +1,4 @@ {-# LANGUAGE ConstraintKinds #-} -{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE Safe #-} -- This module cargo-culted from `Protolude`. @@ -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 From 3021fa0580a030067f4e2012e8690e47092590b7 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Tue, 14 Jan 2025 06:12:35 +1100 Subject: [PATCH 5/5] cardano-prelude.cabal: Version 0.2.1.0 --- cardano-prelude/cardano-prelude.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cardano-prelude/cardano-prelude.cabal b/cardano-prelude/cardano-prelude.cabal index 592692a..8477ba2 100644 --- a/cardano-prelude/cardano-prelude.cabal +++ b/cardano-prelude/cardano-prelude.cabal @@ -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