From 762333cbce21bfdb54e721b25516e325c6905d40 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Sat, 8 Dec 2018 22:46:13 +0300 Subject: [PATCH] parity: 2.1.6 -> 2.1.9 --- pkgs/applications/altcoins/parity/default.nix | 9 +- pkgs/applications/altcoins/parity/parity.nix | 5 +- .../parity/patches/vendored-sources-2.1.patch | 83 ---------------- .../parity/patches/vendored-sources-2.2.patch | 98 ------------------- 4 files changed, 6 insertions(+), 189 deletions(-) delete mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch delete mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-2.2.patch diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 2abc1abe0ed4..2ce8c3e0520f 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,6 @@ let - version = "2.1.6"; - sha256 = "0njkypszi0fjh9y0zfgxbycs4c1wpylk7wx6xn1pp6gqvvri6hav"; - cargoSha256 = "116sj7pi50k5gb1i618g4pgckqaf8kb13jh2a3shj2kwywzzcgjs"; - patches = [ ./patches/vendored-sources-2.1.patch ]; + version = "2.1.9"; + sha256 = "1xxpv2cxfcjwxfxkn2732y1wxh9rpiwmlb2ij09cg5nph669hy0v"; + cargoSha256 = "1v44l90bacw8d3ilnmrc49dxdpyckh7iamylkpa1pc0rrpiv5vy4"; in - import ./parity.nix { inherit version sha256 cargoSha256 patches; } + import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix index 55665034ccf9..9eb189f014e2 100644 --- a/pkgs/applications/altcoins/parity/parity.nix +++ b/pkgs/applications/altcoins/parity/parity.nix @@ -1,7 +1,6 @@ { version , sha256 , cargoSha256 -, patches }: { stdenv @@ -16,7 +15,7 @@ rustPlatform.buildRustPackage rec { name = "parity-${version}"; - inherit cargoSha256 patches; + inherit cargoSha256; src = fetchFromGitHub { owner = "paritytech"; @@ -30,7 +29,7 @@ rustPlatform.buildRustPackage rec { systemd.lib systemd.dev openssl openssl.dev ]; - # Some checks failed + # test result: FAILED. 80 passed; 12 failed; 0 ignored; 0 measured; 0 filtered out doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch deleted file mode 100644 index 678dd0829237..000000000000 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/.cargo/config b/.cargo/config -index 72652ad2f..3c0eca89a 100644 ---- a/.cargo/config -+++ b/.cargo/config -@@ -1,3 +1,78 @@ - [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" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/nikvolf/parity-tokio-ipc"] -+git = "https://github.com/nikvolf/parity-tokio-ipc" -+rev = "c0f80b40399d7f08ef1e6869569640eb28645f56" -+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/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" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/daemonize"] -+git = "https://github.com/paritytech/daemonize" -+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/jsonrpc.git"] -+git = "https://github.com/paritytech/jsonrpc.git" -+branch = "parity-1.11" -+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/ring"] -+git = "https://github.com/paritytech/ring" -+branch = "master" -+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-secp256k1"] -+git = "https://github.com/paritytech/rust-secp256k1" -+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/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-2.2.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.2.patch deleted file mode 100644 index f45de5ed8560..000000000000 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.2.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/.cargo/config b/.cargo/config -index 72652ad2f..3c0eca89a 100644 ---- a/.cargo/config -+++ b/.cargo/config -@@ -1,3 +1,93 @@ - [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" -+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/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" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/daemonize"] -+git = "https://github.com/paritytech/daemonize" -+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/jsonrpc.git"] -+git = "https://github.com/paritytech/jsonrpc.git" -+branch = "parity-2.2" -+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/parity-common"] -+git = "https://github.com/paritytech/parity-common" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/ring"] -+git = "https://github.com/paritytech/ring" -+branch = "master" -+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/tomusdrw/ws-rs"] -+git = "https://github.com/tomusdrw/ws-rs" -+branch = "master" -+replace-with = "vendored-sources"