mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-11 04:02:55 +03:00
vector: Added upstream patch for Rust 1.73 fix
This commit is contained in:
parent
73f28b770e
commit
0a6a7c8341
@ -46,6 +46,8 @@ rustPlatform.buildRustPackage {
|
||||
hash = "sha256-vK+k+VbUVgJ8idlvuod5ExAkkeTYDk/135dyLRct0zs=";
|
||||
};
|
||||
|
||||
patches = [ ./vector-pr19075.patch ];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
|
23
pkgs/tools/misc/vector/vector-pr19075.patch
Normal file
23
pkgs/tools/misc/vector/vector-pr19075.patch
Normal file
@ -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() {
|
Loading…
Reference in New Issue
Block a user