Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
sudo apt -y update
sudo apt -y upgrade
sudo apt -y install postgresql-17 g++ mcpp libffi8 llvm zlib1g-dev libsodium-dev libgoogle-perftools-dev liburing-dev
sudo apt -y install postgresql-17 g++ mcpp libffi8 llvm zlib1g-dev libsodium-dev liburing-dev
3 changes: 0 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@ The following Haskell command-line tools have to be installed:
* `fourmolu` 0.20.0.0: To style the code base
* `hlint` 3.10 & `apply-refact`: To enforce certain patterns in the code base ("lint")
* `cabal-gild`: To style cabal files
* `ghcid`: To automatically reload the Haskell code base upon source changes
* `ghc-tags`: To generate ctags or etags for the project
* `eventlog2html`: To render eventlog profiles (see [Profiling](#profiling))
* [`changelog-d`](https://codeberg.org/fgaz/changelog-d/releases/tag/v1.0) 1.0: To generate the changelog. Not on Hackage; install it from the Codeberg release.

Expand All @@ -168,7 +166,6 @@ cabal install --ignore-project fourmolu-0.20.0.0 hlint-3.10 apply-refact cabal-g

The following system dependencies are needed:

* [`gperftools`](https://pkgs.org/download/gperftools): This gives us `tcmalloc`, an alternative malloc implementation that helps against memory fragmentation in long-running servers
* `libsodium-1.0.18`: The system library that powers most of the cryptography happening in flora
* `npm`: The tool that handles the JavaScript code bases
* `esbuild`: The tool that handles asset bundling
Expand Down
11 changes: 2 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ ARG APPLY_REFACT_VERSION=0.15.0.0
ARG BASE_IMAGE_VERSION=22.04
ARG CABAL_VERSION=3.16.1.0
ARG FOURMOLU_VERSION=0.20.0.0
ARG GHCID_VERSION=0.8.9
ARG GHC_TAGS_VERSION=1.9
ARG GHC_VERSION=9.10.3
ARG HLINT_VERSION=3.10
ARG HLS_VERSION=2.14.0.0
ARG CABAL_GILD_VERSION=1.8.4.1
ARG HLS_VERSION=2.15.0.0
ARG CABAL_GILD_VERSION=1.8.4.2

# This stage installs libraries required to install GHC and other tools
FROM ubuntu:$BASE_IMAGE_VERSION AS base
Expand All @@ -23,7 +21,6 @@ RUN apt update \
libffi8 \
libgmp-dev \
libgmp10 \
libgoogle-perftools-dev \
libncurses-dev \
libncurses5 \
libpq-dev \
Expand Down Expand Up @@ -53,8 +50,6 @@ RUN ghcup install cabal $CABAL_VERSION
FROM base AS setup-haskell-tools
ARG APPLY_REFACT_VERSION
ARG FOURMOLU_VERSION
ARG GHCID_VERSION
ARG GHC_TAGS_VERSION
ARG GHC_VERSION
ARG HLINT_VERSION
ARG CABAL_GILD_VERSION
Expand All @@ -77,8 +72,6 @@ RUN ghcup set ghc $GHC_VERSION
RUN cabal install --install-method=copy --installdir=out/ --semaphore -j fourmolu-$FOURMOLU_VERSION
RUN cabal install --install-method=copy --installdir=out/ --semaphore -j hlint-$HLINT_VERSION
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

# This stage is the development environment
FROM base AS devel
Expand Down
4 changes: 0 additions & 4 deletions flora.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@ common common-rts-options
-threaded
"-with-rtsopts=-N -T"

-- Use TCMalloc instead of glibc's malloc.
if !(os(osx) && arch(aarch64))
pkgconfig-depends: libtcmalloc

library
import: common-extensions
import: common-ghc-options
Expand Down
Loading