From 9975d3471c11b658af8c3defc224dd825d9bef43 Mon Sep 17 00:00:00 2001
From: Aaron Fiore <founder@evergreencrypto.co>
Date: Sat, 13 Jul 2024 23:40:19 -0700
Subject: [PATCH] client: remove `ghc` package requirement

Will be managed by `stack` via respective source builds.
---
 .../finance/archlinux/Dockerfile.hledger-flow.src.in     | 1 -
 .../experimental/Dockerfile.hledger-flow.src.in          | 1 -
 .../archlinux/experimental/Dockerfile.hledger.src.in     | 5 -----
 .../finance/ubuntu/Dockerfile.hledger-flow.src.in        | 2 +-
 .../ubuntu/experimental/Dockerfile.hledger-flow.src.in   | 2 +-
 client/docker-finance.yaml                               | 9 +++++----
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/client/Dockerfiles/finance/archlinux/Dockerfile.hledger-flow.src.in b/client/Dockerfiles/finance/archlinux/Dockerfile.hledger-flow.src.in
index 871257d..31c73fe 100644
--- a/client/Dockerfiles/finance/archlinux/Dockerfile.hledger-flow.src.in
+++ b/client/Dockerfiles/finance/archlinux/Dockerfile.hledger-flow.src.in
@@ -22,7 +22,6 @@
 USER root
 
 RUN pacman -Syu \
-  ghc \
   stack \
   --noconfirm --disable-download-timeout
 
diff --git a/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger-flow.src.in b/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger-flow.src.in
index 48a586b..8d52384 100644
--- a/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger-flow.src.in
+++ b/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger-flow.src.in
@@ -22,7 +22,6 @@
 USER root
 
 RUN pacman -Syu \
-  ghc \
   stack \
   --noconfirm --disable-download-timeout
 
diff --git a/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger.src.in b/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger.src.in
index 9b592f4..decfa31 100644
--- a/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger.src.in
+++ b/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger.src.in
@@ -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
diff --git a/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.src.in b/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.src.in
index 8145cc1..16de2af 100644
--- a/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.src.in
+++ b/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.src.in
@@ -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...
diff --git a/client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.hledger-flow.src.in b/client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.hledger-flow.src.in
index 008fdad..0946261 100644
--- a/client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.hledger-flow.src.in
+++ b/client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.hledger-flow.src.in
@@ -22,7 +22,7 @@
 USER root
 
 RUN apt-get install -y \
-  ghc \
+  g++ \
   haskell-stack
 
 USER builder
diff --git a/client/docker-finance.yaml b/client/docker-finance.yaml
index ce7c7c9..d35bf2a 100644
--- a/client/docker-finance.yaml
+++ b/client/docker-finance.yaml
@@ -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"