From 3436f6afe6113d2e4b278ccbfc30bdd2465255bc Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Wed, 1 Jul 2020 19:49:26 +0100 Subject: [PATCH 1/3] 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 --- cabal.project | 2 +- exe/Main.hs | 2 +- ghcide | 2 +- stack-8.10.1.yaml | 7 ++++--- stack-8.8.3.yaml | 3 ++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cabal.project b/cabal.project index 19824ae865..dcb814885a 100644 --- a/cabal.project +++ b/cabal.project @@ -18,4 +18,4 @@ package ghcide write-ghc-environment-files: never -index-state: 2020-06-18T17:03:29Z +index-state: 2020-07-01T16:33:28Z diff --git a/exe/Main.hs b/exe/Main.hs index 237ed9b2e7..33b5b9202b 100644 --- a/exe/Main.hs +++ b/exe/Main.hs @@ -433,7 +433,7 @@ loadSession dir = do -- Invalidate all the existing GhcSession build nodes by restarting the Shake session invalidateShakeCache - restartShakeSession [kick] + -- restartShakeSession [kick] return (map fst cs, second Map.keys res) diff --git a/ghcide b/ghcide index cc09b6d4cf..747ec1401c 160000 --- a/ghcide +++ b/ghcide @@ -1 +1 @@ -Subproject commit cc09b6d4cf03efa645c682347c62850c2291be25 +Subproject commit 747ec1401c62257ec849319eb2dda966a8008b09 diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml index 06455feb25..6a4da30e09 100644 --- a/stack-8.10.1.yaml +++ b/stack-8.10.1.yaml @@ -1,12 +1,12 @@ -resolver: nightly-2020-06-15 -compiler: ghc-8.10.1 +resolver: nightly-2020-06-29 packages: - . - ./ghcide/ extra-deps: -- Cabal-3.2.0.0 +# - Cabal-3.2.0.0 +- Cabal-3.0.2.0 # - cabal-helper-1.1.0.0 - github: DanielG/cabal-helper commit: 79a5608778493bf32e74b54bbf1ea2729941e50f @@ -19,6 +19,7 @@ extra-deps: - monad-dijkstra-0.1.1.2 - optics-core-0.3 - ormolu-0.0.5.0 +- stylish-haskell-0.11.0.0 - semigroups-0.18.5 - temporary-1.2.1.1 - these-1.1 diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index 8c3b85155c..a35104a723 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -1,4 +1,4 @@ -resolver: lts-15.12 +resolver: lts-16.3 packages: - . @@ -8,6 +8,7 @@ extra-deps: - apply-refact-0.7.0.0 - bytestring-trie-0.2.5.0 - cabal-helper-1.1.0.0 +- cabal-plan-0.6.2.0 - clock-0.7.2 - constrained-dynamic-0.1.0.0 - extra-1.7.3 From f5d3c242cfd6d4bfdd3921044bfb5388021e443f Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Wed, 1 Jul 2020 20:20:36 +0100 Subject: [PATCH 2/3] Remove commented out package. Note, the limitation on Cabal comes from http://hackage.haskell.org/package/stylish-haskell-0.11.0.0 --- stack-8.10.1.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml index 6a4da30e09..5800b412c6 100644 --- a/stack-8.10.1.yaml +++ b/stack-8.10.1.yaml @@ -5,7 +5,6 @@ packages: - ./ghcide/ extra-deps: -# - Cabal-3.2.0.0 - Cabal-3.0.2.0 # - cabal-helper-1.1.0.0 - github: DanielG/cabal-helper From 5b17547ca3b7afdec253a9ec1826603ecb8133b7 Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Sun, 5 Jul 2020 10:25:47 +0100 Subject: [PATCH 3/3] Fix conflict with cabal.project, and clean compilation --- cabal.project | 8 +------- exe/Main.hs | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cabal.project b/cabal.project index dcb814885a..2bcc2b50f4 100644 --- a/cabal.project +++ b/cabal.project @@ -2,12 +2,6 @@ packages: ./ ghcide --- See https://github.com/haskell-hvr/cabal-plan/pull/55 -source-repository-package - type: git - location: https://github.com/peti/cabal-plan - tag: 894b76c0b6bf8f7d2f881431df1f13959a8fce87 - tests: true documentation: true @@ -18,4 +12,4 @@ package ghcide write-ghc-environment-files: never -index-state: 2020-07-01T16:33:28Z +index-state: 2020-07-01T21:29:04Z diff --git a/exe/Main.hs b/exe/Main.hs index 33b5b9202b..1ab82d914b 100644 --- a/exe/Main.hs +++ b/exe/Main.hs @@ -338,7 +338,7 @@ loadSession dir = do InstallationMismatch{..} -> return $ returnWithVersion $ \fp -> return (([renderPackageSetupException compileTime fp GhcVersionMismatch{..}], Nothing),[]) InstallationChecked compileTime ghcLibCheck -> return $ do - ShakeExtras{logger, eventer, restartShakeSession, withIndefiniteProgress, ideNc, session=ideSession} <- getShakeExtras + ShakeExtras{logger, eventer, withIndefiniteProgress, ideNc, session=ideSession} <- getShakeExtras IdeOptions{optTesting = IdeTesting optTesting} <- getIdeOptions -- Create a new HscEnv from a hieYaml root and a set of options