Skip to content

Commit

Permalink
Install newer GHC tools in order of bsc compilation.
Browse files Browse the repository at this point in the history
  • Loading branch information
benycze committed Jan 19, 2024
1 parent 8903a66 commit e2420ff
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
13 changes: 12 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ ARG UID=1000
ARG GID=1000
ARG PASS=password
ARG DOC=0
ARG GHC_VERSION="9.4.8"
ARG CABAL_VERSION="latest"

# Copy downloaded repos into image
COPY scripts/reps/bsc /bluespec/reps/bsc
Expand All @@ -22,9 +24,18 @@ COPY scripts/build-new-package.sh /bluespec
# Install tooling and editors
RUN apt update && apt upgrade -y && \
DEBIAN_FRONTEND=noninteractive apt install -y tzdata sudo vim software-properties-common \
sudo xauth vim-gtk graphviz
sudo xauth vim-gtk graphviz curl \
build-essential libffi-dev libffi8ubuntu1 libgmp-dev \
libgmp10 libncurses-dev libncurses5 libtinfo5
RUN add-apt-repository universe && apt update && apt upgrade -y

# Install GHC and its deps
RUN curl https://downloads.haskell.org/~ghcup/x86_64-linux-ghcup > /usr/local/bin/ghcup && \
chmod +x /usr/local/bin/ghcup
RUN ghcup -v install ghc --isolate /usr/local --force $GHC_VERSION && \
ghcup -v install cabal --isolate /usr/local/bin --force $CABAL_VERSION
RUN cabal update && cabal v1-install old-time regex-compat split syb

# Add user into the system
RUN groupadd --gid $GID $USER && \
useradd --uid $UID --gid $GID --groups sudo --shell /bin/bash -m $USER && \
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-new-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export DOC_EN=$5

# Required packages
BUILD_PACKAGES="build-essential autotools-dev autoconf git libfontconfig1-dev libx11-dev libxft-dev gperf flex bison ccache"
BSC_DEPS_PACKAGES="iverilog ghc libghc-regex-compat-dev libghc-syb-dev libghc-old-time-dev libghc-split-dev libelf-dev tcl-dev itcl3-dev tcl-dev tk-dev itk3-dev xvfb verilator"
BSC_DEPS_PACKAGES="iverilog libelf-dev tcl-dev itcl3-dev tcl-dev tk-dev itk3-dev xvfb verilator"
BDW_DEPS_PACKAGES="gtkwave graphviz emacs vim-gtk"
DOC_BUILD_PACKAGES="texlive-latex-base texlive-latex-recommended texlive-latex-extra texlive-font-utils texlive-fonts-extra"

Expand Down

0 comments on commit e2420ff

Please sign in to comment.