Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704'

6 files changed, 10 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/applications/blockchains/jormungandr/default.nix b/nixpkgs/pkgs/applications/blockchains/jormungandr/default.nix
index 8c276d6bb805..541ef49ef5ad 100644
--- a/nixpkgs/pkgs/applications/blockchains/jormungandr/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/jormungandr/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jormungandr";
-  version = "0.3.3";
+  version = "0.3.1415";
 
   src = fetchgit {
     url = "https://github.com/input-output-hk/${pname}";
     rev = "v${version}";
-    sha256 = "1fw3cl2rxnw9mww1b1z96x2iapwbpdgyp4ra19dhvfzmlvaiml5j";
+    sha256 = "1kg20570ri3bj99gicpp2z272igj9s7m2qw0z1ndk60bxcyghi2x";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "1ilp9ffaz3njv38mnqics4b5d7wh52mj4rwi71h5c0wzx4ww3zal";
+  cargoSha256 = "0b5phmvwv5cyjawlxd9rmlc403lxzm4gnw0mclq70g5g0msqzd9m";
 
   nativeBuildInputs = [ pkgconfig protobuf ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
diff --git a/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix b/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix
index 5b8b17232b90..2b7ae5d9c6e6 100644
--- a/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = let
     options = {
-      BOOST_ROOT = "${boost}";
+      BOOST_ROOT = boost;
       Boost_USE_STATIC_LIBS = "OFF";
       RAIBLOCKS_GUI = "ON";
       RAIBLOCKS_TEST = "ON";
diff --git a/nixpkgs/pkgs/applications/blockchains/parity/beta.nix b/nixpkgs/pkgs/applications/blockchains/parity/beta.nix
index a936691bd799..a6d4660dff11 100644
--- a/nixpkgs/pkgs/applications/blockchains/parity/beta.nix
+++ b/nixpkgs/pkgs/applications/blockchains/parity/beta.nix
@@ -1,6 +1,6 @@
 let
   version     = "2.6.2";
   sha256      = "1j4249m5k3bi7di0wq6fm64zv3nlpgmg4hr5hnn94fyc09nz9n1r";
-  cargoSha256 = "18zd91n04wck3gd8szj4vxn3jq0bzq0h3rg0wcs6nzacbzhcx2sw";
+  cargoSha256 = "1wr0i54zc3l6n0x6cvlq9zfy3bw9w5fcvdz4vmyym9r1nkvk31s7";
 in
   import ./parity.nix { inherit version sha256 cargoSha256; }
diff --git a/nixpkgs/pkgs/applications/blockchains/parity/default.nix b/nixpkgs/pkgs/applications/blockchains/parity/default.nix
index 9b5a72077d5c..88d24a87e135 100644
--- a/nixpkgs/pkgs/applications/blockchains/parity/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/parity/default.nix
@@ -1,6 +1,6 @@
 let
   version     = "2.5.7";
   sha256      = "0aprs71cbf98dsvjz0kydngkvdg5x7dijji8j6xadgvsarl1ljnj";
-  cargoSha256 = "0aa0nkv3jr7cdzswbxghxxv0y65a59jgs1682ch8vrasi0x17m1x";
+  cargoSha256 = "11mr5q5aynli9xm4wnxcypl3ij7f4b0p7l557yi9n0cvdraw8ki4";
 in
   import ./parity.nix { inherit version sha256 cargoSha256; }
diff --git a/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix b/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix
index 933e5773edad..6a5532f92c95 100644
--- a/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wasabiwallet";
-  version = "1.1.6";
+  version = "1.1.9";
 
   src = fetchurl {
     url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
-    sha256 = "1i7fhaj9chjlm7qg0h3azy4djnm9rxskbr3dzjj0n9rw8cjdqyq6";
+    sha256 = "1dz05ivhadfjfp4yfpz492401yznm3rlnx7g4nqzxwh4cmqzisrm";
   };
 
   dontBuild = true;
diff --git a/nixpkgs/pkgs/applications/blockchains/zcash/default.nix b/nixpkgs/pkgs/applications/blockchains/zcash/default.nix
index 6a8fba3c2bb7..1852d72d326f 100644
--- a/nixpkgs/pkgs/applications/blockchains/zcash/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/zcash/default.nix
@@ -1,6 +1,6 @@
 { stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost
 , zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent
-, withGui }:
+, libsnark, withGui }:
 
 let librustzcash = callPackage ./librustzcash {};
 in
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ gtest gmock gmp openssl wget db62 boost zlib
-                  protobuf libevent libsodium librustzcash ]
+                  protobuf libevent libsodium librustzcash libsnark ]
                   ++ optionals stdenv.isLinux [ utillinux ]
                   ++ optionals withGui [ qt4 qrencode ];