Skip to content

Commit

Permalink
Merge branch 'ylecornec/check_opam_switch-compatible' into ylecornec/…
Browse files Browse the repository at this point in the history
…check_opam_switch-develop
  • Loading branch information
ylecornec committed Jul 27, 2022
2 parents f0387df + 35abc1b commit 886d185
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ ocaml_version:
ocaml_word_size:
@if ! ocamlopt -config | grep "word_size:" | grep $(WORD_SIZE); then echo "invalid machine word size, expected $(WORD_SIZE)" ; exit 1; fi


# Checks that the current opam switch contains the packages from opam.export at the same version.
# This check is disabled in the pure nix environment (that does not use opam).
check_opam_switch:
ifneq ($(DISABLE_CHECK_OPAM_SWITCH), true)
check_opam_switch opam.export
Expand Down
4 changes: 2 additions & 2 deletions README-dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ Refer to [/dev](/dev).

Mina has a variety of opam and system dependencies.

To get all the opam dependencies you need, you run `opam switch import
opam.export`.
To get all the opam dependencies you need, you run `opam switch import opam.export`.
> *_NOTE:_* The switch provides a `dune_wrapper` binary that you can use instead of dune, and will fail early if your switch becomes out of sync with the `opam.export` file.
Some of our dependencies aren't taken from `opam`, and aren't integrated
with `dune`, so you need to add them manually, by running `scripts/pin-external-packages.sh`.
Expand Down

0 comments on commit 886d185

Please sign in to comment.