From 859098fffd353f2e3d6b06dc0e433cddf007906c Mon Sep 17 00:00:00 2001 From: hanjoosten Date: Thu, 29 Jun 2023 20:23:53 +0000 Subject: [PATCH] upgrade to HLS 2.0.0.1 --- .devcontainer/DockerfileUpstream | 20 ++++++++++---------- .devcontainer/devcontainer.json | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.devcontainer/DockerfileUpstream b/.devcontainer/DockerfileUpstream index 20b76cfb9..3c0b6b8ab 100644 --- a/.devcontainer/DockerfileUpstream +++ b/.devcontainer/DockerfileUpstream @@ -5,7 +5,7 @@ ARG GHC_VERSION=8.10.7 ARG STACK_VERSION=2.9.3 ARG STACK_RESOLVER=lts-18.28 ARG CABAL_VERSION=3.6.2.0 -ARG HLS_VERSION=2.0.0.0 +ARG HLS_VERSION=2.0.0.1 ARG LLVM_VERSION=16 ENV USERNAME=${USERNAME} \ @@ -83,16 +83,16 @@ FROM tooling as packages # Install global packages. # Versions are pinned, since we don't want to accidentally break anything (by always installing latest). -RUN cabal install -v haskell-dap-0.0.15.0 -RUN cabal install -v ghci-dap-0.0.19.0 -RUN cabal install -v haskell-debug-adapter-0.0.37.0 -RUN cabal install -v hlint-3.2.7 -RUN cabal install -v apply-refact-0.9.3.0 -RUN cabal install -v retrie-1.1.0.0 -RUN cabal install -v stylish-haskell-0.13.0.0 -# RUN cabal install -v hoogle-5.0.18.3 +# RUN cabal install -v haskell-dap-0.0.15.0 +# RUN cabal install -v ghci-dap-0.0.19.0 +# RUN cabal install -v haskell-debug-adapter-0.0.37.0 +# RUN cabal install -v hlint-3.2.7 +# RUN cabal install -v apply-refact-0.9.3.0 +# RUN cabal install -v retrie-1.1.0.0 +# RUN cabal install -v stylish-haskell-0.13.0.0 +# # RUN cabal install -v hoogle-5.0.18.3 RUN cabal install -v ormolu-0.1.3.1 -RUN cabal install -v liquidhaskell-0.8.10.2 +# RUN cabal install -v liquidhaskell-0.8.10.2 # Generate hoogle db # RUN hoogle generate && stack hoogle diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9a238a6d2..1c2a460bd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -9,11 +9,11 @@ "STACK_VERSION": "2.9.3", "STACK_RESOLVER": "lts-18.28", "CABAL_VERSION": "3.6.2.0", - "HLS_VERSION": "1.9.1.0", + "HLS_VERSION": "2.0.0.1", "LLVM_VERSION": "12" }, "context": "..", - "dockerfile": "Dockerfile" + "dockerfile": "DockerfileUpstream" }, "customizations": { "vscode": {