From 233c50c88be68c08de93211300bd80cbc89523ae Mon Sep 17 00:00:00 2001
From: Doug Hoyte <doug@hcsw.org>
Date: Thu, 18 Jul 2024 21:28:42 -0400
Subject: [PATCH] remove perl package deps (they are now vendored in by golpe)

---
 .github/workflows/ubuntu.yml |  3 +--
 Dockerfile                   |  4 ----
 Makefile                     |  2 +-
 README.md                    |  4 ++--
 arch.Dockerfile              |  5 -----
 golpe                        |  2 +-
 golpe.yaml                   | 11 ++++++++---
 shell.nix                    |  3 +--
 ubuntu.Dockerfile            |  5 ++---
 9 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index febe6cb..8b6ac21 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -16,8 +16,7 @@ jobs:
         run: |
           sudo apt update && sudo apt install -y --no-install-recommends \
           git g++ make pkg-config libtool ca-certificates \
-          libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev \
-          liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
+          libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
           git submodule update --init
           make setup-golpe
           make -j4
diff --git a/Dockerfile b/Dockerfile
index d48c80e..9019372 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,9 +18,6 @@ RUN \
     pkgconfig \
     libtool \
     ca-certificates \
-    perl-yaml \
-    perl-template-toolkit \
-    perl-app-cpanminus \
     libressl-dev \
     zlib-dev \
     lmdb-dev \
@@ -28,7 +25,6 @@ RUN \
     libsecp256k1-dev \
     zstd-dev \
   && rm -rf /var/cache/apk/* \
-  && cpanm Regexp::Grammars \
   && git submodule update --init \
   && make setup-golpe \
   && make -j4
diff --git a/Makefile b/Makefile
index cdbb728..22e01d5 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,6 @@ LDLIBS += -lsecp256k1 -lzstd
 INCS += -Iexternal/negentropy/cpp
 
 build/StrfryTemplates.h: $(shell find src/tmpls/ -type f -name '*.tmpl')
-	perl golpe/external/templar/templar.pl src/tmpls/ strfrytmpl $@
+	PERL5LIB=golpe/vendor/ perl golpe/external/templar/templar.pl src/tmpls/ strfrytmpl $@
 
 src/apps/relay/RelayWebsocket.o: build/StrfryTemplates.h
diff --git a/README.md b/README.md
index 9790e48..0e1b451 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ A C++20 compiler is required, along with a few other common dependencies. On Deb
 
 #### Linux
 
-    sudo apt install -y git build-essential libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
+    sudo apt install -y git g++ make libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
     git clone https://github.com/hoytech/strfry && cd strfry/
     git submodule update --init
     make setup-golpe
@@ -39,7 +39,7 @@ A C++20 compiler is required, along with a few other common dependencies. On Deb
 
 #### FreeBSD
 
-    pkg install -y gcc gmake cmake git perl5 openssl lmdb flatbuffers libuv libinotify zstr secp256k1 zlib-ng p5-Regexp-Grammars p5-Module-Install-Template p5-YAML
+    pkg install -y gcc gmake cmake git perl5 openssl lmdb flatbuffers libuv libinotify zstr secp256k1 zlib-ng
     git clone https://github.com/hoytech/strfry && cd strfry/
     git submodule update --init
     gmake setup-golpe
diff --git a/arch.Dockerfile b/arch.Dockerfile
index 311c610..0698726 100644
--- a/arch.Dockerfile
+++ b/arch.Dockerfile
@@ -14,14 +14,9 @@ RUN pacman -Syu --noconfirm
 RUN pacman -S --noconfirm \
 # build essentials
   base-devel git \
-# perl stuff
-  cpanminus perl-template-toolkit perl-yaml \
 # flatbuffers, lmdb, libsecp256k1
   flatbuffers lmdb libsecp256k1
 
-# necessary perl pod
-RUN /usr/bin/vendor_perl/cpanm Regexp::Grammars
-
 # update submodules
 RUN git submodule update --init 
 
diff --git a/golpe b/golpe
index 19ce171..5046f90 160000
--- a/golpe
+++ b/golpe
@@ -1 +1 @@
-Subproject commit 19ce1715c271eb5c1ae3dc9f422093e4afe6c5e7
+Subproject commit 5046f9001ab3afc3bb388dbcef5f0ce1362f3e15
diff --git a/golpe.yaml b/golpe.yaml
index 9af2d7d..d132275 100644
--- a/golpe.yaml
+++ b/golpe.yaml
@@ -1,7 +1,12 @@
 appName: strfry
-onAppStartup: true
-useGlobalH: true
-customLMDBSetup: true
+features:
+    ssl: true
+    config: true
+    onAppStartup: true
+    db: true
+    customLMDBSetup: true
+    flatbuffers: true
+    websockets: true
 
 flatBuffers: |
     include "../fbs/nostr-index.fbs";
diff --git a/shell.nix b/shell.nix
index 081c8c2..05c1c8f 100644
--- a/shell.nix
+++ b/shell.nix
@@ -2,7 +2,6 @@
 with pkgs;
 mkShell {
   buildInputs = [ 
-    perl perlPackages.YAML perlPackages.TemplateToolkit perlPackages.RegexpGrammars
-    lmdb zstd secp256k1 flatbuffers zlib openssl libuv
+    perl lmdb zstd secp256k1 flatbuffers zlib openssl libuv
   ];
 }
diff --git a/ubuntu.Dockerfile b/ubuntu.Dockerfile
index d89a6b9..8783e3e 100644
--- a/ubuntu.Dockerfile
+++ b/ubuntu.Dockerfile
@@ -3,9 +3,8 @@ ENV TZ=Europe/London
 WORKDIR /build
 RUN apt update && apt install -y --no-install-recommends \
     git g++ make pkg-config libtool ca-certificates \
-    libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev \
-    liblmdb-dev libflatbuffers-dev libsecp256k1-dev \
-    libzstd-dev
+    libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev \
+    libsecp256k1-dev libzstd-dev
 
 COPY . .
 RUN git submodule update --init