From d0a93846480f7de927365b63580c485eb3e6753b Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Thu, 12 Dec 2024 00:22:48 -0800 Subject: [PATCH 1/2] client: Dockerfiles: remote: hledger-suite: bump hledger to 1.41 --- client/Dockerfiles/remote/hledger-suite/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/Dockerfiles/remote/hledger-suite/Dockerfile b/client/Dockerfiles/remote/hledger-suite/Dockerfile index dd819e8..136e780 100644 --- a/client/Dockerfiles/remote/hledger-suite/Dockerfile +++ b/client/Dockerfiles/remote/hledger-suite/Dockerfile @@ -48,7 +48,7 @@ RUN stack install --resolver="lts" --install-ghc --local-bin-path=/usr/local/bin # WORKDIR /usr/local/src -RUN git clone --depth=1 https://github.com/simonmichael/hledger -b 1.40 +RUN git clone --depth=1 https://github.com/simonmichael/hledger -b 1.41 WORKDIR /usr/local/src/hledger RUN stack setup From 83f5355dc3280ed2b75e9963e08fad7eb8d78d40 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Thu, 12 Dec 2024 17:39:53 -0800 Subject: [PATCH 2/2] client: Dockerfiles: remote: hledger-suite: update hledger-iadd resolver Uses older resolver (should be appropriate to v1.3.21). Fixes build breakage. --- client/Dockerfiles/remote/hledger-suite/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/Dockerfiles/remote/hledger-suite/Dockerfile b/client/Dockerfiles/remote/hledger-suite/Dockerfile index 136e780..eed9788 100644 --- a/client/Dockerfiles/remote/hledger-suite/Dockerfile +++ b/client/Dockerfiles/remote/hledger-suite/Dockerfile @@ -41,7 +41,7 @@ RUN git clone --depth=1 https://github.com/hpdeifel/hledger-iadd -b v1.3.21 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" --install-ghc --local-bin-path=/usr/local/bin hledger-iadd +RUN stack install --resolver="lts-22.20" --install-ghc --local-bin-path=/usr/local/bin hledger-iadd # # hledger / hledger-ui / hledger-web