summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlexander Krupenkin <mail@akru.me>2018-04-27 15:11:31 +0300
committerAlexander Krupenkin <mail@akru.me>2018-04-27 15:11:31 +0300
commit9939fb2cb6ae28e87be6ac38b85d0537eb0a097e (patch)
tree39cb9411cfc9fd73ff77689725086a3c41292b8c
parent44342f139ec014442c0b1538099868696e641cb2 (diff)
downloadnixlib-9939fb2cb6ae28e87be6ac38b85d0537eb0a097e.tar
nixlib-9939fb2cb6ae28e87be6ac38b85d0537eb0a097e.tar.gz
nixlib-9939fb2cb6ae28e87be6ac38b85d0537eb0a097e.tar.bz2
nixlib-9939fb2cb6ae28e87be6ac38b85d0537eb0a097e.tar.lz
nixlib-9939fb2cb6ae28e87be6ac38b85d0537eb0a097e.tar.xz
nixlib-9939fb2cb6ae28e87be6ac38b85d0537eb0a097e.tar.zst
nixlib-9939fb2cb6ae28e87be6ac38b85d0537eb0a097e.zip
parity-beta: 1.10.1 -> 1.10.2
-rw-r--r--pkgs/applications/altcoins/parity/beta.nix6
-rw-r--r--pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch18
2 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix
index b1bf38427a83..9cbab6ad0955 100644
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ b/pkgs/applications/altcoins/parity/beta.nix
@@ -1,7 +1,7 @@
 let
-  version     = "1.10.1";
-  sha256      = "0313ch4rqnwrsf7y1h8bdwjk59gvcj08jjf6sybb6ww0ml7a6i7b";
-  cargoSha256 = "00jr4g3q40pc1wi7fmfq1j8iakmv9pid7l31rf76wj4n8g051zc7";
+  version     = "1.10.2";
+  sha256      = "1a1rbwlwi60nfv6m1rdy5baq5lcafc8nw96y45pr1674i48gkp0l";
+  cargoSha256 = "0l3rjkinzppfq8fi8h24r35rb552fzzman5a6yk33wlsdj2lv7yh";
   patches     = [ ./patches/vendored-sources-1.10.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch
index 3e8e032f30c2..e59858442c9e 100644
--- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch
+++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch
@@ -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"
++