diff options
| author | happysalada <raphael@megzari.com> | 2020-09-14 11:37:21 +0900 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2020-10-10 13:18:35 -0500 |
| commit | d892551a834f826875d892519375c480b7fa7de3 (patch) | |
| tree | 8059f21df392e9f0f458596b45815b1191321ca9 | |
| parent | 69519cfc27381cad569eb99bf64e10c35fe7a05d (diff) | |
vector: 0.8.1 -> 0.10.0; fix Darwin build
Signed-off-by: Austin Seipp <aseipp@pobox.com>
| -rw-r--r-- | pkgs/tools/misc/vector/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index ddbd78c699c9..37595702b686 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -5,32 +5,43 @@ , features ? (if stdenv.isAarch64 - then [ "shiplift/unix-socket" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ] - else [ "leveldb" "leveldb/leveldb-sys-2" "shiplift/unix-socket" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]) + then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ] + else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]) +, coreutils +, CoreServices }: rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.8.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "0k15scvjcg2v4z80vq27yrn2wm50fp8xj8lga2czzs0zxhlv21nl"; + sha256 = "0q6x3fvwwh18iyznqlr09n3zppzgw9jaz973s8haz54hnxj16wx0"; }; - cargoSha256 = "1al8jzjxjhxwb5n1d52pvl59d11g0bdg2dcw8ir2nclya1w68f2w"; + cargoSha256 = "Y/vDYXWQ65zZ86vTwP4aCZYCMZuqbz6tpfv4uRkFAzc="; nativeBuildInputs = [ pkg-config ]; 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 PROTOC="${protobuf}/bin/protoc"; PROTOC_INCLUDE="${protobuf}/include"; 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; { description = "A high-performance logs, metrics, and events router"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a514492d063..abef13311ee9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27090,7 +27090,7 @@ in }; vector = callPackage ../tools/misc/vector { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; epkowa = callPackage ../misc/drivers/epkowa { }; |