public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vector: 0.8.1 -> 0.10.0; fix Darwin build

Browse Source 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
happysalada 2020-09-14 11:37:21 +09:00 committed by Austin Seipp
parent 69519cfc27
commit d892551a83
No known key found for this signature in database
GPG Key ID: 25D2038DEB08021D
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/tools/misc/vector/default.nix
View File

@ -5,32 +5,43 @@
, features ? , features ?
(if stdenv.isAarch64 (if stdenv.isAarch64
then [ "shiplift/unix-socket" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ] then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
else [ "leveldb" "leveldb/leveldb-sys-2" "shiplift/unix-socket" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]) else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])
, coreutils
, CoreServices
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "vector"; pname = "vector";
version = "0.8.1"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "timberio"; owner = "timberio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0k15scvjcg2v4z80vq27yrn2wm50fp8xj8lga2czzs0zxhlv21nl"; sha256 = "0q6x3fvwwh18iyznqlr09n3zppzgw9jaz973s8haz54hnxj16wx0";
}; };
cargoSha256 = "1al8jzjxjhxwb5n1d52pvl59d11g0bdg2dcw8ir2nclya1w68f2w"; cargoSha256 = "Y/vDYXWQ65zZ86vTwP4aCZYCMZuqbz6tpfv4uRkFAzc=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl protobuf rdkafka ] buildInputs = [ openssl protobuf rdkafka ]
++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ]; ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
# needed for internal protobuf c wrapper library # needed for internal protobuf c wrapper library
PROTOC="${protobuf}/bin/protoc"; PROTOC="${protobuf}/bin/protoc";
PROTOC_INCLUDE="${protobuf}/include"; PROTOC_INCLUDE="${protobuf}/include";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features},disable-resolv-conf -- --test-threads 1"; checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features} -- --test-threads 1";
# 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
# fine IMO.
patchPhase = ''
substituteInPlace ./src/dns.rs \
--replace "#[test]" ""
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A high-performance logs, metrics, and events router"; description = "A high-performance logs, metrics, and events router";

2
pkgs/top-level/all-packages.nix
View File

@ -27090,7 +27090,7 @@ in
}; };
vector = callPackage ../tools/misc/vector { vector = callPackage ../tools/misc/vector {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security CoreServices;
}; };
epkowa = callPackage ../misc/drivers/epkowa { }; epkowa = callPackage ../misc/drivers/epkowa { };