BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vector: 0.34.2 → 0.35.0

Browse source
This commit is contained in:
Jonathan Davies 2024-01-10 12:31:03 +00:00
parent c3e128f3c0
commit 0cc5d8ad91
3 changed files with 872 additions and 732 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1569
pkgs/tools/misc/vector/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

12
pkgs/tools/misc/vector/default.nix
View file

@ -9,6 +9,7 @@
, oniguruma
, zstd
, rust-jemalloc-sys
, rust-jemalloc-sys-unprefixed
, Security
, libiconv
, coreutils
@ -35,7 +36,7 @@
let
pname = "vector";
version = "0.34.2";
version = "0.35.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@ -44,11 +45,9 @@ rustPlatform.buildRustPackage {
owner = "vectordotdev";
repo = pname;
rev = "v${version}";
hash = "sha256-XaX6C1kl908MG8SndT2sUDR09qbFCar4G7U7TYlLBR4=";
hash = "sha256-hScmHDkKkR6g1rrVRzBjtkrq59w1efIjeRJdDxmb+nY=";
};
patches = [ ./vector-pr19075.patch ];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
@ -64,8 +63,9 @@ rustPlatform.buildRustPackage {
};
nativeBuildInputs = [ pkg-config cmake perl git rustPlatform.bindgenHook ];
buildInputs =
[ oniguruma openssl protobuf rdkafka zstd rust-jemalloc-sys ]
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices SystemConfiguration ];
[ oniguruma openssl protobuf rdkafka zstd ]
++ lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ]
++ lib.optionals stdenv.isDarwin [ rust-jemalloc-sys Security libiconv coreutils CoreServices SystemConfiguration ];
# needed for internal protobuf c wrapper library
PROTOC = "${protobuf}/bin/protoc";

23
pkgs/tools/misc/vector/vector-pr19075.patch
View file

@ -1,23 +0,0 @@
From 14cd9c12416b5c9ada55ced51e8f92fdce56a4b1 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 7 Nov 2023 09:05:26 -0500
Subject: [PATCH] fix(config): rustc warnings
---
src/convert_config.rs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/convert_config.rs b/src/convert_config.rs
index f0a900cf421a0..d81b998c5ee1f 100644
--- a/src/convert_config.rs
+++ b/src/convert_config.rs
@@ -157,8 +157,7 @@ fn walk_dir_and_convert(
let new_output_dir = if entry_path.is_dir() {
let last_component = entry_path
.file_name()
- .unwrap_or_else(|| panic!("Failed to get file_name for {entry_path:?}"))
- .clone();
+ .unwrap_or_else(|| panic!("Failed to get file_name for {entry_path:?}"));
let new_dir = output_dir.join(last_component);
if !new_dir.exists() {