Merge #39111: parity*: minor updates
This commit is contained in:
commit
0c17b75210
|
@ -1,7 +1,7 @@
|
|||
let
|
||||
version = "1.10.0";
|
||||
sha256 = "0dmdd7qa8lww5bzcdn25nkyz6334irh8hw0y1j0yc2pmd2dny99g";
|
||||
cargoSha256 = "0whkjbaq40mqva1ayqnmz2ppqjrg35va93cypx1al41rsp1yc37m";
|
||||
version = "1.10.2";
|
||||
sha256 = "1a1rbwlwi60nfv6m1rdy5baq5lcafc8nw96y45pr1674i48gkp0l";
|
||||
cargoSha256 = "0l3rjkinzppfq8fi8h24r35rb552fzzman5a6yk33wlsdj2lv7yh";
|
||||
patches = [ ./patches/vendored-sources-1.10.patch ];
|
||||
in
|
||||
import ./parity.nix { inherit version sha256 cargoSha256 patches; }
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
let
|
||||
version = "1.9.5";
|
||||
sha256 = "0f2x78p5bshs3678qcybqd34k83d294mp3vadp99iqhmbkhbfyy7";
|
||||
cargoSha256 = "1irc01sva5yyhdv79cs6jk5pbmhxyvs0ja4cly4nw639m1kx7rva";
|
||||
version = "1.9.7";
|
||||
sha256 = "1h9rmyqkdv2v83g12dadgqflq1n1qqgd5hrpy20ajha0qpbiv3ph";
|
||||
cargoSha256 = "0ss5jw43850r8l34prai5vk1zd5d5fjyg4rcav1asbq6v683bww0";
|
||||
patches = [ ./patches/vendored-sources-1.9.patch ];
|
||||
in
|
||||
import ./parity.nix { inherit version sha256 cargoSha256 patches; }
|
||||
|
|
|
@ -2,7 +2,7 @@ diff --git a/.cargo/config b/.cargo/config
|
|||
index 72652ad2f..b21c6aa7b 100644
|
||||
--- a/.cargo/config
|
||||
+++ b/.cargo/config
|
||||
@@ -1,3 +1,113 @@
|
||||
@@ -1,3 +1,108 @@
|
||||
[target.x86_64-pc-windows-msvc]
|
||||
# Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643
|
||||
rustflags = ["-Ctarget-feature=+crt-static"]
|
||||
|
@ -42,6 +42,11 @@ index 72652ad2f..b21c6aa7b 100644
|
|||
+rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2"
|
||||
+replace-with = "vendored-sources"
|
||||
+
|
||||
+[source."https://github.com/paritytech/app-dirs-rs"]
|
||||
+git = "https://github.com/paritytech/app-dirs-rs"
|
||||
+branch = "master"
|
||||
+replace-with = "vendored-sources"
|
||||
+
|
||||
+[source."https://github.com/paritytech/bn"]
|
||||
+git = "https://github.com/paritytech/bn"
|
||||
+branch = "master"
|
||||
|
@ -97,16 +102,6 @@ index 72652ad2f..b21c6aa7b 100644
|
|||
+branch = "master"
|
||||
+replace-with = "vendored-sources"
|
||||
+
|
||||
+[source."https://github.com/paritytech/wasm-utils"]
|
||||
+git = "https://github.com/paritytech/wasm-utils"
|
||||
+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"
|
||||
|
@ -116,3 +111,4 @@ index 72652ad2f..b21c6aa7b 100644
|
|||
+git = "https://github.com/tomusdrw/ws-rs"
|
||||
+branch = "master"
|
||||
+replace-with = "vendored-sources"
|
||||
+
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
diff --git a/.cargo/config b/.cargo/config
|
||||
new file mode 100644
|
||||
index 000000000..0efb69724
|
||||
--- /dev/null
|
||||
--- /dev/null
|
||||
+++ b/.cargo/config
|
||||
@@ -0,0 +1,100 @@
|
||||
+
|
||||
@@ -0,0 +1,94 @@
|
||||
+[source."https://github.com/alexcrichton/mio-named-pipes"]
|
||||
+git = "https://github.com/alexcrichton/mio-named-pipes"
|
||||
+branch = "master"
|
||||
|
@ -30,6 +29,11 @@ index 000000000..0efb69724
|
|||
+branch = "master"
|
||||
+replace-with = "vendored-sources"
|
||||
+
|
||||
+[source."https://github.com/paritytech/app-dirs-rs"]
|
||||
+git = "https://github.com/paritytech/app-dirs-rs"
|
||||
+branch = "master"
|
||||
+replace-with = "vendored-sources"
|
||||
+
|
||||
+[source."https://github.com/paritytech/bn"]
|
||||
+git = "https://github.com/paritytech/bn"
|
||||
+branch = "master"
|
||||
|
@ -85,16 +89,6 @@ index 000000000..0efb69724
|
|||
+branch = "master"
|
||||
+replace-with = "vendored-sources"
|
||||
+
|
||||
+[source."https://github.com/paritytech/wasm-utils"]
|
||||
+git = "https://github.com/paritytech/wasm-utils"
|
||||
+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"
|
||||
|
|
Loading…
Reference in New Issue