Merge pull request #302251 from implr/master

solana-validator: 1.16 -> 1.17
This commit is contained in:
Raghav Sood 2024-04-08 05:06:40 +08:00 committed by GitHub
commit 062c5fd03a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1397 additions and 1157 deletions

File diff suppressed because it is too large Load Diff

View File

@ -60,20 +60,11 @@ rustPlatform.buildRustPackage rec {
inherit hash; inherit hash;
}; };
# fix build with rust 1.70+
patches = [
(fetchpatch {
url = "https://github.com/solana-labs/solana/commit/9e703f85de4184f577f22a1c72a0d33612f2feb1.patch";
hash = "sha256-bAKTIQ6FhTk6bIddYULwLfdH5kzNPw1ltXJEfawtAXg=";
includes = [ "sdk/program/src/account_info.rs" ];
})
];
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"crossbeam-epoch-0.9.5" = "sha256-Jf0RarsgJiXiZ+ddy0vp4jQ59J9m0k3sgXhWhCdhgws="; "crossbeam-epoch-0.9.5" = "sha256-Jf0RarsgJiXiZ+ddy0vp4jQ59J9m0k3sgXhWhCdhgws=";
"ntapi-0.3.7" = "sha256-G6ZCsa3GWiI/FeGKiK9TWkmTxen7nwpXvm5FtjNtjWU="; "tokio-1.29.1" = "sha256-Z/kewMCqkPVTXdoBcSaFKG5GSQAdkdpj3mAzLLCjjGk=";
}; };
}; };

View File

@ -1,4 +1,4 @@
{ {
"version": "1.16.26", "version": "1.17.28",
"hash": "sha256-0OMZO2aKoaeRCkswXDXV9Y6HnYLzpkqqFPVIW2P5TwE=" "hash": "sha256-y79zsUfYsX377ofsFSg9a2il99uJsA+qdCu3J+EU5nQ="
} }