Skip to content

Commit d93d4ad

Browse files
committed
feat (villas-chronics): Add bzip2 and nlohmann/json packages for villas-chronics
Signed-off-by: Ritesh.K <riteshkarki6@gmail.com>
1 parent a604139 commit d93d4ad

9 files changed

Lines changed: 488 additions & 445 deletions

packaging/deps.sh

Lines changed: 462 additions & 438 deletions
Large diffs are not rendered by default.

packaging/docker/Dockerfile.debian

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ RUN apt-get update && \
5252
libssl-dev \
5353
libusb-1.0-0-dev \
5454
libzmq3-dev \
55-
uuid-dev
55+
uuid-dev \
56+
libbz2-dev \
57+
nlohmann-json3-dev
5658

5759
# Install unpackaged dependencies from source
5860
ADD packaging/patches /deps/patches

packaging/docker/Dockerfile.debian-multiarch

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ RUN apt-get update && \
5858
libssl-dev:${ARCH} \
5959
libusb-1.0-0-dev:${ARCH} \
6060
libzmq3-dev:${ARCH} \
61-
uuid-dev:${ARCH}
61+
uuid-dev:${ARCH} \
62+
nlohmann-json3-dev:${ARCH} \
63+
libbz2:${ARCH}
6264

6365
ADD cmake/toolchains/debian-${ARCH}.cmake /
6466

packaging/docker/Dockerfile.fedora

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ RUN dnf -y install \
6464
protobuf-c-devel \
6565
protobuf-devel \
6666
spdlog-devel \
67-
zeromq-devel
67+
zeromq-devel \
68+
bzip2-devel \
69+
json-devel
6870

6971
# Install unpackaged dependencies from source
7072
# TODO: We currently need to build with GCC 14 to get OpenDSSC working

packaging/docker/Dockerfile.fedora-minimal

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ RUN dnf -y install \
2424
jansson-devel \
2525
spdlog-devel \
2626
fmt-devel \
27-
libwebsockets-devel
27+
libwebsockets-devel \
28+
bzip2-devel \
29+
json-devel
30+
2831

2932
ENV LC_ALL=C.UTF-8
3033
ENV LANG=C.UTF-8

packaging/docker/Dockerfile.rocky

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ RUN dnf -y install \
5353
nanomsg-devel \
5454
libnice-devel \
5555
libre-devel \
56-
libwebsockets-devel
56+
libwebsockets-devel \
57+
bzip2-devel \
58+
json-devel
5759

5860
# Install unpackaged dependencies from source
5961
ADD packaging/patches /deps/patches

packaging/docker/Dockerfile.rocky9

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ RUN dnf -y install \
4848
lua-devel \
4949
hiredis-devel \
5050
libnice-devel \
51-
libmodbus-devel
51+
libmodbus-devel \
52+
bzip2-devel \
53+
json-devel
5254

5355
# Install unpackaged dependencies from source
5456
ADD packaging/patches /deps/patches

packaging/docker/Dockerfile.ubuntu

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ RUN apt-get update && \
5959
libusb-1.0-0-dev \
6060
libwebsockets-dev \
6161
libzmq3-dev \
62-
uuid-dev
62+
uuid-dev \
63+
libbz2-dev \
64+
nlohmann-json-dev
6365

6466
# Install unpackaged dependencies from source
6567
ADD packaging/patches /deps/patches

packaging/nix/villas.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
pkg-config,
4949
stdenv,
5050
system,
51+
nlohmann_json,
52+
bzip2,
5153
# Optional dependencies
5254
boxfort,
5355
comedilib,
@@ -151,6 +153,8 @@ stdenv.mkDerivation {
151153
curl
152154
spdlog
153155
bash
156+
nlohmann_json
157+
bzip2
154158
]
155159
++ lib.optionals withExtraTesting [
156160
boxfort

0 commit comments

Comments
 (0)