Skip to content

Commit 0bd43d2

Browse files
authored
Merge pull request #719 from NatLabRockies/deps
Update dependencies
2 parents efd87d7 + 69a0864 commit 0bd43d2

13 files changed

Lines changed: 30 additions & 28 deletions

File tree

Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export PREFIX=$(prefix)
1515
default: all
1616

1717
# Download and locally install the "task" tool.
18-
task_version:=3.50.0
18+
task_version:=3.51.1
1919
$(source_dir)/tasks/bootstrap-$(task_version): ;
2020
$(work_dir)/stamp/bootstrap-$(task_version): $(source_dir)/tasks/bootstrap-$(task_version)
2121
$(source_dir)/tasks/bootstrap-$(task_version)

build/patches/lrexlib-pcre2.patch

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
diff --git a/lrexlib-pcre2-2.9.2-1.rockspec b/lrexlib-pcre2-2.9.2-1.rockspec
2-
index ea788041..9ca5fbf9 100644
3-
--- a/lrexlib-pcre2-2.9.2-1.rockspec
4-
+++ b/lrexlib-pcre2-2.9.2-1.rockspec
5-
@@ -32,9 +32,11 @@ build = {
1+
--- a/lrexlib-pcre2-2.9.3-1.rockspec
2+
+++ b/lrexlib-pcre2-2.9.3-1.rockspec
3+
@@ -24,6 +24,7 @@
64
},
75
libdirs = {
86
"$(PCRE2_LIBDIR)",
97
+ "$(STAGE_EMBEDDED_LIBDIR)",
8+
},
9+
sources = {
10+
"src/common.c",
11+
@@ -36,6 +37,7 @@
1012
},
1113
libraries = {
1214
"pcre2-8",

src/api-umbrella-git-1.rockspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ source = {
88
dependencies = {
99
"argparse ~> 0.7.2",
1010
"bcrypt ~> 2.3",
11-
"dkjson ~> 2.9",
11+
"dkjson ~> 2.10",
1212
"inspect ~> 3.1.3",
1313
"lapis ~> 1.18.0",
1414
"libcidr-ffi ~> 1.0.0",

src/api-umbrella/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7.2
1+
1.7.3

src/luarocks.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ return {
55
bcrypt = "2.3-1",
66
bit32 = "5.3.5.1-1",
77
date = "2.2.1-2",
8-
dkjson = "2.9-1",
8+
dkjson = "2.10-1",
99
etlua = "1.3.0-1",
1010
inspect = "3.1.3-0",
1111
lapis = "1.18.0-1",

tasks/app-deps/luarocks

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ luarocks_install "./api-umbrella-git-1.rockspec" "git-1" "${extra_args[@]}"
1919

2020
# lrexlib-pcre2
2121
(
22-
lrexlib_pcre2_version="2.9.2-1"
23-
lrexlib_pcre2_hash="37e979f4899becf0b936482ee76b4e169c1763c03a2748d8a13ce1872a3a28a0"
22+
lrexlib_pcre2_version="2.9.3-1"
23+
lrexlib_pcre2_hash="d6edca97076f737639502f9d10bc01f5f33eaecdccab96496b2bc0b224fcc19f"
2424

2525
mkdir -p ./lrexlib-pcre2
2626
cd ./lrexlib-pcre2
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ root_dir="$(cd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")" && pwd)"
55
# shellcheck source=tasks/helpers.sh
66
source "$root_dir/tasks/helpers.sh"
77

8-
task_version="3.50.0"
9-
task_hash="d449ba85ab85a0769989d78f8b9872938e4ba9347f7f4f925f73d98272a0a655"
8+
task_version="3.51.1"
9+
task_hash="da7e92f0ff961ef2aae7cfecbad8d1fd2a08d7b09ba968673adf7ff389b243b5"
1010
if [ "$TARGETARCH" == "arm64" ]; then
11-
task_hash="ee67e7d999a4a70711bff1946c70bf76628012c91d9be55626ee90ba976897da"
11+
task_hash="49c58bb00eff2449a5553f3b3e694fc424e0dc04d5c669d8831126daee1000f8"
1212
fi
1313

1414
task_working_dir

tasks/build-deps/nodejs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
set -e -u -x
55
source ./tasks/helpers.sh
66

7-
nodejs_version="22.22.2"
8-
nodejs_hash="88fd1ce767091fd8d4a99fdb2356e98c819f93f3b1f8663853a2dee9b438068a"
7+
nodejs_version="22.22.3"
8+
nodejs_hash="2e5d13569282d016861fae7c8f935e741693c269101a5bebcf761a5376d1f99f"
99

1010
download_arch="$TARGETARCH"
1111
if [ "$TARGETARCH" == "amd64" ]; then
1212
download_arch="x64"
1313
elif [ "$TARGETARCH" == "arm64" ]; then
14-
nodejs_hash="e9e1930fd321a470e29bb68f30318bf58e3ecb4acb4f1533fb19c58328a091fe"
14+
nodejs_hash="1c4a9933a5e45bc88f54f70b5f91232c127ec49f1a5989d23fb85824c7adf9b7"
1515
fi
1616

1717
task_working_dir

tasks/build-deps/pnpm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
pnpm_version="10.33.2"
3+
pnpm_version="10.33.4"
44

55
set -e -u -x
66
source ./tasks/helpers.sh

tasks/deps/fluent-bit

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
set -e -u -x
44
source ./tasks/helpers.sh
55

6-
fluent_bit_version="5.0.4"
7-
fluent_bit_hash="8ea5a49e960b8888280a84cc5d0e5f3b354ec8763c9759b4ebcd6ddba759a606"
6+
fluent_bit_version="5.0.6"
7+
fluent_bit_hash="bffe424e9010e89f412fbc0bbd054040aa4f447b9f2f20ffd5b42110db9b2fa3"
88

99
task_working_dir
1010
download "https://github.com/fluent/fluent-bit/archive/refs/tags/v${fluent_bit_version}.tar.gz" "sha256" "$fluent_bit_hash"

0 commit comments

Comments
 (0)