Unverified Commit b2b66f25 authored by Yt's avatar Yt Committed by GitHub
Browse files

Merge pull request #289981 from jpds/vector-0.36.0 

vector: 0.35.0 → 0.36.0
parents c5e62ec7 5c5b6de9

pkgs/tools/misc/vector/Cargo.lock

+777 −909

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/tools/misc/vector/default.nix

+5 −8
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


let

  pname = "vector";

  version = "0.35.0";

  version = "0.36.0";

in

rustPlatform.buildRustPackage {

  inherit pname version;
@@ -45,16 +45,15 @@ rustPlatform.buildRustPackage { 
    owner = "vectordotdev";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-hScmHDkKkR6g1rrVRzBjtkrq59w1efIjeRJdDxmb+nY=";

    hash = "sha256-fbBKmhouY021osFVqNhEC+16cO7z3bS+DBhg1ByDeWw=";

  };



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "aws-config-0.54.1" = "sha256-AVumLhybVbMnEah9/JqiQOQ4R0e2OsbB8WAJ422R6uk=";

      "greptime-proto-0.1.0" = "sha256-kSOy/0s8ZJ1RfqOb469oaVlreABtHxesNaMzFH6H+aE=";

      "greptimedb-client-0.1.0" = "sha256-mGgbxp/h55snowS2BV+QRwrhnE5vywfRF9Gc+8MoAdY=";

      "heim-0.1.0-rc.1" = "sha256-ODKEQ1udt7FlxI5fvoFMG7C2zmM45eeEYDUEaLTsdYo=";

      "greptime-proto-0.1.0" = "sha256-Q8xr6qN6SAGGK0W96WuNRdQ5/8iNlruqzhXD6xq3Ua8=";

      "greptimedb-client-0.1.0" = "sha256-l4r/2DGllXiFgOwpa83ZRiK9o0L4bokVltCGD1cp3NM=";

      "heim-0.1.0-rc.1" = "sha256-TFgLR5zb/oqceVOH4mIOvFFY/HMOLSo8VI5Eh9KP60E=";

      "nix-0.26.2" = "sha256-uquYvRT56lhupkrESpxwKEimRFhmYvri10n3dj0f2yg=";

      "ntapi-0.3.7" = "sha256-G6ZCsa3GWiI/FeGKiK9TWkmTxen7nwpXvm5FtjNtjWU=";

      "tokio-util-0.7.8" = "sha256-HCvtfohOoa1ZjD4s7QLDbIV4fe/MVBKtgM1QQX7gGKQ=";
@@ -99,8 +98,6 @@ 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

pkgs/tools/misc/vector/vector-pr19518.patch

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
diff --git a/src/config/loading/mod.rs b/src/config/loading/mod.rs

index 58c464a58..40656fd29 100644

--- a/src/config/loading/mod.rs

+++ b/src/config/loading/mod.rs

@@ -13,7 +13,6 @@ use std::{

 };

 

 use config_builder::ConfigBuilderLoader;

-pub use config_builder::*;

 use glob::glob;

 use loader::process::Process;

 pub use loader::*;

diff --git a/src/sinks/prometheus/remote_write/mod.rs b/src/sinks/prometheus/remote_write/mod.rs

index 3ebda7df8..cf5b37a70 100644

--- a/src/sinks/prometheus/remote_write/mod.rs

+++ b/src/sinks/prometheus/remote_write/mod.rs

@@ -24,8 +24,6 @@ mod tests;

 #[cfg(all(test, feature = "prometheus-integration-tests"))]

 mod integration_tests;

 

-pub use config::RemoteWriteConfig;

-

 #[derive(Debug, Snafu)]

 enum Errors {

     #[cfg(feature = "aws-core")]