parity: new release 1.10.0 (#37618)

* parity: 1.8.11 -> 1.9.5

* parity-beta: 1.9.4 -> 1.10.0

* parity: patch fixes
This commit is contained in:
Alexander Krupenkin 2018-04-03 21:23:46 +03:00 committed by Matthew Justin Bauer
parent b8420be125
commit d305c24b8d
4 changed files with 49 additions and 31 deletions

View File

@ -1,7 +1,7 @@
let
version = "1.9.4";
sha256 = "00b6wsyc2chmdkhfhi9h1i06hpcjj2abcx3qdc6k39clgha0081f";
cargoSha256 = "0pyb1mpykdp6i7c30lm5fprrxg3zanak44g28cygzli3l9l3xiy3";
patches = [ ./patches/vendored-sources-1.9.patch ];
version = "1.10.0";
sha256 = "0dmdd7qa8lww5bzcdn25nkyz6334irh8hw0y1j0yc2pmd2dny99g";
cargoSha256 = "0whkjbaq40mqva1ayqnmz2ppqjrg35va93cypx1al41rsp1yc37m";
patches = [ ./patches/vendored-sources-1.10.patch ];
in
import ./parity.nix { inherit version sha256 cargoSha256 patches; }

View File

@ -1,7 +1,7 @@
let
version = "1.8.11";
sha256 = "1vabkglmmbx9jccwsqwvwck1brdjack3sw6iwsxy01wsc2jam56k";
cargoSha256 = "1l5hx77glclpwd9i35rr3lxfxshsf1bsxvs2chsp2vwjy06knjmi";
patches = [ ./patches/vendored-sources-1.8.patch ];
version = "1.9.5";
sha256 = "0f2x78p5bshs3678qcybqd34k83d294mp3vadp99iqhmbkhbfyy7";
cargoSha256 = "1irc01sva5yyhdv79cs6jk5pbmhxyvs0ja4cly4nw639m1kx7rva";
patches = [ ./patches/vendored-sources-1.9.patch ];
in
import ./parity.nix { inherit version sha256 cargoSha256 patches; }

View File

@ -1,17 +1,30 @@
diff --git a/.cargo/config b/.cargo/config
new file mode 100644
index 000000000..8dddda426
--- /dev/null
index 72652ad2f..b21c6aa7b 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -0,0 +1,94 @@
@@ -1,3 +1,113 @@
[target.x86_64-pc-windows-msvc]
# Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643
rustflags = ["-Ctarget-feature=+crt-static"]
+
+[source."https://github.com/alexcrichton/mio-named-pipes"]
+git = "https://github.com/alexcrichton/mio-named-pipes"
+branch = "master"
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/js-dist-paritytech/parity-master-1-10-shell.git"]
+git = "https://github.com/js-dist-paritytech/parity-master-1-10-shell.git"
+rev = "bd25b41cd642c6b822d820dded3aa601a29aa079"
+replace-with = "vendored-sources"
+
+[source."https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git"]
+git = "https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git"
+rev = "4b6f112412716cd05123d32eeb7fda448288a6c6"
+replace-with = "vendored-sources"
+
+[source."https://github.com/nikvolf/parity-tokio-ipc"]
+git = "https://github.com/nikvolf/parity-tokio-ipc"
+branch = "master"
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/nikvolf/tokio-named-pipes"]
@ -19,6 +32,16 @@ index 000000000..8dddda426
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/parity-js/dapp-wallet.git"]
+git = "https://github.com/parity-js/dapp-wallet.git"
+rev = "65deb02e7c007a0fd8aab0c089c93e3fd1de6f87"
+replace-with = "vendored-sources"
+
+[source."https://github.com/parity-js/shell.git"]
+git = "https://github.com/parity-js/shell.git"
+rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/bn"]
+git = "https://github.com/paritytech/bn"
+branch = "master"
@ -34,14 +57,9 @@ index 000000000..8dddda426
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/js-precompiled.git"]
+git = "https://github.com/paritytech/js-precompiled.git"
+branch = "stable"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/jsonrpc.git"]
+git = "https://github.com/paritytech/jsonrpc.git"
+branch = "parity-1.8"
+branch = "parity-1.10"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/libusb-rs"]
@ -54,11 +72,6 @@ index 000000000..8dddda426
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/nanomsg.rs.git"]
+git = "https://github.com/paritytech/nanomsg.rs.git"
+branch = "parity-1.7"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/rust-ctrlc.git"]
+git = "https://github.com/paritytech/rust-ctrlc.git"
+branch = "master"
@ -89,6 +102,11 @@ index 000000000..8dddda426
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/wasmi"]
+git = "https://github.com/paritytech/wasmi"
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/tailhook/rotor"]
+git = "https://github.com/tailhook/rotor"
+branch = "master"

View File

@ -10,13 +10,13 @@ index 000000000..0efb69724
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git"]
+git = "https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git"
+[source."https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"]
+git = "https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git"]
+git = "https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git"
+[source."https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"]
+git = "https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"
+branch = "master"
+replace-with = "vendored-sources"
+
@ -90,8 +90,8 @@ index 000000000..0efb69724
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/pepyakin/wasmi"]
+git = "https://github.com/pepyakin/wasmi"
+[source."https://github.com/paritytech/wasmi"]
+git = "https://github.com/paritytech/wasmi"
+branch = "master"
+replace-with = "vendored-sources"
+