diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2022-06-30 09:55:14 +0200 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2022-08-31 11:57:00 +0200 |
| commit | c8e4e2b4ef2f4d8b6edc08265d69b4b32655f538 (patch) | |
| tree | d7631652c8e21b15cd3bae9300394ee32ed597be | |
| parent | gitlab: 15.3.1 -> 15.3.2 (diff) | |
| download | nixpkgs-c8e4e2b4ef2f4d8b6edc08265d69b4b32655f538.tar.gz | |
nearcore: 1.27.0 -> 1.28.0
(cherry picked from commit f97bbb81129555db2a4596bc29922aa02f5b9f74)
| -rw-r--r-- | pkgs/applications/blockchains/nearcore/0001-make-near-test-contracts-optional.patch | 42 | ||||
| -rw-r--r-- | pkgs/applications/blockchains/nearcore/default.nix | 13 |
2 files changed, 50 insertions, 5 deletions
diff --git a/pkgs/applications/blockchains/nearcore/0001-make-near-test-contracts-optional.patch b/pkgs/applications/blockchains/nearcore/0001-make-near-test-contracts-optional.patch new file mode 100644 index 000000000000..38292349f88e --- /dev/null +++ b/pkgs/applications/blockchains/nearcore/0001-make-near-test-contracts-optional.patch @@ -0,0 +1,42 @@ +From 14635f8a87423f7682e22c4d4bc34551cfe1d10d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Thu, 30 Jun 2022 07:33:44 +0000 +Subject: [PATCH] make near-test-contracts optional +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + Cargo.lock | 1 - + tools/state-viewer/Cargo.toml | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index e1d8b2a83..3317587f5 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -5253,7 +5253,6 @@ dependencies = [ + "near-primitives", + "near-primitives-core", + "near-store", +- "near-test-contracts", + "nearcore", + "node-runtime", + "once_cell", +diff --git a/tools/state-viewer/Cargo.toml b/tools/state-viewer/Cargo.toml +index 02346bf71..51cfc4cb5 100644 +--- a/tools/state-viewer/Cargo.toml ++++ b/tools/state-viewer/Cargo.toml +@@ -30,7 +30,7 @@ near-network = { path = "../../chain/network" } + near-primitives = { path = "../../core/primitives" } + near-primitives-core = { path = "../../core/primitives-core" } + near-store = { path = "../../core/store" } +-near-test-contracts = { path = "../../runtime/near-test-contracts" } ++#near-test-contracts = { path = "../../runtime/near-test-contracts" } + nearcore = { path = "../../nearcore" } + node-runtime = { path = "../../runtime/runtime" } + +-- +2.36.1 + diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index 2c5f97c9c78e..844332c92f72 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -1,10 +1,11 @@ -{ rustPlatform, lib, fetchFromGitHub +{ rust_1_61, lib, fetchFromGitHub , zlib, openssl , pkg-config, protobuf, llvmPackages }: -rustPlatform.buildRustPackage rec { + +rust_1_61.packages.stable.rustPlatform.buildRustPackage rec { pname = "nearcore"; - version = "1.27.0"; + version = "1.28.0"; # https://github.com/near/nearcore/tags src = fetchFromGitHub { @@ -12,10 +13,12 @@ rustPlatform.buildRustPackage rec { repo = "nearcore"; # there is also a branch for this version number, so we need to be explicit rev = "refs/tags/${version}"; - sha256 = "sha256-B9HqUa0mBSvsCPzxPt4NqpV99rV4lmQ9Q/z9lxob9oM="; + + sha256 = "sha256-DRVlD74XTYgy3GeUd/7OIl2aie8nEJLmrmmkwPRkrA8="; }; - cargoSha256 = "sha256-6GIt3J6y/O8XaHQJKRSPRgK2XbghMLif4e2Btdww9Ng="; + cargoSha256 = "sha256-hTqje17EdVkgqReuLnizaK3cBJuqXJXC6x5NuoKJLbs="; + cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ]; postPatch = '' substituteInPlace neard/build.rs \ |