diff options
author | Alexander Krupenkin <mail@akru.me> | 2018-08-03 17:54:30 +0300 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-03 16:54:29 +0200 |
commit | 8d708d28a11a3ca3a15f380cfd2b4c932f1ad06f (patch) | |
tree | 778561d5deefc80aa58d14639698e769fc8be971 /pkgs/applications/altcoins/parity | |
parent | 725f253190e154fee5ecd739b478e7672800f180 (diff) | |
download | nixlib-8d708d28a11a3ca3a15f380cfd2b4c932f1ad06f.tar nixlib-8d708d28a11a3ca3a15f380cfd2b4c932f1ad06f.tar.gz nixlib-8d708d28a11a3ca3a15f380cfd2b4c932f1ad06f.tar.bz2 nixlib-8d708d28a11a3ca3a15f380cfd2b4c932f1ad06f.tar.lz nixlib-8d708d28a11a3ca3a15f380cfd2b4c932f1ad06f.tar.xz nixlib-8d708d28a11a3ca3a15f380cfd2b4c932f1ad06f.tar.zst nixlib-8d708d28a11a3ca3a15f380cfd2b4c932f1ad06f.zip |
parity: 1.10.8 -> 1.11.8; parity-beta: init at 2.0.1 (#44170)
* parity: 1.10.8 -> 1.10.9 * parity: 1.10.8 -> 1.11.8; parity-beta: init at 2.0.1
Diffstat (limited to 'pkgs/applications/altcoins/parity')
-rw-r--r-- | pkgs/applications/altcoins/parity/beta.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/altcoins/parity/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/altcoins/parity/parity.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch (renamed from pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch) | 23 | ||||
-rw-r--r-- | pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch | 98 |
5 files changed, 127 insertions, 18 deletions
diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix new file mode 100644 index 000000000000..fe58579e6b57 --- /dev/null +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -0,0 +1,7 @@ +let + version = "2.0.1"; + sha256 = "0rfq0izpswfwbyvr5kb6zjyf6sd7l1706c0sp7ccy6ykdfb4v6zs"; + cargoSha256 = "1ij17bfwvikqi5aj71j1nwf3jhkf3y9a0kwydajviwal47p9grl9"; + patches = [ ./patches/vendored-sources-2.0.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 a41488c48b50..993bc3615aa8 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.10.9"; - sha256 = "1irfksx887vvvdf97q26qacn22kmyj8fgb3ghh9wv5qnzrn3564g"; - cargoSha256 = "0rzhabyhprmcg0cdmibbb8zgqf6z4izsdq8m060mppkkv675x0lf"; - patches = [ ./patches/vendored-sources-1.10.patch ]; + version = "1.11.8"; + sha256 = "0qk5vl8ql3pr9pz5iz7whahwqi1fcbsf8kphn6z4grgc87id7b19"; + cargoSha256 = "0p2idd36cyzp2ax81k533bdma4hz0ws2981qj2s7jnhvmj4941l8"; + patches = [ ./patches/vendored-sources-1.11.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix index 9c9d1d4293e0..55665034ccf9 100644 --- a/pkgs/applications/altcoins/parity/parity.nix +++ b/pkgs/applications/altcoins/parity/parity.nix @@ -10,6 +10,8 @@ , pkgconfig , openssl , systemd +, cmake +, perl }: rustPlatform.buildRustPackage rec { @@ -18,12 +20,15 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "paritytech"; - repo = "parity"; + repo = "parity-ethereum"; rev = "v${version}"; inherit sha256; }; - buildInputs = [ pkgconfig systemd.lib systemd.dev openssl openssl.dev ]; + buildInputs = [ + pkgconfig cmake perl + systemd.lib systemd.dev openssl openssl.dev + ]; # Some checks failed doCheck = false; diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch index e59858442c9e..733f6880ad9d 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch @@ -1,5 +1,5 @@ diff --git a/.cargo/config b/.cargo/config -index 72652ad2f..b21c6aa7b 100644 +index 72652ad2f..57c5c2f8f 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,3 +1,108 @@ @@ -52,19 +52,19 @@ index 72652ad2f..b21c6aa7b 100644 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/hidapi-rs"] -+git = "https://github.com/paritytech/hidapi-rs" ++[source."https://github.com/paritytech/daemonize"] ++git = "https://github.com/paritytech/daemonize" +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/hyper"] -+git = "https://github.com/paritytech/hyper" ++[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.10" ++branch = "parity-1.11" +replace-with = "vendored-sources" + +[source."https://github.com/paritytech/libusb-rs"] @@ -77,6 +77,11 @@ index 72652ad2f..b21c6aa7b 100644 +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" @@ -102,13 +107,7 @@ index 72652ad2f..b21c6aa7b 100644 +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-2.0.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch new file mode 100644 index 000000000000..9af64559d971 --- /dev/null +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch @@ -0,0 +1,98 @@ +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-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/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" |