From 5481179b6ae1ceb13bdeea9eff9708c2ee9907ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 11 May 2022 13:18:17 +0200 Subject: [PATCH] nearcore: 1.25.0 -> 1.26.0 --- .../blockchains/nearcore/default.nix | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index f9f0bd0c69b..99fce14eff9 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -1,32 +1,45 @@ { rustPlatform, lib, fetchFromGitHub -, zlib, elfutils, openssl -, cmake, python3, pkg-config, protobuf, perl, llvmPackages +, zlib, openssl +, pkg-config, protobuf, llvmPackages }: rustPlatform.buildRustPackage rec { - #https://github.com/near/nearcore pname = "nearcore"; - version = "1.25.0"; + version = "1.26.0"; + + # https://github.com/near/nearcore/tags src = fetchFromGitHub { owner = "near"; repo = "nearcore"; # there is also a branch for this version number, so we need to be explicit rev = "refs/tags/${version}"; - sha256 = "sha256-7hiBqJLGIf+kNKJvMQ7KtGZm/SWLY3pT7YDlwbm3HDM="; + sha256 = "sha256-N3A+hy5I1/yJ3IN9gDw3m1IZ9qK8LNhn3fuXLMn23bg="; }; - cargoSha256 = "sha256-EGv4CibSHL9oTAdWK7d/SOzZWPcEB16hTWlWHjKU4wc="; + cargoSha256 = "sha256-g07liit048TSL73wFyDK+eKu33Z6fPJcJ+VeGgTtuS8="; + + postPatch = '' + substituteInPlace neard/build.rs \ + --replace 'get_git_version()?' '"nix:${version}"' + ''; + + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + CARGO_PROFILE_RELEASE_LTO = "thin"; + NEAR_RELEASE_BUILD = "release"; + + OPENSSL_NO_VENDOR = 1; # we want to link to OpenSSL provided by Nix # don't build SDK samples that require wasm-enabled rust - cargoBuildFlags = [ "-p" "neard" ]; + buildAndTestSubdir = "neard"; doCheck = false; # needs network - buildInputs = [ zlib elfutils openssl ]; + buildInputs = [ + zlib + openssl + ]; + nativeBuildInputs = [ - cmake - python3 pkg-config protobuf - perl ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; @@ -35,7 +48,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Reference client for NEAR Protocol"; homepage = "https://github.com/near/nearcore"; - license = licenses.mit; + license = licenses.gpl3; maintainers = with maintainers; [ mic92 ]; platforms = platforms.unix; };