From 68f4c70b7ff37ba8f8e533d01602a9dcd53f687e Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Tue, 7 Jan 2025 09:06:17 +0100 Subject: [PATCH] Hacky fix: restrict data-default < 0.8 --- cabal.project | 2 -- cardano-cli/cardano-cli.cabal | 1 + cardano-cli/src/Cardano/CLI/Orphans.hs | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index b9b1fe9574..f6d0209cf4 100644 --- a/cabal.project +++ b/cabal.project @@ -38,8 +38,6 @@ if os(windows) constraints: any.text source -constraints: data-default < 0.8 - -- Depending on C++ for just so slightly faster utf8 parsing is a bit annoying -- especially as it brings in all kinds of complications for GHC. package text diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index d70597a13b..35ff1320bb 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -222,6 +222,7 @@ library containers, contra-tracer, cryptonite, + data-default <0.8, deepseq, directory, exceptions, diff --git a/cardano-cli/src/Cardano/CLI/Orphans.hs b/cardano-cli/src/Cardano/CLI/Orphans.hs index 3f831a55af..91ebaea020 100644 --- a/cardano-cli/src/Cardano/CLI/Orphans.hs +++ b/cardano-cli/src/Cardano/CLI/Orphans.hs @@ -14,6 +14,9 @@ import qualified Cardano.Api.Ledger as L import Cardano.Api.Shelley (scriptDataToJsonDetailedSchema) import Data.Aeson +import Data.Default () + +-- FIXME remove Data.Default () import. This is only to force usage of data-default < 0.8 and to work around unused pacakge warning. -- TODO upstream this orphaned instance to the ledger instance (L.EraTxOut ledgerera, L.EraGov ledgerera) => ToJSON (L.NewEpochState ledgerera) where