Skip to content

Move things around #1245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tchoutri merged 1 commit into from
Sep 8, 2026
Merged

Move things around #1245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
COMPOSE_PROFILES=local,live-eventlog
COMPOSE_PROFILES=local
1 change: 0 additions & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ Create `.vscode/settings.json`:

```jsonc
{
"haskell.manageHLS": "PATH",
"haskell.serverExecutablePath": "${workspaceFolder}/scripts/hls-docker.sh"
}
```
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ ARG GHCID_VERSION
ARG GHC_TAGS_VERSION
ARG GHC_VERSION
ARG HLINT_VERSION
ARG HLS_VERSION
ARG CABAL_GILD_VERSION

ENV PATH="/opt/ghcup/.ghcup/bin:$PATH"
Expand All @@ -80,7 +79,6 @@ RUN cabal install --install-method=copy --installdir=out/ --semaphore -j hlint-$
RUN cabal install --install-method=copy --installdir=out/ --semaphore -j cabal-gild-$CABAL_GILD_VERSION
RUN cabal install --install-method=copy --installdir=out/ --semaphore -j ghc-tags-$GHC_TAGS_VERSION
RUN cabal install --install-method=copy --installdir=out/ --semaphore -j ghcid-$GHCID_VERSION
RUN ghcup install hls $HLS_VERSION --set

# This stage is the development environment
FROM base AS devel
Expand All @@ -90,6 +88,7 @@ ARG GID
ARG UID
ARG USER
ENV USER=$USER
ARG HLS_VERSION

COPY --from=setup-haskell-tools /out /opt/bin
COPY --from=setup-haskell-tools /opt/ghcup /opt/ghcup
Expand All @@ -98,6 +97,8 @@ ENV PATH="/opt/ghcup/.ghcup/bin:/opt/bin:$PATH"

RUN ghcup install ghc $GHC_VERSION
RUN ghcup set ghc $GHC_VERSION
RUN ghcup install hls $HLS_VERSION --set


RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
Expand Down
Loading