Skip to content

Commit 3436f6a

Browse files
committed
Bump ghcide to wz1000 hls-2 branch
At 747ec1401c62257ec849319eb2dda966a8008b09 Also bump cabal-project index-state to 2020-07-01T16:33:28Z stack 8.10.1 to nightly-2020-06-29 stack 8.8.3 to lts-16.3
1 parent 2a192db commit 3436f6a

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ package ghcide
1818

1919
write-ghc-environment-files: never
2020

21-
index-state: 2020-06-18T17:03:29Z
21+
index-state: 2020-07-01T16:33:28Z

exe/Main.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ loadSession dir = do
433433

434434
-- Invalidate all the existing GhcSession build nodes by restarting the Shake session
435435
invalidateShakeCache
436-
restartShakeSession [kick]
436+
-- restartShakeSession [kick]
437437

438438
return (map fst cs, second Map.keys res)
439439

stack-8.10.1.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
resolver: nightly-2020-06-15
2-
compiler: ghc-8.10.1
1+
resolver: nightly-2020-06-29
32

43
packages:
54
- .
65
- ./ghcide/
76

87
extra-deps:
9-
- Cabal-3.2.0.0
8+
# - Cabal-3.2.0.0
9+
- Cabal-3.0.2.0
1010
# - cabal-helper-1.1.0.0
1111
- github: DanielG/cabal-helper
1212
commit: 79a5608778493bf32e74b54bbf1ea2729941e50f
@@ -19,6 +19,7 @@ extra-deps:
1919
- monad-dijkstra-0.1.1.2
2020
- optics-core-0.3
2121
- ormolu-0.0.5.0
22+
- stylish-haskell-0.11.0.0
2223
- semigroups-0.18.5
2324
- temporary-1.2.1.1
2425
- these-1.1

stack-8.8.3.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-15.12
1+
resolver: lts-16.3
22

33
packages:
44
- .
@@ -8,6 +8,7 @@ extra-deps:
88
- apply-refact-0.7.0.0
99
- bytestring-trie-0.2.5.0
1010
- cabal-helper-1.1.0.0
11+
- cabal-plan-0.6.2.0
1112
- clock-0.7.2
1213
- constrained-dynamic-0.1.0.0
1314
- extra-1.7.3

0 commit comments

Comments
 (0)