Merge pull request #312 into master

07a10817 repo: gitea: workflows: dfi: update edit of build file (Aaron Fiore)
070a6646 client: manifest: archlinux: finance: add "related" category (Aaron Fiore)
dbbe4246 client: archlinux: move `calc` package to base image (Aaron Fiore)
270e6e7e client: archlinux: add 'Related "useful" packages' section (Aaron Fiore)

.gitea/workflows/dfi.bash

@@ -140,7 +140,7 @@ function client::finance::edit()
       # Build: uncomment all optional packages and plugin dependencies from custom build file
       _file="${_path}/Dockerfiles/${USER:?}@$(uname -n)"
       [ ! -f "$_file" ] && exit 1
-      sed -i '18,56s/#//' "$_file"
+      sed -i '18,51s/#//' "$_file"
 
       # Build: uncomment custom compose merge file
       _file+=".yml"

client/Dockerfiles/remote/docker-finance/finance/Dockerfile.archlinux

@@ -36,12 +36,20 @@ RUN pacman -Syu --noconfirm --disable-download-timeout
 RUN pacman -Syu \
   bc \
   csvkit \
-  less \
   vim \
   xan \
   yq \
   --noconfirm --disable-download-timeout
 
+#
+# Related "useful" packages (not dependencies)
+#
+
+RUN pacman -Syu \
+  calc \
+  less \
+  --noconfirm --disable-download-timeout
+
 #
 # Entrypoint
 #

client/conf.d/client/Dockerfiles/finance/Dockerfile.archlinux.in

@@ -36,11 +36,6 @@ RUN pacman -Syu --noconfirm
 ## Optional (examples)
 ##
 
-## Finance-related
-#RUN pacman -Syu \
-#  calc \
-#  --noconfirm --disable-download-timeout
-
 ## Text editors
 #RUN pacman -Syu \
 #  emacs-nox \

client/docker-finance.yaml

@@ -48,6 +48,11 @@ container:
           - "hledger-iadd --version"
           - "hledger-ui --version"
           - "hledger-web --version"
+      related:
+        packages:
+          - "calc"
+          - "less"
+        commands:
       fetch:
         packages:
           - "composer"