Skip to content

Commit

Permalink
Dev Containers: Update HLS to v2.7.0.0
Browse files Browse the repository at this point in the history
- Minor fix in GHC.Dockerfile
- Cosmetic update in devcontainer.json
  • Loading branch information
benz0li committed Mar 7, 2024
1 parent b5e4324 commit adc93dc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/GHC.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": ""
Expand Down Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion .devcontainer/ghc-9.8.1/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

0 comments on commit adc93dc

Please sign in to comment.