diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2020-11-05 11:46:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 11:46:09 +0100 |
| commit | a06d6186b8c54ee064a2fe1c42bdf0c2fb750f58 (patch) | |
| tree | a69d352c158c7b0ea5ec7772226ba0e68137511b /pkgs/applications/blockchains | |
| parent | 5e12d4b409224e83396c4e2dde8cfc0ef8646b9e (diff) | |
| parent | 932efc3528cba329632c2346dad67de5c4b8cc0c (diff) | |
Merge pull request #102812 from andresilva/polkadot-v0.8.26
polkadot: 0.8.25 -> 0.8.26
Diffstat (limited to 'pkgs/applications/blockchains')
| -rw-r--r-- | pkgs/applications/blockchains/polkadot/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/blockchains/polkadot/substrate-wasm-builder-runner.patch | 25 |
2 files changed, 3 insertions, 30 deletions
diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 45cecf7e9fb8..ef241126e6a6 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,18 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.8.25"; + version = "0.8.26"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "1jdklmysr25rlwgx7pz0jw66j1w60h98kqghzjhr90zhynzh39lz"; + sha256 = "1bvma6k3gsjqh8w76k4kf52sjg8wxn1b7a409kmnmmvmd9j6z5ia"; }; - cargoSha256 = "08yfafrspkd1g1mhlfwngbknkxjkyymbcga8n2rdsk7mz0hm0vgy"; - - cargoPatches = [ ./substrate-wasm-builder-runner.patch ]; + cargoSha256 = "0mjkiq6kih5vbmbmr3nmzw4zynha93lsqwbvams73871124mj7rc"; nativeBuildInputs = [ clang ]; diff --git a/pkgs/applications/blockchains/polkadot/substrate-wasm-builder-runner.patch b/pkgs/applications/blockchains/polkadot/substrate-wasm-builder-runner.patch deleted file mode 100644 index 7d84965dcea2..000000000000 --- a/pkgs/applications/blockchains/polkadot/substrate-wasm-builder-runner.patch +++ /dev/null @@ -1,25 +0,0 @@ -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" } |