nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-24 05:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

vector: patch to compile with rust 1.64.

Browse Source
This commit is contained in:
Theodore Ni 2022-10-07 17:53:23 -07:00 committed by Yt
parent 73ed812bf7
commit bc2ce9630a
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/tools/misc/vector/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, rustPlatform , rustPlatform
, pkg-config , pkg-config
, llvmPackages , llvmPackages
@ -40,10 +41,28 @@ rustPlatform.buildRustPackage {
owner = "vectordotdev"; owner = "vectordotdev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-RfKg14r3B5Jx2vIa4gpJs5vXRqSXKOXKRFmmQmzQorQ="; hash = "sha256-RfKg14r3B5Jx2vIa4gpJs5vXRqSXKOXKRFmmQmzQorQ=";
}; };
cargoSha256 = "sha256-l2rrT2SeeH4bYYlzSiFASNBxtg4TBm1dRA4cFRfvpkk="; patches = [
(fetchpatch {
name = "rust-1.64-part1.patch";
url = "https://github.com/vectordotdev/vector/commit/e7437df97711b6a660a3532fe5026244472a900f.patch";
hash = "sha256-EyheI3nngt72+ZZNNsjp3KV1CuRb9CZ7wUCHt0twFVs=";
})
(fetchpatch {
name = "rust-1.64-part2.patch";
url = "https://github.com/vectordotdev/vector/commit/e80c7afaf7601cf936c7c3468bd7b4b230ef6149.patch";
hash = "sha256-pHcq7XLn+9PKs0DnBTK5FawN5KSF8BuJf7sBO9u5Gb8=";
excludes = [
# There are too many conflicts to easily resolve patching this file, but
# the changes here do not block compilation.
"lib/lookup/src/lookup_v2/owned.rs"
];
})
];
cargoHash = "sha256-l2rrT2SeeH4bYYlzSiFASNBxtg4TBm1dRA4cFRfvpkk=";
nativeBuildInputs = [ pkg-config cmake perl ]; nativeBuildInputs = [ pkg-config cmake perl ];
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
@ -111,3 +130,4 @@ rustPlatform.buildRustPackage {
platforms = with platforms; all; platforms = with platforms; all;
}; };
} }