From bf72f9d390c22972fb06741aec890ffbd0cf0fc9 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Fri, 8 Dec 2023 15:45:59 -0700 Subject: [PATCH] Revert to using ghc928 --- cardano-node/src/Cardano/Node/LedgerEvent.hs | 3 +-- nix/haskell.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cardano-node/src/Cardano/Node/LedgerEvent.hs b/cardano-node/src/Cardano/Node/LedgerEvent.hs index dfc0e58e5eb..2f4e9263f30 100644 --- a/cardano-node/src/Cardano/Node/LedgerEvent.hs +++ b/cardano-node/src/Cardano/Node/LedgerEvent.hs @@ -6,7 +6,6 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NamedFieldPuns #-} -{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE PartialTypeSignatures #-} {-# LANGUAGE RankNTypes #-} @@ -115,7 +114,7 @@ import Ouroboros.Consensus.Ledger.Extended (ExtLedgerState) import Ouroboros.Consensus.Shelley.Ledger (ShelleyBlock, ShelleyLedgerEvent (..)) import Ouroboros.Consensus.TypeFamilyWrappers import Ouroboros.Network.Block (ChainHash (BlockHash, GenesisHash), HeaderHash) -import Prelude (type (~)) +import Prelude hiding ((.), String, MonadFail (..), map, print, putStrLn, show) import System.IO (hIsEOF) type LedgerState crypto = diff --git a/nix/haskell.nix b/nix/haskell.nix index 8d902acb3b0..02464e3e06f 100644 --- a/nix/haskell.nix +++ b/nix/haskell.nix @@ -20,7 +20,7 @@ let { src = ../.; name = "cardano-node"; - compiler-nix-name = lib.mkDefault "ghc963"; + compiler-nix-name = lib.mkDefault "ghc928"; # extra-compilers flake.variants = lib.genAttrs [ ] (x: {compiler-nix-name = x;}); cabalProjectLocal = ''