Merge branch 'dev-stable' of https://github.com/QuantumPackage/qp2 into dev-stable

INSTALL.rst

@@ -316,7 +316,7 @@ OCaml
 
   .. code:: bash
 
-      opam install ocamlbuild cryptokit zmq sexplib ppx_sexp_conv ppx_deriving getopt
+      opam install ocamlbuild zmq sexplib ppx_sexp_conv ppx_deriving getopt
 
 
 Docopt

configure

@@ -19,6 +19,8 @@ git submodule update
 # Update ARM or x86 dependencies
 ARCHITECTURE=$(uname -m)
 cd ${QP_ROOT}/external/qp2-dependencies
+git checkout master
+git pull
 echo "Architecture: $ARCHITECTURE"
 cd ${QP_ROOT}
 

external/qp2-dependencies

@@ -1 +1 @@
-Subproject commit f40bde0925808bbec0424b57bfcef1b26473a1c8
+Subproject commit ce14f57b50511825a9fedb096749200779d3f4d4

ocaml/Makefile

@@ -43,7 +43,7 @@ $(QP_ROOT)/data/executables: remake_executables element_create_db.byte Qptypes.m
 	$(QP_ROOT)/ocaml/element_create_db.byte
 
 external_libs:
-	opam install cryptokit sexplib
+	opam install sexplib
 
 qpackage.odocl: $(MLIFILES)
 	ls $(MLIFILES) | sed "s/\.mli//" > qpackage.odocl

ocaml/To_md5.ml

@@ -4,8 +4,8 @@ open Sexplib
 let to_md5 sexp_of_t t =
   sexp_of_t t
   |> Sexp.to_string
-  |> Cryptokit.hash_string (Cryptokit.Hash.md5 ())
-  |> Cryptokit.transform_string (Cryptokit.Hexa.encode ())
+  |> Digest.string 
+  |> Digest.to_hex
   |> MD5.of_string
 ;;
 

ocaml/_tags

@@ -1,4 +1,4 @@
-true: package(cryptokit,zarith,zmq,str,sexplib,ppx_sexp_conv,ppx_deriving,getopt)
+true: package(zarith,zmq,str,sexplib,ppx_sexp_conv,ppx_deriving,getopt)
 true: thread
 false: profile
 <*byte>   : linkdep(c_bindings.o), custom