Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

polkadot: 0.2.17 -> 0.8.24 #98785

Merged
merged 2 commits into from Oct 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Expand Up @@ -520,6 +520,12 @@
githubId = 293191;
name = "Andres Loeh";
};
andresilva = {
email = "andre.beat@gmail.com";
github = "andresilva";
githubId = 123550;
name = "André Silva";
};
andresilva marked this conversation as resolved.
Show resolved Hide resolved
andrestylianos = {
email = "andre.stylianos@gmail.com";
github = "andrestylianos";
Expand Down
44 changes: 25 additions & 19 deletions pkgs/applications/blockchains/polkadot/default.nix
@@ -1,37 +1,43 @@
{ stdenv
{ clang
, fetchFromGitHub
, lib
, llvmPackages
, protobuf
, rustPlatform
, pkgconfig
, openssl
}:

rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.2.17";
version = "0.8.24";

src = fetchFromGitHub {
owner = "paritytech";
# N.B. In 2018, the thing that was "polkadot" was split off into its own
# repo, so if this package is ever updated it should be changed to
# paritytech/polkadot, as per comment here:
# https://github.com/paritytech/polkadot#note
repo = "substrate";
rev = "19f4f4d4df3bb266086b4e488739f73d3d5e588c";
sha256 = "0v7g03rbml2afw0splmyjh9nqpjg0ldjw09hyc0jqd3qlhgxiiyj";
repo = "polkadot";
rev = "v${version}";
sha256 = "15q5scajxrf82k8nxysah8cs3yl2p09xzzwlkxvjkcn08r3zhig6";
};

cargoSha256 = "1h5v7c7xi2r2wzh1pj6xidrg7dx23w3rjm88mggpq7574arijk4i";
cargoSha256 = "0qp20g5c15qzp2n1nzwqbnn2wx6c905vh652nvkm7sb1d901iiqi";

cargoPatches = [ ./substrate-wasm-builder-runner.patch ];

nativeBuildInputs = [ clang ];

LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
PROTOC = "${protobuf}/bin/protoc";

# NOTE: We don't build the WASM runtimes since this would require a more
# complicated rust environment setup. The resulting binary is still useful for
# live networks since those just use the WASM blob from the network chainspec.
BUILD_DUMMY_WASM_BINARY = 1;

buildInputs = [ pkgconfig openssl openssl.dev ];
# We can't run the test suite since we didn't compile the WASM runtimes.
doCheck = false;

meta = with stdenv.lib; {
meta = with lib; {
description = "Polkadot Node Implementation";
homepage = "https://polkadot.network";
license = licenses.gpl3;
maintainers = [ maintainers.akru ];
maintainers = with maintainers; [ akru andresilva ];
platforms = platforms.linux;
# Last attempt at building this was on v0.7.22
# https://github.com/paritytech/polkadot/releases
broken = true;
};
}
@@ -0,0 +1,25 @@
diff --git a/Cargo.lock b/Cargo.lock
index 5e7c4a14..bb67aada 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8642,8 +8642,7 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder-runner"
version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2a965994514ab35d3893e9260245f2947fd1981cdd4fffd2c6e6d1a9ce02e6a"
+source = "git+https://github.com/paritytech/substrate#647ad15565d7c35ecf00b73b12cccad9858780b9"

[[package]]
name = "subtle"
diff --git a/Cargo.toml b/Cargo.toml
index 78047a1a..2d571f8e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -112,3 +112,6 @@ polkadot = { path = "/usr/bin/polkadot" }

[package.metadata.rpm.files]
"../scripts/packaging/polkadot.service" = { path = "/usr/lib/systemd/system/polkadot.service", mode = "644" }
+
+[patch.crates-io]
+substrate-wasm-builder-runner = { git = "https://github.com/paritytech/substrate", branch = "master" }
andresilva marked this conversation as resolved.
Show resolved Hide resolved