From a7289bde1637bf580c825c6ff47ffe38a63ebc0e Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Thu, 4 Sep 2025 11:46:39 -0700 Subject: [PATCH 1/5] client: Dockerfiles: remote: hledger-suite: bump hledger to 1.50 --- client/Dockerfiles/remote/hledger-suite/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/Dockerfiles/remote/hledger-suite/Dockerfile b/client/Dockerfiles/remote/hledger-suite/Dockerfile index abe0fb3..32de2e6 100644 --- a/client/Dockerfiles/remote/hledger-suite/Dockerfile +++ b/client/Dockerfiles/remote/hledger-suite/Dockerfile @@ -48,10 +48,10 @@ RUN stack install --resolver="lts-22.20" --install-ghc --local-bin-path=/usr/loc # WORKDIR /usr/local/src -RUN git clone --depth=1 https://github.com/simonmichael/hledger -b 1.43.2 +RUN git clone --depth=1 https://github.com/simonmichael/hledger -b 1.50 WORKDIR /usr/local/src/hledger RUN stack setup -RUN stack install --resolver="nightly-2025-05-01" --install-ghc --local-bin-path=/usr/local/bin +RUN stack install --resolver="lts-24.8" --install-ghc --local-bin-path=/usr/local/bin # vim: sw=2 sts=2 si ai et From cc0ec7a112f192983895761afc0d44f4057e9d25 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Fri, 5 Sep 2025 16:30:08 -0700 Subject: [PATCH 2/5] client: Dockerfiles: remote: hledger-suite: use hledger-flow master tip As discussed in #216, hledger-flow breaks with the latest hledger release (1.50). Until hledger-flow has another release, current master tip appears to be as stable as v0.15.0 and includes fixes that work with hledger 1.50. --- client/Dockerfiles/remote/hledger-suite/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/Dockerfiles/remote/hledger-suite/Dockerfile b/client/Dockerfiles/remote/hledger-suite/Dockerfile index 32de2e6..bf298bb 100644 --- a/client/Dockerfiles/remote/hledger-suite/Dockerfile +++ b/client/Dockerfiles/remote/hledger-suite/Dockerfile @@ -25,7 +25,10 @@ RUN apt-get upgrade -y # WORKDIR /usr/local/src -RUN git clone --depth=1 https://github.com/apauley/hledger-flow -b v0.15.0 + +# NOTE: haskell:latest currently doesn't provide git 2.49.0+ for `git clone --revision` +RUN git clone https://github.com/apauley/hledger-flow +RUN git -C hledger-flow checkout 0bcf667b24b030e30acee350c05dd69ba5ec20b5 WORKDIR /usr/local/src/hledger-flow RUN stack setup From 4c0474ea9feab98837a9e8d57f64506183027c0c Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Thu, 18 Sep 2025 15:30:19 -0700 Subject: [PATCH 3/5] client: Dockerfiles: remote: hledger-suite: bump hledger-flow to v0.16.0 Also update build process for a successful build and better caching. --- client/Dockerfiles/remote/hledger-suite/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/client/Dockerfiles/remote/hledger-suite/Dockerfile b/client/Dockerfiles/remote/hledger-suite/Dockerfile index bf298bb..63ce5bc 100644 --- a/client/Dockerfiles/remote/hledger-suite/Dockerfile +++ b/client/Dockerfiles/remote/hledger-suite/Dockerfile @@ -25,14 +25,13 @@ RUN apt-get upgrade -y # WORKDIR /usr/local/src - -# NOTE: haskell:latest currently doesn't provide git 2.49.0+ for `git clone --revision` -RUN git clone https://github.com/apauley/hledger-flow -RUN git -C hledger-flow checkout 0bcf667b24b030e30acee350c05dd69ba5ec20b5 +RUN git clone --depth=1 https://github.com/apauley/hledger-flow -b v0.16.0 WORKDIR /usr/local/src/hledger-flow RUN stack setup -RUN stack install --install-ghc --local-bin-path=/usr/local/bin +RUN stack install --install-ghc +RUN stack install --dependencies-only +RUN stack install --local-bin-path=/usr/local/bin # # hledger-iadd From 6c1b7a0fb19b39233a9987a0991cf9b525289743 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Thu, 18 Sep 2025 15:33:46 -0700 Subject: [PATCH 4/5] client: Dockerfiles: remote: hledger-suite: bump hledger-iadd to v1.3.22 Also update build process for a successful build and better caching. Despite recent releases, hledger-iadd's stack configuration is not regularly maintained (very out of date). The install documentation is also very out of date. The maintainer appears to be using cabal for building. --- client/Dockerfiles/remote/hledger-suite/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/client/Dockerfiles/remote/hledger-suite/Dockerfile b/client/Dockerfiles/remote/hledger-suite/Dockerfile index 63ce5bc..7b72860 100644 --- a/client/Dockerfiles/remote/hledger-suite/Dockerfile +++ b/client/Dockerfiles/remote/hledger-suite/Dockerfile @@ -38,12 +38,14 @@ RUN stack install --local-bin-path=/usr/local/bin # WORKDIR /usr/local/src -RUN git clone --depth=1 https://github.com/hpdeifel/hledger-iadd -b v1.3.21 +RUN git clone --depth=1 https://github.com/hpdeifel/hledger-iadd -b v1.3.22 WORKDIR /usr/local/src/hledger-iadd -RUN sed -i 's/^ - hledger-lib-1\.32\.2/ - hledger-lib-1\.33\.1@sha256\:3920c9b273ecae8be59628b6f6f93fd1b4f3cee03a89fda23b0c4b183d0577f2\,7844/g' stack.yaml -RUN stack setup -RUN stack install --resolver="lts-22.20" --install-ghc --local-bin-path=/usr/local/bin hledger-iadd +RUN cabal update +RUN cabal v1-install --only-dependencies +RUN cabal v1-configure --bindir /usr/local/bin +RUN cabal v1-build +RUN cabal v1-copy # # hledger / hledger-ui / hledger-web From f28a148f5c31b5376590eecbb00e8585a4d92d34 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Thu, 18 Sep 2025 15:35:19 -0700 Subject: [PATCH 5/5] client: Dockerfiles: remote: hledger-suite: bump hledger to 1.50.1 Also update build process for a successful build and better caching. --- client/Dockerfiles/remote/hledger-suite/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/Dockerfiles/remote/hledger-suite/Dockerfile b/client/Dockerfiles/remote/hledger-suite/Dockerfile index 7b72860..204bd28 100644 --- a/client/Dockerfiles/remote/hledger-suite/Dockerfile +++ b/client/Dockerfiles/remote/hledger-suite/Dockerfile @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -FROM haskell:latest +FROM haskell:9.12.2 RUN apt-get update -y RUN apt-get upgrade -y @@ -52,10 +52,11 @@ RUN cabal v1-copy # WORKDIR /usr/local/src -RUN git clone --depth=1 https://github.com/simonmichael/hledger -b 1.50 +RUN git clone --depth=1 https://github.com/simonmichael/hledger -b 1.50.1 WORKDIR /usr/local/src/hledger RUN stack setup -RUN stack install --resolver="lts-24.8" --install-ghc --local-bin-path=/usr/local/bin +RUN stack install --stack-yaml=stack912.yaml --dependencies-only +RUN stack install --stack-yaml=stack912.yaml --local-bin-path=/usr/local/bin # vim: sw=2 sts=2 si ai et