Merge pull request #10942 from MinaProtocol/nix-prep

Nix prep
MinaProtocol · May 17, 2022 · ebda66e · ebda66e
2 parents 4fdf3bf + bfdfcc7
commit ebda66e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/src/app/validation/mix.lock b/src/app/validation/mix.lock
@@ -18,7 +18,7 @@
   "idna": {:hex, :idna, "6.0.1", "1d038fb2e7668ce41fbf681d2c45902e52b3cb9e9c77b55334353b222c2ee50c", [:rebar3], [{:unicode_util_compat, "0.5.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a02c8a1c4fd601215bb0b0324c8a6986749f807ce35f25449ec9e69758708122"},
   "jason": {:hex, :jason, "1.2.1", "12b22825e22f468c02eb3e4b9985f3d0cb8dc40b9bd704730efa11abd2708c44", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "b659b8571deedf60f79c5a608e15414085fa141344e2716fbd6988a084b5f993"},
   "joken": {:hex, :joken, "2.2.0", "2daa1b12be05184aff7b5ace1d43ca1f81345962285fff3f88db74927c954d3a", [:mix], [{:jose, "~> 1.9", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm", "b4f92e30388206f869dd25d1af628a1d99d7586e5cf0672f64d4df84c4d2f5e9"},
-  "jose": {:hex, :jose, "1.10.1", "16d8e460dae7203c6d1efa3f277e25b5af8b659febfc2f2eb4bacf87f128b80a", [:mix, :rebar3], [], "hexpm", "3c7ddc8a9394b92891db7c2771da94bf819834a1a4c92e30857b7d582e2f8257"},
+  "jose": {:hex, :jose, "1.10.1", "16d8e460dae7203c6d1efa3f277e25b5af8b659febfc2f2eb4bacf87f128b80a", [:mix], [], "hexpm", "3c7ddc8a9394b92891db7c2771da94bf819834a1a4c92e30857b7d582e2f8257"},
   "makeup": {:hex, :makeup, "1.0.3", "e339e2f766d12e7260e6672dd4047405963c5ec99661abdc432e6ec67d29ef95", [:mix], [{:nimble_parsec, "~> 0.5", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "2e9b4996d11832947731f7608fed7ad2f9443011b3b479ae288011265cdd3dad"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.14.1", "4f0e96847c63c17841d42c08107405a005a2680eb9c7ccadfd757bd31dabccfb", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f2438b1a80eaec9ede832b5c41cd4f373b38fd7aa33e3b22d9db79e640cbde11"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},

diff --git a/src/external/ocaml-rocksdb/dune b/src/external/ocaml-rocksdb/dune
@@ -24,8 +24,9 @@
  (targets librocksdb_stubs.a)
  (deps (source_tree rocksdb))
  (action (bash "
-    if [ -e /usr/local/lib/librocksdb_coda.a ]; then
-      cp /usr/local/lib/librocksdb_coda.a librocksdb_stubs.a
+    NATIVE_ROCKSDB=${MINA_ROCKSDB-/usr/local/lib/librocksdb_coda.a}
+    if [ -e $NATIVE_ROCKSDB ]; then
+      cp $NATIVE_ROCKSDB librocksdb_stubs.a
     else
       if [ ! -d rocksdb ]; then git clone https://github.com/facebook/rocksdb -b v5.17.2 --depth=1; fi
       pushd rocksdb

diff --git a/src/external/ocaml-sodium/Makefile b/src/external/ocaml-sodium/Makefile
@@ -10,7 +10,7 @@ ENV=CTYPES_LIB_DIR=$(CTYPES_LIB_DIR) OCAML_LIB_DIR=$(OCAML_LIB_DIR)
 OCAMLBUILD=$(ENV) ocamlbuild -use-ocamlfind -classic-display
 
 all:
-	$(OCAMLBUILD) lib/sodium.cma lib/sodium.cmxa lib/sodium.cmxs
+	$(OCAMLBUILD) lib/sodium.cma lib/sodium.cmxa
 
 clean:
 	$(OCAMLBUILD) -clean
@@ -23,9 +23,8 @@ test: _build/lib_test/nacl_runner
 install:
 	ocamlfind install sodium lib/META \
 		$(addprefix _build/lib/,sodium.mli sodium.cmi sodium.cmti \
-					sodium.cma sodium.cmx sodium.cmxa sodium.cmxs \
+					sodium.cma sodium.cmx sodium.cmxa \
 		                        sodium$(EXT_LIB) \
-					dllsodium_stubs$(EXT_DLL) \
 					libsodium_stubs$(EXT_LIB))
 
 uninstall:

diff --git a/src/lib/command_line_tests/dune b/src/lib/command_line_tests/dune
@@ -1,7 +1,7 @@
 (library
  (name command_line_tests)
  (public_name command_line_tests)
- (inline_tests)
+ (inline_tests (deps ../../app/cli/src/mina.exe))
  (libraries
    ;; opam libraries
    async_kernel

diff --git a/src/libp2p_ipc/Makefile b/src/libp2p_ipc/Makefile
@@ -1,11 +1,14 @@
 .PHONY: get-go-capnp clean
 
 ifeq ($(GO),)
-GO := go
+GO = go
 endif
 
-GO_CAPNP_VERSION=v3@v3.0.0-alpha.1
-GO_CAPNP_STD=$(shell $(GO) env GOPATH)/pkg/mod/capnproto.org/go/capnp/${GO_CAPNP_VERSION}/std
+GO_CAPNP_VERSION = v3@v3.0.0-alpha.1
+
+ifeq ($(GO_CAPNP_STD),)
+GO_CAPNP_STD = $(shell $(GO) env GOPATH)/pkg/mod/capnproto.org/go/capnp/${GO_CAPNP_VERSION}/std
+endif
 
 get-go-capnp:
 	$(GO) get capnproto.org/go/capnp/$(GO_CAPNP_VERSION)