public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parity: 1.10.8 -> 1.11.8; parity-beta: init at 2.0.1 (#44170)

Browse Source 
* parity: 1.10.8 -> 1.10.9

* parity: 1.10.8 -> 1.11.8; parity-beta: init at 2.0.1
This commit is contained in:
Alexander Krupenkin 2018-08-03 17:54:30 +03:00 committed by xeji
parent 725f253190
commit 8d708d28a1
7 changed files with 130 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/altcoins/default.nix
View File

@ -86,6 +86,7 @@ rec {
}; };
parity = callPackage ./parity { }; parity = callPackage ./parity { };
parity-beta = callPackage ./parity/beta.nix { };
parity-ui = callPackage ./parity-ui { }; parity-ui = callPackage ./parity-ui { };
particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; }; particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; };

7
pkgs/applications/altcoins/parity/beta.nix Normal file
View File

@ -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; }

8
pkgs/applications/altcoins/parity/default.nix
View File

@ -1,7 +1,7 @@
let let
version = "1.10.9"; version = "1.11.8";
sha256 = "1irfksx887vvvdf97q26qacn22kmyj8fgb3ghh9wv5qnzrn3564g"; sha256 = "0qk5vl8ql3pr9pz5iz7whahwqi1fcbsf8kphn6z4grgc87id7b19";
cargoSha256 = "0rzhabyhprmcg0cdmibbb8zgqf6z4izsdq8m060mppkkv675x0lf"; cargoSha256 = "0p2idd36cyzp2ax81k533bdma4hz0ws2981qj2s7jnhvmj4941l8";
patches = [ ./patches/vendored-sources-1.10.patch ]; patches = [ ./patches/vendored-sources-1.11.patch ];
in in
import ./parity.nix { inherit version sha256 cargoSha256 patches; } import ./parity.nix { inherit version sha256 cargoSha256 patches; }

9
pkgs/applications/altcoins/parity/parity.nix
View File

@ -10,6 +10,8 @@
, pkgconfig , pkgconfig
, openssl , openssl
, systemd , systemd
, cmake
, perl
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -18,12 +20,15 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "paritytech"; owner = "paritytech";
repo = "parity"; repo = "parity-ethereum";
rev = "v${version}"; rev = "v${version}";
inherit sha256; 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 # Some checks failed
doCheck = false; doCheck = false;

25
pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch → pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch
View File

@ -1,5 +1,5 @@
diff --git a/.cargo/config b/.cargo/config diff --git a/.cargo/config b/.cargo/config
index 72652ad2f..b21c6aa7b 100644 index 72652ad2f..57c5c2f8f 100644
--- a/.cargo/config --- a/.cargo/config
+++ b/.cargo/config +++ b/.cargo/config
@@ -1,3 +1,108 @@ @@ -1,3 +1,108 @@
@ -52,19 +52,19 @@ index 72652ad2f..b21c6aa7b 100644
+branch = "master" +branch = "master"
+replace-with = "vendored-sources" +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"] +[source."https://github.com/paritytech/hidapi-rs"]
+git = "https://github.com/paritytech/hidapi-rs" +git = "https://github.com/paritytech/hidapi-rs"
+branch = "master" +branch = "master"
+replace-with = "vendored-sources" +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/jsonrpc.git"] +[source."https://github.com/paritytech/jsonrpc.git"]
+git = "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" +replace-with = "vendored-sources"
+ +
+[source."https://github.com/paritytech/libusb-rs"] +[source."https://github.com/paritytech/libusb-rs"]
@ -77,6 +77,11 @@ index 72652ad2f..b21c6aa7b 100644
+branch = "master" +branch = "master"
+replace-with = "vendored-sources" +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"] +[source."https://github.com/paritytech/rust-ctrlc.git"]
+git = "https://github.com/paritytech/rust-ctrlc.git" +git = "https://github.com/paritytech/rust-ctrlc.git"
+branch = "master" +branch = "master"
@ -102,13 +107,7 @@ index 72652ad2f..b21c6aa7b 100644
+branch = "master" +branch = "master"
+replace-with = "vendored-sources" +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"] +[source."https://github.com/tomusdrw/ws-rs"]
+git = "https://github.com/tomusdrw/ws-rs" +git = "https://github.com/tomusdrw/ws-rs"
+branch = "master" +branch = "master"
+replace-with = "vendored-sources" +replace-with = "vendored-sources"
+

98
pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch Normal file
View File

@ -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"

1
pkgs/top-level/all-packages.nix
View File

@ -15294,6 +15294,7 @@ with pkgs;
hevm = self.altcoins.hevm; hevm = self.altcoins.hevm;
parity = self.altcoins.parity; parity = self.altcoins.parity;
parity-beta = self.altcoins.parity-beta;
parity-ui = self.altcoins.parity-ui; parity-ui = self.altcoins.parity-ui;
stellar-core = self.altcoins.stellar-core; stellar-core = self.altcoins.stellar-core;