vector: 0.10.0 -> 0.12.0

As a minor regression, LevelDB support is currently compiled out. This
is due to a few changes in the build infrastructure that now causes
leveldb to be vendored when it shouldn't be.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
launchpad/nixpkgs/master
Austin Seipp 3 years ago
parent ae7ea85425
commit 5c812929a6
No known key found for this signature in database
GPG Key ID: 25D2038DEB08021D
  1. 32
      pkgs/tools/misc/vector/default.nix

@ -1,32 +1,24 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform
, openssl, pkg-config, protobuf
, Security, libiconv, rdkafka
, tzdata
{ stdenv, lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, protobuf
, Security, libiconv, rdkafka, tzdata, coreutils, CoreServices
, features ?
((if stdenv.isAarch64
then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])
++
(lib.optional stdenv.targetPlatform.isUnix "unix")
++
[ "sinks" "sources" "transforms" ])
, coreutils
, CoreServices
([ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
++ (lib.optional stdenv.targetPlatform.isUnix "unix")
++ [ "sinks" "sources" "transforms" ])
}:
rustPlatform.buildRustPackage rec {
pname = "vector";
version = "0.10.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "timberio";
repo = pname;
rev = "v${version}";
sha256 = "0q6x3fvwwh18iyznqlr09n3zppzgw9jaz973s8haz54hnxj16wx0";
sha256 = "02qbn9w9286ran8vjry9090r9ym9bj9xxvyzavw7gk53sg56m8gl";
};
cargoSha256 = "Y/vDYXWQ65zZ86vTwP4aCZYCMZuqbz6tpfv4uRkFAzc=";
cargoSha256 = "0zynyc7vkdf5pzz4svymsn3w8r834hc5gqxm1jk6myidvnyh2xsp";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl protobuf rdkafka ]
++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
@ -35,7 +27,7 @@ rustPlatform.buildRustPackage rec {
PROTOC="${protobuf}/bin/protoc";
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} -- --test-threads 1";
# recent overhauls of DNS support in 0.9 mean that we try to resolve
@ -49,15 +41,17 @@ rustPlatform.buildRustPackage rec {
# nor do I know why it depends on rustc.
# However, in order for the closure size to stay at a reasonable level,
# transforms-geoip is patched out of Cargo.toml for now - unless explicitly asked for.
patchPhase = ''
postPatch = ''
substituteInPlace ./src/dns.rs \
--replace "#[test]" ""
--replace "#[tokio::test]" ""
${lib.optionalString (!builtins.elem "transforms-geoip" features) ''
substituteInPlace ./Cargo.toml --replace '"transforms-geoip",' ""
''}
'';
passthru = { inherit features; };
meta = with lib; {
description = "A high-performance logs, metrics, and events router";
homepage = "https://github.com/timberio/vector";

Loading…
Cancel
Save