diff options
| author | Jonathan Davies <jpds@protonmail.com> | 2023-11-20 09:55:49 +0000 |
|---|---|---|
| committer | Yt <happysalada@tuta.io> | 2023-11-20 12:56:58 +0000 |
| commit | 0a6a7c83417c74c58e54b0e828ff6d6b21a39a5b (patch) | |
| tree | 50c164de18867dc73b809987071290dcd6969a09 /pkgs/tools | |
| parent | 73f28b770e877410f29d12186f52f0fbe2fdbbab (diff) | |
vector: Added upstream patch for Rust 1.73 fix
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/vector/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/vector/vector-pr19075.patch | 23 |
2 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index fe58e934f55f5..ddd6e32e16d44 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -46,6 +46,8 @@ rustPlatform.buildRustPackage { hash = "sha256-vK+k+VbUVgJ8idlvuod5ExAkkeTYDk/135dyLRct0zs="; }; + patches = [ ./vector-pr19075.patch ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/pkgs/tools/misc/vector/vector-pr19075.patch b/pkgs/tools/misc/vector/vector-pr19075.patch new file mode 100644 index 0000000000000..96ab75edef37e --- /dev/null +++ b/pkgs/tools/misc/vector/vector-pr19075.patch @@ -0,0 +1,23 @@ +From 14cd9c12416b5c9ada55ced51e8f92fdce56a4b1 Mon Sep 17 00:00:00 2001 +From: Aaron Andersen <aaron@fosslib.net> +Date: Tue, 7 Nov 2023 09:05:26 -0500 +Subject: [PATCH] fix(config): rustc warnings + +--- + src/convert_config.rs | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/convert_config.rs b/src/convert_config.rs +index f0a900cf421a0..d81b998c5ee1f 100644 +--- a/src/convert_config.rs ++++ b/src/convert_config.rs +@@ -157,8 +157,7 @@ fn walk_dir_and_convert( + let new_output_dir = if entry_path.is_dir() { + let last_component = entry_path + .file_name() +- .unwrap_or_else(|| panic!("Failed to get file_name for {entry_path:?}")) +- .clone(); ++ .unwrap_or_else(|| panic!("Failed to get file_name for {entry_path:?}")); + let new_dir = output_dir.join(last_component); + + if !new_dir.exists() { |