Skip to content

Commit 233c50c

Browse files
committed
remove perl package deps (they are now vendored in by golpe)
1 parent c0dec7c commit 233c50c

9 files changed

+16
-23
lines changed

.github/workflows/ubuntu.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ jobs:
1616
run: |
1717
sudo apt update && sudo apt install -y --no-install-recommends \
1818
git g++ make pkg-config libtool ca-certificates \
19-
libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev \
20-
liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
19+
libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
2120
git submodule update --init
2221
make setup-golpe
2322
make -j4

Dockerfile

-4
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,13 @@ RUN \
1818
pkgconfig \
1919
libtool \
2020
ca-certificates \
21-
perl-yaml \
22-
perl-template-toolkit \
23-
perl-app-cpanminus \
2421
libressl-dev \
2522
zlib-dev \
2623
lmdb-dev \
2724
flatbuffers-dev \
2825
libsecp256k1-dev \
2926
zstd-dev \
3027
&& rm -rf /var/cache/apk/* \
31-
&& cpanm Regexp::Grammars \
3228
&& git submodule update --init \
3329
&& make setup-golpe \
3430
&& make -j4

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ LDLIBS += -lsecp256k1 -lzstd
88
INCS += -Iexternal/negentropy/cpp
99

1010
build/StrfryTemplates.h: $(shell find src/tmpls/ -type f -name '*.tmpl')
11-
perl golpe/external/templar/templar.pl src/tmpls/ strfrytmpl $@
11+
PERL5LIB=golpe/vendor/ perl golpe/external/templar/templar.pl src/tmpls/ strfrytmpl $@
1212

1313
src/apps/relay/RelayWebsocket.o: build/StrfryTemplates.h

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ A C++20 compiler is required, along with a few other common dependencies. On Deb
3131

3232
#### Linux
3333

34-
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
34+
sudo apt install -y git g++ make libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
3535
git clone https://github.com/hoytech/strfry && cd strfry/
3636
git submodule update --init
3737
make setup-golpe
3838
make -j4
3939

4040
#### FreeBSD
4141

42-
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
42+
pkg install -y gcc gmake cmake git perl5 openssl lmdb flatbuffers libuv libinotify zstr secp256k1 zlib-ng
4343
git clone https://github.com/hoytech/strfry && cd strfry/
4444
git submodule update --init
4545
gmake setup-golpe

arch.Dockerfile

-5
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,9 @@ RUN pacman -Syu --noconfirm
1414
RUN pacman -S --noconfirm \
1515
# build essentials
1616
base-devel git \
17-
# perl stuff
18-
cpanminus perl-template-toolkit perl-yaml \
1917
# flatbuffers, lmdb, libsecp256k1
2018
flatbuffers lmdb libsecp256k1
2119

22-
# necessary perl pod
23-
RUN /usr/bin/vendor_perl/cpanm Regexp::Grammars
24-
2520
# update submodules
2621
RUN git submodule update --init
2722

golpe

Submodule golpe updated 58 files

golpe.yaml

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
appName: strfry
2-
onAppStartup: true
3-
useGlobalH: true
4-
customLMDBSetup: true
2+
features:
3+
ssl: true
4+
config: true
5+
onAppStartup: true
6+
db: true
7+
customLMDBSetup: true
8+
flatbuffers: true
9+
websockets: true
510

611
flatBuffers: |
712
include "../fbs/nostr-index.fbs";

shell.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
with pkgs;
33
mkShell {
44
buildInputs = [
5-
perl perlPackages.YAML perlPackages.TemplateToolkit perlPackages.RegexpGrammars
6-
lmdb zstd secp256k1 flatbuffers zlib openssl libuv
5+
perl lmdb zstd secp256k1 flatbuffers zlib openssl libuv
76
];
87
}

ubuntu.Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ ENV TZ=Europe/London
33
WORKDIR /build
44
RUN apt update && apt install -y --no-install-recommends \
55
git g++ make pkg-config libtool ca-certificates \
6-
libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev \
7-
liblmdb-dev libflatbuffers-dev libsecp256k1-dev \
8-
libzstd-dev
6+
libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev \
7+
libsecp256k1-dev libzstd-dev
98

109
COPY . .
1110
RUN git submodule update --init

0 commit comments

Comments
 (0)