From adc93dc2bfca7cd4162aeb0f10157175b779254b Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Thu, 7 Mar 2024 06:32:10 +0100 Subject: [PATCH] Dev Containers: Update HLS to v2.7.0.0 - Minor fix in GHC.Dockerfile - Cosmetic update in devcontainer.json --- .devcontainer/GHC.Dockerfile | 2 +- .devcontainer/devcontainer.json | 4 ++-- .devcontainer/ghc-9.8.1/devcontainer.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/GHC.Dockerfile b/.devcontainer/GHC.Dockerfile index bc41f0e8b3..15250e7600 100644 --- a/.devcontainer/GHC.Dockerfile +++ b/.devcontainer/GHC.Dockerfile @@ -109,7 +109,7 @@ RUN if [ -n "$STACK_VERSION_OVERRIDE" ]; then \ curl -sSLO https://github.com/commercialhaskell/stack/releases/download/v"$STACK_VERSION"/stack-"$STACK_VERSION"-linux-"$(uname -m)".tar.gz.sha256; \ sha256sum -cs stack-"$STACK_VERSION"-linux-"$(uname -m)".tar.gz.sha256; \ tar -xzf stack-"$STACK_VERSION"-linux-"$(uname -m)".tar.gz; \ - if dpkg --compare-versions "${GHC_VERSION%.*}" le "9.2"; then \ + if dpkg --compare-versions "$GHC_VERSION" lt "9.2.8"; then \ mv -f stack-"$STACK_VERSION"-linux-"$(uname -m)"/stack /usr/bin/stack; \ else \ mv -f stack-"$STACK_VERSION"-linux-"$(uname -m)"/stack /usr/local/bin/stack; \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d94381be6f..5465350abf 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ "dockerfile": "GHC.Dockerfile", "args": { "GHC_VERSION": "9.6.4", - "HLS_VERSION": "2.6.0.0", + "HLS_VERSION": "2.7.0.0", "USE_ZSH_FOR_ROOT": "unset-to-use-ash", "SET_LANG": "C.UTF-8", "SET_TZ": "" @@ -48,8 +48,8 @@ // Set 'remoteUser' to 'root' to connect as root instead. "remoteUser": "vscode", - // Pip: Install packages to the user site "remoteEnv": { + // Pip: Install packages to the user site "PIP_USER": "1" } } diff --git a/.devcontainer/ghc-9.8.1/devcontainer.json b/.devcontainer/ghc-9.8.1/devcontainer.json index 16f0c1e406..19b46402f2 100644 --- a/.devcontainer/ghc-9.8.1/devcontainer.json +++ b/.devcontainer/ghc-9.8.1/devcontainer.json @@ -46,8 +46,8 @@ // Set 'remoteUser' to 'root' to connect as root instead. "remoteUser": "vscode", - // Pip: Install packages to the user site "remoteEnv": { + // Pip: Install packages to the user site "PIP_USER": "1" } }