From 869336d6233ec48234278c654f1a39b3746b9bc6 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 22 Mar 2018 14:54:42 +0300 Subject: [PATCH] parity: 1.8.11 -> 1.9.5 --- pkgs/applications/altcoins/parity/default.nix | 8 +- .../parity/patches/vendored-sources-1.8.patch | 100 ------------------ .../parity/patches/vendored-sources-1.9.patch | 16 +-- 3 files changed, 12 insertions(+), 112 deletions(-) delete mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index fe2c2c62827..99179932109 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -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; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch deleted file mode 100644 index 3239df63de3..00000000000 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/.cargo/config b/.cargo/config -new file mode 100644 -index 000000000..8dddda426 ---- /dev/null -+++ b/.cargo/config -@@ -0,0 +1,94 @@ -+[source."https://github.com/alexcrichton/mio-named-pipes"] -+git = "https://github.com/alexcrichton/mio-named-pipes" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/nikvolf/parity-tokio-ipc"] -+git = "https://github.com/nikvolf/parity-tokio-ipc" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/nikvolf/tokio-named-pipes"] -+git = "https://github.com/nikvolf/tokio-named-pipes" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/bn"] -+git = "https://github.com/paritytech/bn" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/hidapi-rs"] -+git = "https://github.com/paritytech/hidapi-rs" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/hyper"] -+git = "https://github.com/paritytech/hyper" -+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" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/libusb-rs"] -+git = "https://github.com/paritytech/libusb-rs" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/libusb-sys"] -+git = "https://github.com/paritytech/libusb-sys" -+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" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-rocksdb"] -+git = "https://github.com/paritytech/rust-rocksdb" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-secp256k1"] -+git = "https://github.com/paritytech/rust-secp256k1" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/rust-snappy"] -+git = "https://github.com/paritytech/rust-snappy" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/trezor-sys"] -+git = "https://github.com/paritytech/trezor-sys" -+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/tailhook/rotor"] -+git = "https://github.com/tailhook/rotor" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/tomusdrw/ws-rs"] -+git = "https://github.com/tomusdrw/ws-rs" -+branch = "master" -+replace-with = "vendored-sources" diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch index d1f6520d706..31c12d83faf 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch @@ -1,22 +1,22 @@ diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 000000000..0efb69724 ---- /dev/null +--- a/.cargo/config +++ b/.cargo/config -@@ -0,0 +1,100 @@ +@@ -0,0 +4,104 @@ + +[source."https://github.com/alexcrichton/mio-named-pipes"] +git = "https://github.com/alexcrichton/mio-named-pipes" +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" +