Skip to content

Commit ad2d33a

Browse files
committed
Merge branch 'wavewave/ci-nix-build' into rebeccat/ghc94
2 parents 1f6d034 + 0557552 commit ad2d33a

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

cabal.project

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ constraints:
6666
hlint +ghc-lib,
6767
ghc-lib-parser-ex -auto,
6868
stylish-haskell +ghc-lib,
69-
-- implicit-hie 0.1.3.0 introduced an unexpected behavioral change.
70-
-- https://github.com/Avi-D-coder/implicit-hie/issues/50
71-
implicit-hie < 0.1.3,
7269
fourmolu -fixity-th
7370

7471
-- This is benign and won't affect our ability to release to Hackage,
@@ -89,7 +86,7 @@ if (impl(ghc >= 9.2))
8986
source-repository-package
9087
type:git
9188
location: https://github.com/wavewave/apply-refact
92-
tag: b5594f9a274234879b1c0ce2834c2d5df4b1b48a
89+
tag: 2f346adb54ae3d911c9055b48fb62eb4ceab583a
9390
-- https://github.com/wavewave/apply-refact/pull/1
9491

9592
allow-newer:

ghcide/ghcide.cabal

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ library
104104
ghc-paths,
105105
cryptohash-sha1 >=0.11.100 && <0.12,
106106
hie-bios ^>= 0.11.0,
107+
-- implicit-hie 0.1.3.0 introduced an unexpected behavioral change.
108+
-- https://github.com/Avi-D-coder/implicit-hie/issues/50
109+
-- to make sure ghcide behaves in a desirable way, we put implicit-hie
110+
-- fake dependency here.
111+
implicit-hie < 0.1.3,
107112
implicit-hie-cradle ^>= 0.3.0.5 || ^>= 0.5,
108113
base16-bytestring >=0.1.1 && <1.1
109114
if os(windows)

0 commit comments

Comments
 (0)