diff --git a/ouroboros-consensus-cardano/app/DBAnalyser/Parsers.hs b/ouroboros-consensus-cardano/app/DBAnalyser/Parsers.hs index 66d1ec176a..73f734af99 100644 --- a/ouroboros-consensus-cardano/app/DBAnalyser/Parsers.hs +++ b/ouroboros-consensus-cardano/app/DBAnalyser/Parsers.hs @@ -82,7 +82,7 @@ parseValidationPolicy = _ -> Nothing parseAnalysis :: Parser AnalysisName -parseAnalysis = asum [ +parseAnalysis = Foldable.asum [ flag' ShowSlotBlockNo $ mconcat [ long "show-slot-block-no" , help "Show slot and block number and hash of all blocks" @@ -150,7 +150,7 @@ checkNoThunksParser = CheckNoThunksEvery <$> option auto <> help "Check the ledger state for thunks every n blocks" ) parseLimit :: Parser Limit -parseLimit = asum [ +parseLimit = Foldable.asum [ Limit <$> option auto (mconcat [ long "num-blocks-to-process" , help "Maximum number of blocks we want to process" @@ -244,7 +244,7 @@ parseShelleyArgs = ShelleyBlockArgs , help "Path to config file" , metavar "PATH" ]) - <*> asum [ Nonce <$> parseNonce + <*> Foldable.asum [ Nonce <$> parseNonce , pure NeutralNonce] where parseNonce = strOption (mconcat [ diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Ledger.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Ledger.hs index b8d8842093..fe3439acd0 100644 --- a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Ledger.hs +++ b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Ledger.hs @@ -19,6 +19,13 @@ {-# OPTIONS_GHC -Wno-orphans #-} +#if __GLASGOW_HASKELL__ <= 906 +{-# OPTIONS_GHC -Wno-incomplete-patterns + -Wno-incomplete-uni-patterns + -Wno-incomplete-record-updates + -Wno-overlapping-patterns #-} +#endif + module Ouroboros.Consensus.Cardano.Ledger ( CardanoTxOut (..) , eliminateCardanoTxOut diff --git a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Ledger.hs b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Ledger.hs index 60bf842f74..9810cea5b9 100644 --- a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Ledger.hs +++ b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Ledger.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveAnyClass #-} {-# LANGUAGE DeriveGeneric #-} @@ -18,6 +19,12 @@ {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-orphans #-} +#if __GLASGOW_HASKELL__ <= 906 +{-# OPTIONS_GHC -Wno-incomplete-patterns + -Wno-incomplete-uni-patterns + -Wno-incomplete-record-updates + -Wno-overlapping-patterns #-} +#endif module Ouroboros.Consensus.Shelley.Ledger.Ledger ( LedgerState (..) diff --git a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Query.hs b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Query.hs index eb6ce1563e..1e2e80c172 100644 --- a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Query.hs +++ b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Query.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE BangPatterns #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} @@ -19,6 +20,12 @@ {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-orphans #-} +#if __GLASGOW_HASKELL__ <= 906 +{-# OPTIONS_GHC -Wno-incomplete-patterns + -Wno-incomplete-uni-patterns + -Wno-incomplete-record-updates + -Wno-overlapping-patterns #-} +#endif module Ouroboros.Consensus.Shelley.Ledger.Query ( BlockQuery (..) diff --git a/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool/Fairness/TestBlock.hs b/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool/Fairness/TestBlock.hs index 4cb332b426..c0d64115f7 100644 --- a/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool/Fairness/TestBlock.hs +++ b/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool/Fairness/TestBlock.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveAnyClass #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DerivingStrategies #-}