From ef8c9637b958436089b8bcd3a58c38a2b80f2472 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Mon, 19 Nov 2018 13:28:53 +0300 Subject: [PATCH] parity: 2.0.8 -> 2.1.6; parity-beta: 2.1.3 -> 2.2.1 --- pkgs/applications/altcoins/parity/beta.nix | 8 ++++---- pkgs/applications/altcoins/parity/default.nix | 8 ++++---- .../altcoins/parity/patches/vendored-sources-2.1.patch | 2 +- ...dored-sources-2.0.patch => vendored-sources-2.2.patch} | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename pkgs/applications/altcoins/parity/patches/{vendored-sources-2.0.patch => vendored-sources-2.2.patch} (99%) diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index b2c9fdfd1eeb..da504d633825 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,9 +1,9 @@ let - version = "2.1.3"; - sha256 = "0il18r229r32jzwsjksp8cc63rp6cf6c0j5dvbfzrnv1zndw0cg3"; - cargoSha256 = "08dyb0lgf66zfq9xmfkhcn6rj070d49dm0rjl3v39sfag6sryz20"; + version = "2.2.1"; + sha256 = "1m65pks2jk83j82f1i901p03qb54xhcp6gfjngcm975187zzvmcq"; + cargoSha256 = "1mf1jgphwvhlqkvzrgbhnqfyqgf3ljc1l9zckyilzmw5k4lf4g1w"; patches = [ - ./patches/vendored-sources-2.1.patch + ./patches/vendored-sources-2.2.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index b0286bf65837..2abc1abe0ed4 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "2.0.8"; - sha256 = "1bz6dvx8wxhs3g447s62d9091sard2x7w2zd6iy7hf76wg0p73hr"; - cargoSha256 = "0wj93md87fr7a9ag73h0rd9xxqscl0lhbj3g3kvnqrqz9xxajing"; - patches = [ ./patches/vendored-sources-2.0.patch ]; + version = "2.1.6"; + sha256 = "0njkypszi0fjh9y0zfgxbycs4c1wpylk7wx6xn1pp6gqvvri6hav"; + cargoSha256 = "116sj7pi50k5gb1i618g4pgckqaf8kb13jh2a3shj2kwywzzcgjs"; + patches = [ ./patches/vendored-sources-2.1.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch index 4af536cdf3cf..678dd0829237 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch @@ -14,7 +14,7 @@ index 72652ad2f..3c0eca89a 100644 + +[source."https://github.com/nikvolf/parity-tokio-ipc"] +git = "https://github.com/nikvolf/parity-tokio-ipc" -+rev = "7c9bbe3bc45d8e72a92b0951acc877da228abd50" ++rev = "c0f80b40399d7f08ef1e6869569640eb28645f56" +replace-with = "vendored-sources" + +[source."https://github.com/nikvolf/tokio-named-pipes"] diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.2.patch similarity index 99% rename from pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch rename to pkgs/applications/altcoins/parity/patches/vendored-sources-2.2.patch index 9af64559d971..f45de5ed8560 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.2.patch @@ -44,7 +44,7 @@ index 72652ad2f..3c0eca89a 100644 + +[source."https://github.com/paritytech/jsonrpc.git"] +git = "https://github.com/paritytech/jsonrpc.git" -+branch = "parity-1.11" ++branch = "parity-2.2" +replace-with = "vendored-sources" + +[source."https://github.com/paritytech/libusb-rs"]