From ceb30c490ccb6c7a019b79d856baf4c493fa8af4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Feb 2020 16:47:46 -0800 Subject: [PATCH] vector: 0.7.1 -> 0.7.2 --- pkgs/tools/misc/vector/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index cdc3a90f372..2e01059b736 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, rustPlatform -, openssl, pkgconfig, protobuf +, openssl, pkg-config, protobuf , Security, libiconv, rdkafka , features ? @@ -10,20 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "timberio"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "1bqp1ms8y91mpcmxlc8kyncigxq7spxq1ygy6gviz35zq1cqkwnr"; + rev = "v${version}"; + sha256 = "1r6pqljrl0cqz5x09p6bmf4h52h8m02pg05a09idj86v0c0q6bw3"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "01hynn8ccpwqrirr1bczqc7q7pqkzfjks2v6q4f32xbm50b31fky"; - buildInputs = [ openssl pkgconfig protobuf rdkafka ] + cargoSha256 = "1c742g7a4z5lhr991hxdhwk8h0d43r4vv5bxj80sf3lynyx60yzf"; + buildInputs = [ openssl pkg-config protobuf rdkafka ] ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ]; # needed for internal protobuf c wrapper library @@ -31,7 +28,8 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE="${protobuf}/include"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; - checkPhase = ":"; # skip tests, too -- they don't respect the rdkafka flag... + # skip tests, too -- they don't respect the rdkafka flag... + doCheck = false; meta = with stdenv.lib; { description = "A high-performance logs, metrics, and events router";