EvergreenCrypto/docker-finance
1
1
Fork 1
Code Issues 31 Pull Requests Actions Releases 10 Activity

client: remove ghc package requirement

Browse Source 
Will be managed by `stack` via respective source builds.
This commit is contained in:
Aaron Fiore
2024-07-13 23:40:19 -07:00
parent b7900f1eef
commit 9975d3471c
6 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/Dockerfiles/finance/archlinux/Dockerfile.hledger-flow.src.in
View File

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

1
client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger-flow.src.in
View File

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

5
client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger.src.in
View File

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

2
client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.src.in
View File

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

2
client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.hledger-flow.src.in
View File

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

9
client/docker-finance.yaml
View File

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