client: remove ghc package requirement

Will be managed by `stack` via respective source builds.
This commit is contained in:
2024-07-13 23:40:19 -07:00
parent b7900f1eef
commit 9975d3471c
6 changed files with 7 additions and 13 deletions

View File

@@ -22,7 +22,6 @@
USER root USER root
RUN pacman -Syu \ RUN pacman -Syu \
ghc \
stack \ stack \
--noconfirm --disable-download-timeout --noconfirm --disable-download-timeout

View File

@@ -22,7 +22,6 @@
USER root USER root
RUN pacman -Syu \ RUN pacman -Syu \
ghc \
stack \ stack \
--noconfirm --disable-download-timeout --noconfirm --disable-download-timeout

View File

@@ -28,11 +28,6 @@ RUN pacman -Rsc \
hledger-web \ hledger-web \
--noconfirm --noconfirm
# Remove incompatible (need `ghc` via `stack`)
RUN pacman -Rsc \
ghc \
--noconfirm
USER builder USER builder
WORKDIR /usr/local/src WORKDIR /usr/local/src
RUN git clone https://github.com/simonmichael/hledger -b master RUN git clone https://github.com/simonmichael/hledger -b master

View File

@@ -22,7 +22,7 @@
USER root USER root
RUN apt-get install -y \ RUN apt-get install -y \
ghc \ g++ \
haskell-stack haskell-stack
# TODO: upstream-integrate with hledger? packaged somewhere? would like to not have to clone and build here... # TODO: upstream-integrate with hledger? packaged somewhere? would like to not have to clone and build here...

View File

@@ -22,7 +22,7 @@
USER root USER root
RUN apt-get install -y \ RUN apt-get install -y \
ghc \ g++ \
haskell-stack haskell-stack
USER builder USER builder

View File

@@ -37,7 +37,6 @@ container:
base: base:
packages: packages:
- "bc" - "bc"
- "ghc"
- "git" - "git"
- "hledger-iadd" - "hledger-iadd"
- "hledger-ui" - "hledger-ui"
@@ -52,6 +51,7 @@ container:
#- "unuran" #- "unuran"
commands: commands:
- "csvstat --version" - "csvstat --version"
- "ghc-pkg --version"
- "hledger-flow --version" - "hledger-flow --version"
- "shyaml --version" - "shyaml --version"
fetch: fetch:
@@ -82,12 +82,12 @@ container:
packages: packages:
- "bc" - "bc"
- "cargo" - "cargo"
- "ghc" - "g++"
- "git" - "git"
- "haskell-stack" - "haskell-stack"
- "hledger"
- "hledger-ui" - "hledger-ui"
- "hledger-web" - "hledger-web"
- "hledger"
- "pipx" - "pipx"
- "vim" - "vim"
- "visidata" - "visidata"
@@ -95,10 +95,11 @@ container:
# For experimental build # For experimental build
#- "libunuran-dev" #- "libunuran-dev"
commands: commands:
- "xsv --version"
- "csvstat --version" - "csvstat --version"
- "ghc-pkg --version"
- "hledger-flow --version" - "hledger-flow --version"
- "shyaml --version" - "shyaml --version"
- "xsv --version"
fetch: fetch:
packages: packages:
- "composer" - "composer"