Merge remote-tracking branch 'james/dev' into cryptoconditions

diff --cc depends/packages/packages.mk
index f75fcb50e41db15253b9b1ad6c0e7f40042d0977,3c9eabc8836a318604a4d82d928a86c00525fa90..3c78e29c378b79b7170c2a2c1e4b2e962024f8df
--- 1/depends/packages/packages.mk
--- 2/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@@ -3,9 -3,9 +3,9 @@@ rust_packages := rust librustzcas
  proton_packages := proton
  zcash_packages := libgmp libsodium
  ifeq ($(host_os),linux)
-       packages := boost openssl libevent zeromq $(zcash_packages) googletest # googlemock
+       packages := boost openssl libevent zeromq $(zcash_packages) googletest #googlemock
  else
-       packages := boost openssl libevent zeromq $(zcash_packages) libcurl googletest # googlemock
 -      packages := boost openssl libevent zeromq $(zcash_packages) libcurl googletest #googlemock 
++      packages := boost openssl libevent zeromq $(zcash_packages) libcurl googletest #googlemock
  endif
  
  native_packages := native_ccache