pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
vector: still doesn't build
Module Name: pkgsrc-wip
Committed By: pin <voidpin%protonmail.com@localhost>
Pushed By: pin
Date: Sat Oct 18 16:12:12 2025 +0200
Changeset: 6689306063683a6691692cd6b9686ea6c44bdb4c
Modified Files:
vector/Makefile
vector/TODO
vector/distinfo
Added Files:
vector/patches/patch-Cargo.toml
Log Message:
vector: still doesn't build
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6689306063683a6691692cd6b9686ea6c44bdb4c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
vector/Makefile | 21 +++++++++------
vector/TODO | 18 ++++++-------
vector/distinfo | 19 +++++++-------
vector/patches/patch-Cargo.toml | 57 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 88 insertions(+), 27 deletions(-)
diffs:
diff --git a/vector/Makefile b/vector/Makefile
index 58195e468a..4d558949e9 100644
--- a/vector/Makefile
+++ b/vector/Makefile
@@ -11,16 +11,15 @@ COMMENT= High-performance observability data pipeline
LICENSE= mpl-2.0
TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
-TOOL_DEPENDS+= cargo-nextest-[0-9]*:../../wip/cargo-nextest
-TOOL_DEPENDS+= cargo-auditable-[0-9]*:../../wip/cargo-auditable
-
-GITHUB_SUBMODULES+= MSxDOS ntapi 24fc1e47677fc9f6e38e5f154e6011dc9b270da6 ntapi
-GITHUB_SUBMODULES+= vectordotdev nix 6c53a918d2d5bf4307fd60a19d9e10913ae71eeb memfd/gnu/musl
-GITHUB_SUBMODULES+= vectordotdev tokio b4bdfda8fe8aa24eba36de0d60063b14f30c7fe7 tokio-util-0.7.13-framed-read-continue-on-error
+#TOOL_DEPENDS+= cargo-nextest-[0-9]*:../../wip/cargo-nextest
+#TOOL_DEPENDS+= cargo-auditable-[0-9]*:../../wip/cargo-auditable
.include "cargo-depends.mk"
# Depends on an unpublished crates. Can't use cargo.mk to fetch it.
+NTAPI_REV= 24fc1e47677fc9f6e38e5f154e6011dc9b270da6
+NIX_REV= 6c53a918d2d5bf4307fd60a19d9e10913ae71eeb
+TOKIO-UTIL_REV= b4bdfda8fe8aa24eba36de0d60063b14f30c7fe7
VRL_REV= 560dac8b6b494d722fa9a57d98ed2e7e36ee75f6
TRACING-TOWER_REV= e0642d949891546a3bb7e47080365ee7274f05cd
GREPTIMEDB-INGESTER_REV= f7243393808640f5123b0d5b7b798da591a4df6e
@@ -31,6 +30,9 @@ TRACING_REV= e0642d949891546a3bb7e47080365ee7274f05cd
GREPTIME-PROTO_REV= 396206c2801b5a3ec51bfe8984c66b686da910e6
DISTFILES= ${DEFAULT_DISTFILES}
+DISTFILES+= ntapi-${NTAPI_REV}.tar.gz
+DISTFILES+= nix-${NIX_REV}.tar.gz
+DISTFILES+= tokio-util-${TOKIO-UTIL_REV}.tar.gz
DISTFILES+= vrl-${VRL_REV}.tar.gz
DISTFILES+= tracing-tower-${TRACING-TOWER_REV}.tar.gz
DISTFILES+= greptimedb-ingester-${GREPTIMEDB-INGESTER_REV}.tar.gz
@@ -40,6 +42,9 @@ DISTFILES+= tracing-core-${TRACING-CORE_REV}.tar.gz
DISTFILES+= tracing-${TRACING_REV}.tar.gz
DISTFILES+= greptime-proto-${GREPTIME-PROTO_REV}.tar.gz
+SITES.ntapi-${NTAPI_REV}.tar.gz= -${MASTER_SITE_GITHUB:=MSxDOS/}ntapi/archive/${NTAPI_REV}.tar.gz
+SITES.nix-${NIX_REV}.tar.gz= -${MASTER_SITE_GITHUB:=vectordotdev/}nix/archive/${NIX_REV}.tar.gz
+SITES.tokio-util-${TOKIO-UTIL_REV}.tar.gz= -${MASTER_SITE_GITHUB:=vectordotdev/}tokio/archive/${TOKIO-UTIL_REV}.tar.gz
SITES.vrl-${VRL_REV}.tar.gz= -${MASTER_SITE_GITHUB:=vectordotdev/}vrl/archive/${VRL_REV}.tar.gz
SITES.tracing-tower-${TRACING-TOWER_REV}.tar.gz= -${MASTER_SITE_GITHUB:=tokio-rs/}tracing/archive/${TRACING-TOWER_REV}.tar.gz
SITES.greptimedb-ingester-${GREPTIMEDB-INGESTER_REV}.tar.gz= -${MASTER_SITE_GITHUB:=GreptimeTeam/}greptimedb-ingester-rust/archive/${GREPTIMEDB-INGESTER_REV}.tar.gz
@@ -67,6 +72,6 @@ RUSTFLAGS+= -C link-arg=-L${BUILDLINK_PREFIX.LuaJIT2}/lib
.include "../../lang/rust/cargo.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../lang/lua54/buildlink3.mk"
-.include "../../lang/LuaJIT2/buildlink3.mk"
+#.include "../../lang/lua54/buildlink3.mk"
+#.include "../../lang/LuaJIT2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/vector/TODO b/vector/TODO
index 6126963bd5..c80ccb85bd 100644
--- a/vector/TODO
+++ b/vector/TODO
@@ -1,13 +1,11 @@
-Still do not pass "makesum" target:
+===> Building for vector-0.50.0
+error: failed to load source for dependency `tokio-util`
-- several dependencies uses git+https schema that probably needs to be fetched
- manually, investigate it!
+Caused by:
+ Unable to update /usr/pkgsrc/wip/vector/work/tokio-b4bdfda8fe8aa24eba36de0d60063b14f30c7fe7
-List of git+https dependencies:
+Caused by:
+ found a virtual manifest at `/usr/pkgsrc/wip/vector/work/tokio-b4bdfda8fe8aa24eba36de0d60063b14f30c7fe7/Cargo.toml` instead of a package manifest
+*** Error code 101
-tracing-tower = { git = "https://github.com/tokio-rs/tracing";, default-features = false, rev = "e0642d949891546a3bb7e47080365ee7274f05cd" }
-greptimedb-ingester = { git = "https://github.com/GreptimeTeam/greptimedb-ingester-rust";, rev = "f7243393808640f5123b0d5b7b798da591a4df6e", optional = true }
-heim = { git = "https://github.com/vectordotdev/heim.git";, branch = "update-nix", default-features = false, features = ["disk"] }
-tokio-util = { git = "https://github.com/vectordotdev/tokio";, branch = "tokio-util-0.7.13-framed-read-continue-on-error" }
-nix = { git = "https://github.com/vectordotdev/nix.git";, branch = "memfd/gnu/musl" }
-ntapi = { git = "https://github.com/MSxDOS/ntapi.git";, rev = "24fc1e47677fc9f6e38e5f154e6011dc9b270da6" }
+Stop.
diff --git a/vector/distinfo b/vector/distinfo
index 9b6d98083e..e9aac30d85 100644
--- a/vector/distinfo
+++ b/vector/distinfo
@@ -3,9 +3,6 @@ $NetBSD: distinfo,v 1.62 2025/07/13 08:54:22 wiz Exp $
BLAKE2s (Inflector-0.11.4.crate) = 2f8b4a805230be3b58267c7fb6b9c26c2ec966378d195673d1128a851cca515d
SHA512 (Inflector-0.11.4.crate) = f1f6463e033b6d3c16c51dc1e1a3f5569954308b95b59058294b7f9310919bbda797e99e6a07529071bb83f0688867a243997d33795a7136b0af73977004296e
Size (Inflector-0.11.4.crate) = 17438 bytes
-BLAKE2s (MSxDOS-ntapi-24fc1e47677fc9f6e38e5f154e6011dc9b270da6.tar.gz) = a230a692e732844e5ac82f57d9bd0935f2f93b79126f3f0ce820042c391d9657
-SHA512 (MSxDOS-ntapi-24fc1e47677fc9f6e38e5f154e6011dc9b270da6.tar.gz) = fdacad49037c51f36ee1cd3f9e63fa76f0741acd7e4e0d6092db6c55896e5b811e341779832d9126664dc068c645afdd895cefc7b1f460ac3f9b1c6b8a0f6067
-Size (MSxDOS-ntapi-24fc1e47677fc9f6e38e5f154e6011dc9b270da6.tar.gz) = 186963 bytes
BLAKE2s (RustyXML-0.3.0.crate) = 762737b65ca51bab4e3494834fa520ad2cb84672b75c7ee89252406b14d9833b
SHA512 (RustyXML-0.3.0.crate) = 87e8ad6e6570a8f2cf20ca8b322864e44f555cec2415f03ec9ce5358514b57f164c548ae9da12bc5cb0dde702dd095f8a493f4fa39c98fde6779ebeedb9f7409
Size (RustyXML-0.3.0.crate) = 17517 bytes
@@ -1680,6 +1677,9 @@ Size (nix-0.26.2.crate) = 277973 bytes
BLAKE2s (nix-0.30.1.crate) = b0926652bc97b0c460f66a5a5e76891fa153f0c1f7ccc78acea2b6d3edc133b4
SHA512 (nix-0.30.1.crate) = 80df8102a3a387d9cd73cd8d756b9fad5c4c4b57f6e94d9acfa24ee07af51f28ba2db70b8d37ddd6c7eae883c7acf9fc366a0100659856939210ffde1b124d87
Size (nix-0.30.1.crate) = 342015 bytes
+BLAKE2s (nix-6c53a918d2d5bf4307fd60a19d9e10913ae71eeb.tar.gz) = 14afc17e78045d822fccad7e316207706fa5941d0e4ef41528b9c146dc90bfb0
+SHA512 (nix-6c53a918d2d5bf4307fd60a19d9e10913ae71eeb.tar.gz) = ada9f87473b7e8051db225a7ebcc859223b6dfea54f5b4ef9654d81954e0ab099dfbea43af2de9b9a710138180f1a6b5d8a3abdcb6212a55a1b4f67c09d6f36f
+Size (nix-6c53a918d2d5bf4307fd60a19d9e10913ae71eeb.tar.gz) = 287155 bytes
BLAKE2s (nkeys-0.4.5.crate) = 9b9af7742f1c521d5f8b139b6afeed4807ac0dbc5f7237ad530d672dd1ec701a
SHA512 (nkeys-0.4.5.crate) = 5a27fd1abfe9ebb60466486c189f1096f6ca7f8ff2281ea4956cb4f7cc2894af4d5b5b8109a47c08034a0b92047f905aebd797f6abc8bda95ee3252363868155
Size (nkeys-0.4.5.crate) = 26818 bytes
@@ -1716,6 +1716,9 @@ Size (ntapi-0.3.7.crate) = 126994 bytes
BLAKE2s (ntapi-0.4.1.crate) = c7457e5b246683fcf12f86bf03b2eb1993253b856c55f9e268da56d2ec83ee36
SHA512 (ntapi-0.4.1.crate) = 8e32d45a508d20f0d3537e056f363270120980dc23564713306e36acbc12a6d379eb3857026fecc16ca75080431e06742e3806801d3e0a848a01f64a8dd4f2d7
Size (ntapi-0.4.1.crate) = 126552 bytes
+BLAKE2s (ntapi-24fc1e47677fc9f6e38e5f154e6011dc9b270da6.tar.gz) = a230a692e732844e5ac82f57d9bd0935f2f93b79126f3f0ce820042c391d9657
+SHA512 (ntapi-24fc1e47677fc9f6e38e5f154e6011dc9b270da6.tar.gz) = fdacad49037c51f36ee1cd3f9e63fa76f0741acd7e4e0d6092db6c55896e5b811e341779832d9126664dc068c645afdd895cefc7b1f460ac3f9b1c6b8a0f6067
+Size (ntapi-24fc1e47677fc9f6e38e5f154e6011dc9b270da6.tar.gz) = 186963 bytes
BLAKE2s (nu-ansi-term-0.50.1.crate) = 7ad6649adec76965226b1a3bc531b33f252fdce3f9e933558d7ccfd4d02dbf61
SHA512 (nu-ansi-term-0.50.1.crate) = c29735a5e1562776251dbd7337a3e4b68eeb299e86c534feab6478512ca5e167b42ebd32c6c461b71187cd375b8a2f587feb962f1501a656543f1429731a95a2
Size (nu-ansi-term-0.50.1.crate) = 28536 bytes
@@ -2862,6 +2865,9 @@ Size (tokio-tungstenite-0.21.0.crate) = 28159 bytes
BLAKE2s (tokio-util-0.7.13.crate) = 4d1d26dee5e51e54b1d101711143b29a39a1d4fd832580af4c30099760f78dff
SHA512 (tokio-util-0.7.13.crate) = 2a1e8fbdd094f81e00ee87eb5ebc4c62825945048105970e52d6d0a872769d268a41ddf91c60158c02a303ecbaa1b19795948b5416f9bbfcb079c5b27d39d51f
Size (tokio-util-0.7.13.crate) = 115191 bytes
+BLAKE2s (tokio-util-b4bdfda8fe8aa24eba36de0d60063b14f30c7fe7.tar.gz) = 67ce5382a4fffb4aa954d4c827ef1a687760a8f470d82fa6bc2b0a6d1328ac4f
+SHA512 (tokio-util-b4bdfda8fe8aa24eba36de0d60063b14f30c7fe7.tar.gz) = b751dfd4b9d94610976191180639469de6f5407b9cf2bb263c9c8fbfb84d35e9f5fa96c5aa7be291253265649a8225bb150b1ef86926c129224412b9e03375d0
+Size (tokio-util-b4bdfda8fe8aa24eba36de0d60063b14f30c7fe7.tar.gz) = 1062929 bytes
BLAKE2s (tokio-websockets-0.10.1.crate) = 51389c17e1074581a56ffef32cf743c4de2598c0cc1d1acf997bb27d0764d0fa
SHA512 (tokio-websockets-0.10.1.crate) = 400060e56dc6b7d3d5eae21320c593979c4403160b074ca42f917a1d45c717f37a66abf52215368be81764d17c0fec5b6d929eecf3d174a229ff5d82b6d9ef7b
Size (tokio-websockets-0.10.1.crate) = 153370 bytes
@@ -3111,12 +3117,6 @@ Size (vcpkg-0.2.15.crate) = 228735 bytes
BLAKE2s (vector-0.50.0.tar.gz) = 01e609de00bb94d8bfbea042bf03df6f72b88ea92f1dc0b707811771a7f7255f
SHA512 (vector-0.50.0.tar.gz) = c0896558c627d85d8205e08892c67fae59fc67d99e7f322bc1e4b323f9a76ed41fc24a08adece914b35801fabefa85dae6b25860c75b100f23b85ad7081cf5b6
Size (vector-0.50.0.tar.gz) = 24544960 bytes
-BLAKE2s (vectordotdev-nix-6c53a918d2d5bf4307fd60a19d9e10913ae71eeb.tar.gz) = 14afc17e78045d822fccad7e316207706fa5941d0e4ef41528b9c146dc90bfb0
-SHA512 (vectordotdev-nix-6c53a918d2d5bf4307fd60a19d9e10913ae71eeb.tar.gz) = ada9f87473b7e8051db225a7ebcc859223b6dfea54f5b4ef9654d81954e0ab099dfbea43af2de9b9a710138180f1a6b5d8a3abdcb6212a55a1b4f67c09d6f36f
-Size (vectordotdev-nix-6c53a918d2d5bf4307fd60a19d9e10913ae71eeb.tar.gz) = 287155 bytes
-BLAKE2s (vectordotdev-tokio-b4bdfda8fe8aa24eba36de0d60063b14f30c7fe7.tar.gz) = 67ce5382a4fffb4aa954d4c827ef1a687760a8f470d82fa6bc2b0a6d1328ac4f
-SHA512 (vectordotdev-tokio-b4bdfda8fe8aa24eba36de0d60063b14f30c7fe7.tar.gz) = b751dfd4b9d94610976191180639469de6f5407b9cf2bb263c9c8fbfb84d35e9f5fa96c5aa7be291253265649a8225bb150b1ef86926c129224412b9e03375d0
-Size (vectordotdev-tokio-b4bdfda8fe8aa24eba36de0d60063b14f30c7fe7.tar.gz) = 1062929 bytes
BLAKE2s (version_check-0.9.4.crate) = a26f24d5e2c5e631462ebe434aa239957f5102009d3824d5dff2bc90d3c79fb0
SHA512 (version_check-0.9.4.crate) = b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
Size (version_check-0.9.4.crate) = 14895 bytes
@@ -3477,3 +3477,4 @@ Size (zstd-safe-7.2.1.crate) = 21122 bytes
BLAKE2s (zstd-sys-2.0.13+zstd.1.5.6.crate) = df71c3b7a2dd396817e8e71eee920caccb9ae769f06d82920e6eea55df3be7dc
SHA512 (zstd-sys-2.0.13+zstd.1.5.6.crate) = c1f0176ebd0914879d0060796776c7fe376293ce9bc9f8f07ee3b809932a75aa033881d59a1bc99b6cd9af85b8e225fc09bcfc96013e556d7c11f155b759ecbf
Size (zstd-sys-2.0.13+zstd.1.5.6.crate) = 749090 bytes
+SHA1 (patch-Cargo.toml) = 4ae4b4991ef741c452eebbc67d33626ef23859cb
diff --git a/vector/patches/patch-Cargo.toml b/vector/patches/patch-Cargo.toml
new file mode 100644
index 0000000000..f9b06f22cb
--- /dev/null
+++ b/vector/patches/patch-Cargo.toml
@@ -0,0 +1,57 @@
+$NetBSD$
+
+Depends on unpublished crates. Can't use cargo.mk to fetch it.
+
+--- Cargo.toml.orig 2025-10-18 14:00:47.075518311 +0000
++++ Cargo.toml
+@@ -195,7 +195,7 @@ vector-lib = { path = "lib/vector-lib",
+ vector-config = { path = "lib/vector-config" }
+ vector-config-common = { path = "lib/vector-config-common" }
+ vector-config-macros = { path = "lib/vector-config-macros" }
+-vrl = { git = "https://github.com/vectordotdev/vrl.git";, branch = "main", features = ["arbitrary", "cli", "test", "test_framework"] }
++vrl = { path = "../vrl-560dac8b6b494d722fa9a57d98ed2e7e36ee75f6", features = ["arbitrary", "cli", "test", "test_framework"] }
+
+ [dependencies]
+ cfg-if.workspace = true
+@@ -239,7 +239,7 @@ tracing.workspace = true
+ tracing-core = { version = "0.1.26", default-features = false }
+ tracing-futures = { version = "0.2.5", default-features = false, features = ["futures-03"] }
+ tracing-subscriber = { workspace = true, features = ["ansi", "env-filter", "fmt", "json", "registry", "tracing-log"] }
+-tracing-tower = { git = "https://github.com/tokio-rs/tracing";, default-features = false, rev = "e0642d949891546a3bb7e47080365ee7274f05cd" }
++tracing-tower = { path = "../tracing-e0642d949891546a3bb7e47080365ee7274f05cd", default-features = false }
+
+ # Metrics
+ metrics.workspace = true
+@@ -334,7 +334,7 @@ ratatui = { version = "0.29.0", optional
+ hex = { version = "0.4.3", default-features = false, optional = true }
+
+ # GreptimeDB
+-greptimedb-ingester = { git = "https://github.com/GreptimeTeam/greptimedb-ingester-rust";, rev = "f7243393808640f5123b0d5b7b798da591a4df6e", optional = true }
++greptimedb-ingester = { path = "../greptimedb-ingester-rust-f7243393808640f5123b0d5b7b798da591a4df6e", optional = true }
+
+ # External libs
+ arc-swap = { version = "1.7", default-features = false, optional = true }
+@@ -428,7 +428,7 @@ arr_macro = { version = "0.2.1" }
+
+ # depending on fork for bumped nix dependency
+ # https://github.com/heim-rs/heim/pull/360
+-heim = { git = "https://github.com/vectordotdev/heim.git";, branch = "update-nix", default-features = false, features = ["disk"] }
++heim = { path = "../heim-f3537d9b32e69a2a8ab19a0d42a1e6f5577a5a45", default-features = false, features = ["disk"] }
+
+ # make sure to update the external docs when the Lua version changes
+ mlua = { version = "0.10.5", default-features = false, features = ["lua54", "send", "vendored", "macros"], optional = true }
+@@ -483,11 +483,11 @@ zstd = { version = "0.13.0", default-fea
+
+ [patch.crates-io]
+ # The upgrade for `tokio-util` >= 0.6.9 is blocked on https://github.com/vectordotdev/vector/issues/11257.
+-tokio-util = { git = "https://github.com/vectordotdev/tokio";, branch = "tokio-util-0.7.13-framed-read-continue-on-error" }
+-nix = { git = "https://github.com/vectordotdev/nix.git";, branch = "memfd/gnu/musl" }
++tokio-util = { path = "../tokio-b4bdfda8fe8aa24eba36de0d60063b14f30c7fe7" }
++nix = { path = "../nix-6c53a918d2d5bf4307fd60a19d9e10913ae71eeb" }
+ # The `heim` crates depend on `ntapi` 0.3.7 on Windows, but that version has an
+ # unaligned access bug fixed in the following revision.
+-ntapi = { git = "https://github.com/MSxDOS/ntapi.git";, rev = "24fc1e47677fc9f6e38e5f154e6011dc9b270da6" }
++ntapi = { path = "../ntapi-24fc1e47677fc9f6e38e5f154e6011dc9b270da6" }
+
+ [features]
+ # Default features for *-unknown-linux-gnu and *-apple-darwin
Home |
Main Index |
Thread Index |
Old Index