From e21672c4ac2060876a81579e531ede33405bec3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Mon, 6 Nov 2017 11:56:00 +0100 Subject: [PATCH] Jbuilder: do not depend on the git version anymore --- scripts/install_build_deps.sh | 1 - tezos.opam | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/install_build_deps.sh b/scripts/install_build_deps.sh index 95e4d6c33..ebdc79e90 100755 --- a/scripts/install_build_deps.sh +++ b/scripts/install_build_deps.sh @@ -20,7 +20,6 @@ opam pin --yes add --no-action --dev-repo sodium opam pin --yes add --no-action --dev-repo ocp-ocamlres opam pin --yes add --no-action --dev-repo ocplib-json-typed opam pin --yes add --no-action --dev-repo ocplib-resto -opam pin --yes add --no-action --dev-repo jbuilder ## Force opam to take account of the new `tezos-deps.opam` opam pin --yes remove tezos opam pin --yes add --no-action tezos $src_dir diff --git a/tezos.opam b/tezos.opam index 57fcf8850..bff0453fb 100644 --- a/tezos.opam +++ b/tezos.opam @@ -7,8 +7,8 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ - "ocamlfind" {build} - "jbuilder" {build} + "ocamlfind" { build } + "jbuilder" { build & >= "1.0+beta15" } "base-bigarray" "base-threads" "conf-libev"