Skip to content

Commit 5755ed9

Browse files
committed
fix ghc 9.0 build again.
1 parent b3a2fd1 commit 5755ed9

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

configuration-ghc-92.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ let
3838

3939
#
4040
retrie = hself.retrieHEAD;
41+
apply-refact = hself.apply-refactHEAD;
4142

4243
});
4344
in {

configuration-ghc-94.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ let
5050

5151
#
5252
retrie = hself.retrieHEAD;
53+
apply-refact = hself.apply-refactHEAD;
54+
5355
});
5456
in {
5557
inherit disabledPlugins;

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
hiedb = hsuper.callCabal2nix "hiedb" inputs.hiedb {};
189189
retrieHEAD = hsuper.callCabal2nix "retrie" inputs.retrie {};
190190
retrie_1_1_0_0 = hsuper.callCabal2nix "retrie" inputs.retrie_1100 {};
191-
apply-refact = hsuper.callCabal2nix "apply-refact" inputs.apply-refact {};
191+
apply-refactHEAD = hsuper.callCabal2nix "apply-refact" inputs.apply-refact {};
192192

193193
implicit-hie-cradle = hself.callCabal2nix "implicit-hie-cradle" inputs.implicit-hie-cradle {};
194194
ghc-check = hself.callCabal2nix "ghc-check" inputs.ghc-check {};

plugins/hls-hlint-plugin/src/Ide/Plugin/Hlint.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ import Development.IDE.GHC.Compat (DynFlags,
6868
wopt)
6969
import qualified Development.IDE.GHC.Compat.Util as EnumSet
7070

71-
#if MIN_GHC_API_VERSION(9,2,0)
71+
#if MIN_GHC_API_VERSION(9,4,0)
7272
import qualified "ghc-lib-parser" GHC.Data.Strict as Strict
7373
#endif
7474
#if MIN_GHC_API_VERSION(9,0,0)

plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ import GHC (AddEpAnn (..), AnnContext (..), AnnList (..),
4949
NameAdornment (NameParens),
5050
TrailingAnn (AddCommaAnn), addAnns, ann,
5151
emptyComments, noSrcSpanA, reAnnL)
52+
import Language.Haskell.GHC.ExactPrint.ExactPrint (makeDeltaAst, showAst)
5253
#else
5354
import Control.Applicative (Alternative ((<|>)))
5455
import Control.Monad.Extra (whenJust)
@@ -62,9 +63,6 @@ import Language.Haskell.GHC.ExactPrint.Types (DeltaPos (DP),
6263
KeywordId (G), mkAnnKey)
6364
#endif
6465

65-
import Debug.Trace (trace)
66-
import GHC (EpaLocation (..))
67-
import Language.Haskell.GHC.ExactPrint.ExactPrint (makeDeltaAst, showAst)
6866

6967
------------------------------------------------------------------------------
7068

0 commit comments

Comments
 (0)