remove perl package deps (they are now vendored in by golpe)

.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 \
+          libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
-          liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
           git submodule update --init
           make setup-golpe
           make -j4

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

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

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

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 
 

golpe

@@ -1 +1 @@
-Subproject commit 19ce1715c271eb5c1ae3dc9f422093e4afe6c5e7
+Subproject commit 5046f9001ab3afc3bb388dbcef5f0ce1362f3e15

golpe.yaml

@@ -1,7 +1,12 @@
 appName: strfry
+features:
+    ssl: true
+    config: true
     onAppStartup: true
-useGlobalH: true
+    db: true
     customLMDBSetup: true
+    flatbuffers: true
+    websockets: true
 
 flatBuffers: |
     include "../fbs/nostr-index.fbs";

shell.nix

@@ -2,7 +2,6 @@
 with pkgs;
 mkShell {
   buildInputs = [ 
-    perl perlPackages.YAML perlPackages.TemplateToolkit perlPackages.RegexpGrammars
+    perl lmdb zstd secp256k1 flatbuffers zlib openssl libuv
-    lmdb zstd secp256k1 flatbuffers zlib openssl libuv
   ];
 }

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 \
+    libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev \
-    liblmdb-dev libflatbuffers-dev libsecp256k1-dev \
+    libsecp256k1-dev libzstd-dev
-    libzstd-dev
 
 COPY . .
 RUN git submodule update --init