diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/vector/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/misc/vector/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/tools/misc/vector/default.nix b/nixpkgs/pkgs/tools/misc/vector/default.nix index aef8bace56f7..de9341c1c6bc 100644 --- a/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -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"; @@ -99,6 +99,8 @@ rustPlatform.buildRustPackage { "--skip=sources::aws_kinesis_firehose::tests::handles_acknowledgement_failure" ]; + patches = [ ./vector-pr19518.patch ]; + # recent overhauls of DNS support in 0.9 mean that we try to resolve # vector.dev during the checkPhase, which obviously isn't going to work. # these tests in the DNS module are trivial though, so stubbing them out is |