From 6e9b479043ec542114d2718668cebcec63f2fe4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Wed, 1 Feb 2023 07:37:10 +0100 Subject: [PATCH 1/2] Build: bump ocamlformat's code-compat version --- .ocamlformat | 2 +- src/bin_dal_node/errors.ml | 6 +++--- src/bin_node/node_run_command.ml | 2 +- src/lib_context/test/test_merkle_proof.ml | 8 ++++---- src/lib_layer2_store/delayed_write_monad.ml | 2 +- .../bare/structs/seq_e.ml | 4 ++-- .../bare/structs/seq_es.ml | 4 ++-- .../bare/structs/seq_s.ml | 2 +- .../test/test_fuzzing_helpers.ml | 6 +++--- src/lib_lwt_result_stdlib/test/test_generic.ml | 6 +++--- .../test/test_list_basic_lwt.ml | 4 ++-- src/lib_p2p/test/test_p2p_logging.ml | 6 +++--- src/lib_p2p/test/test_p2p_socket.ml | 18 +++++++++--------- src/lib_rpc_http/test/test_rpc_http.ml | 4 ++-- src/lib_shell/bootstrap_pipeline.ml | 2 +- src/lib_shell/chain_validator.ml | 2 +- src/lib_stdlib/hash_queue.ml | 2 +- .../test-unix/test_circular_buffer.ml | 4 ++-- src/lib_time_measurement/.ocamlformat | 2 +- .../lib_benchmark/michelson_samplers.ml | 6 +++--- .../lib_delegate/baking_simulator.ml | 2 +- .../lib_delegate/baking_vdf.ml | 2 +- .../lib_plugin/test/test_consensus_filter.ml | 4 ++-- .../test/unit/test_sc_rollup_game.ml | 2 +- .../lib_tx_rollup/batcher.ml | 2 +- .../lib_benchmark/michelson_samplers.ml | 2 +- .../sc_rollup_benchmarks.ml | 2 +- src/proto_016_PtMumbai/lib_dal/RPC.ml | 2 +- .../lib_delegate/baking_simulator.ml | 2 +- .../lib_delegate/baking_vdf.ml | 2 +- .../lib_plugin/test/test_consensus_filter.ml | 4 ++-- .../test/unit/test_sc_rollup_inbox_legacy.ml | 2 +- .../RPC_directory_helpers.ml | 4 ++-- .../lib_sc_rollup_node/batcher.ml | 2 +- .../lib_sc_rollup_node/commitment.ml | 4 ++-- .../lib_sc_rollup_node/inbox.ml | 4 ++-- .../lib_sc_rollup_node/node_context.ml | 2 +- .../lib_benchmark/michelson_samplers.ml | 2 +- .../sc_rollup_benchmarks.ml | 2 +- src/proto_alpha/lib_dac/RPC.ml | 2 +- .../lib_delegate/baking_simulator.ml | 2 +- src/proto_alpha/lib_delegate/baking_vdf.ml | 2 +- .../lib_plugin/test/test_consensus_filter.ml | 4 ++-- .../lib_protocol/delegate_consensus_key.ml | 2 +- src/proto_alpha/lib_protocol/skip_list_repr.ml | 2 +- .../test/unit/test_sc_rollup_inbox_legacy.ml | 2 +- .../RPC_directory_helpers.ml | 4 ++-- src/proto_alpha/lib_sc_rollup_node/batcher.ml | 2 +- .../lib_sc_rollup_node/commitment.ml | 4 ++-- src/proto_alpha/lib_sc_rollup_node/inbox.ml | 4 ++-- .../lib_sc_rollup_node/node_context.ml | 2 +- tezt/tests/sc_rollup.ml | 4 ++-- 52 files changed, 88 insertions(+), 88 deletions(-) diff --git a/.ocamlformat b/.ocamlformat index 4d3778114a8a..23c9b63c9c32 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -1,5 +1,5 @@ version=0.21.0 -ocaml-version=4.12.1 +ocaml-version=4.14 wrap-fun-args=false let-binding-spacing=compact field-space=loose diff --git a/src/bin_dal_node/errors.ml b/src/bin_dal_node/errors.ml index a5312f040958..47ff6e433d5b 100644 --- a/src/bin_dal_node/errors.ml +++ b/src/bin_dal_node/errors.ml @@ -68,7 +68,7 @@ let other_result v = let other_lwt_result v = let open Lwt_syntax in - let* v = v in + let* v in return @@ other_result v (* Helpers to cast the errors into tzresult monad. *) @@ -93,12 +93,12 @@ let error_to_tzresult e = let to_option_tzresult ?(none = fun _e -> false) r = let open Lwt_result_syntax in - let*! r = r in + let*! r in match r with | Ok s -> return_some s | Error err -> if none err then return_none else error_to_tzresult err let to_tzresult r = let open Lwt_result_syntax in - let*! r = r in + let*! r in match r with Ok s -> return s | Error e -> error_to_tzresult e diff --git a/src/bin_node/node_run_command.ml b/src/bin_node/node_run_command.ml index f14b9e4773b2..f59546905ce3 100644 --- a/src/bin_node/node_run_command.ml +++ b/src/bin_node/node_run_command.ml @@ -557,7 +557,7 @@ let run ?verbosity ?sandbox ?target ?(cli_warnings = []) | _ -> Lwt.return_unit) node in - let*? node = node in + let*? node in let node_downer = Lwt_exit.register_clean_up_callback ~loc:__LOC__ (fun _ -> let*! () = Event.(emit shutting_down_node) () in diff --git a/src/lib_context/test/test_merkle_proof.ml b/src/lib_context/test/test_merkle_proof.ml index 8a468a19e7a8..58ab6a3630bb 100644 --- a/src/lib_context/test/test_merkle_proof.ml +++ b/src/lib_context/test/test_merkle_proof.ml @@ -85,12 +85,12 @@ module Proof32 (Encoding : Tezos_context_sigs.Context.PROOF_ENCODING) = struct let rec inode_tree (depth, width) = if depth <= 0 then - let+ hash = hash in + let+ hash in Blinded_inode hash else oneof [ - (let+ hash = hash in + (let+ hash in Blinded_inode hash); (let* size = int_bound 3 in let size = size + 1 in @@ -302,12 +302,12 @@ module Proof2 (Encoding : Tezos_context_sigs.Context.PROOF_ENCODING) = struct let rec inode_tree (depth, width) = if depth <= 0 then - let+ hash = hash in + let+ hash in Blinded_inode hash else oneof [ - (let+ hash = hash in + (let+ hash in Blinded_inode hash); (let* size = int_bound 3 in let size = size + 1 in diff --git a/src/lib_layer2_store/delayed_write_monad.ml b/src/lib_layer2_store/delayed_write_monad.ml index 91a8bb7899c8..2a120c457d4b 100644 --- a/src/lib_layer2_store/delayed_write_monad.ml +++ b/src/lib_layer2_store/delayed_write_monad.ml @@ -63,7 +63,7 @@ let ignore {result; _} = result module Lwt_result_syntax = struct let bind f a = let open Lwt_result_syntax in - let* a = a in + let* a in let* b = f a.result in let write = match (a.write, b.write) with diff --git a/src/lib_lwt_result_stdlib/bare/structs/seq_e.ml b/src/lib_lwt_result_stdlib/bare/structs/seq_e.ml index 2cba05200666..f50e85bcf88c 100644 --- a/src/lib_lwt_result_stdlib/bare/structs/seq_e.ml +++ b/src/lib_lwt_result_stdlib/bare/structs/seq_e.ml @@ -43,7 +43,7 @@ let empty () = Ok Nil let return x () = Ok (Cons (x, empty)) let return_e r () = - let* r = r in + let* r in Ok (Cons (r, empty)) let interrupted e () = Error e @@ -51,7 +51,7 @@ let interrupted e () = Error e let cons item t () = Ok (Cons (item, t)) let cons_e item t () = - let* item = item in + let* item in Ok (Cons (item, t)) let rec append ta tb () = diff --git a/src/lib_lwt_result_stdlib/bare/structs/seq_es.ml b/src/lib_lwt_result_stdlib/bare/structs/seq_es.ml index b11fd85e1b20..b0cdaa250164 100644 --- a/src/lib_lwt_result_stdlib/bare/structs/seq_es.ml +++ b/src/lib_lwt_result_stdlib/bare/structs/seq_es.ml @@ -73,11 +73,11 @@ let cons_e item t () = let cons_s item t () = let open Lwt_syntax in - let* item = item in + let* item in return_ok (Cons (item, t)) let cons_es item t () = - let* item = item in + let* item in return (Cons (item, t)) let rec append ta tb () = diff --git a/src/lib_lwt_result_stdlib/bare/structs/seq_s.ml b/src/lib_lwt_result_stdlib/bare/structs/seq_s.ml index 8bb7f6fce294..f0ddef4cfa54 100644 --- a/src/lib_lwt_result_stdlib/bare/structs/seq_s.ml +++ b/src/lib_lwt_result_stdlib/bare/structs/seq_s.ml @@ -47,7 +47,7 @@ let return_s p () = Lwt.map (fun x -> Cons (x, empty)) p let cons item t () = Lwt.return (Cons (item, t)) let cons_s item t () = - let* item = item in + let* item in return (Cons (item, t)) let rec append ta tb () = diff --git a/src/lib_lwt_result_stdlib/test/test_fuzzing_helpers.ml b/src/lib_lwt_result_stdlib/test/test_fuzzing_helpers.ml index a5eb4a5bd738..fa20a442bd59 100644 --- a/src/lib_lwt_result_stdlib/test/test_fuzzing_helpers.ml +++ b/src/lib_lwt_result_stdlib/test/test_fuzzing_helpers.ml @@ -560,7 +560,7 @@ let eq_e ?pp (a : ('a, 'trace) result) (b : ('a, 'trace) result) = eq ?pp a b let eq_s ?pp a b = Lwt_main.run (let open Lwt_syntax in - let+ a = a and+ b = b in + let+ a and+ b in eq ?pp a b) (** [eq_es] is a duplicate of {!eq_s} for consistency @@ -588,7 +588,7 @@ let eq_es ?pp (a : ('a, 'b) result Lwt.t) (b : ('a, 'b) result Lwt.t) = let eq_es_ep ?pp es ep = Lwt_main.run (let open Lwt_syntax in - let+ es = es and+ ep = ep in + let+ es and+ ep in match (es, ep) with | Ok ok_es, Ok ok_ep -> eq ?pp ok_es ok_ep | Error error_es, Error trace_ep -> @@ -611,7 +611,7 @@ let eq_es_ep ?pp es ep = let eq_ep ?pp a b = Lwt_main.run (let open Lwt_syntax in - let+ a = a and+ b = b in + let+ a and+ b in match (a, b) with | Ok ok_es, Ok ok_ep -> eq ?pp ok_es ok_ep | Error _, Error _ -> diff --git a/src/lib_lwt_result_stdlib/test/test_generic.ml b/src/lib_lwt_result_stdlib/test/test_generic.ml index 21f8148afbe0..d9f1e844ea7d 100644 --- a/src/lib_lwt_result_stdlib/test/test_generic.ml +++ b/src/lib_lwt_result_stdlib/test/test_generic.ml @@ -85,7 +85,7 @@ module Testing = struct let eq a b = Assert.equal ~pp a b let eq_s a b = - let+ b = b in + let+ b in Assert.equal ~pp a b let eq_s_catch a b = @@ -113,7 +113,7 @@ module Testing = struct let eq a b = Assert.equal ~pp a b let eq_s a b = - let+ b = b in + let+ b in eq a b let eq_s_catch a b = @@ -143,7 +143,7 @@ module Testing = struct let eq a b = Assert.equal ~pp a b let eq_s a b = - let+ b = b in + let+ b in Assert.equal ~pp a b let eq_s_catch a b = diff --git a/src/lib_lwt_result_stdlib/test/test_list_basic_lwt.ml b/src/lib_lwt_result_stdlib/test/test_list_basic_lwt.ml index 1b3c7ced05a6..cc3299408e30 100644 --- a/src/lib_lwt_result_stdlib/test/test_list_basic_lwt.ml +++ b/src/lib_lwt_result_stdlib/test/test_list_basic_lwt.ml @@ -35,13 +35,13 @@ let assert_err e = e = Error () let assert_err_s e = let open Lwt_syntax in - let* e = e in + let* e in assert (e = Error ()) ; return_unit let assert_err_p e = let open Lwt_syntax in - let* e = e in + let* e in assert (e = Error (Support.Test_trace.make ())) ; return_unit diff --git a/src/lib_p2p/test/test_p2p_logging.ml b/src/lib_p2p/test/test_p2p_logging.ml index 0a4887853950..dcc30420023f 100644 --- a/src/lib_p2p/test/test_p2p_logging.ml +++ b/src/lib_p2p/test/test_p2p_logging.ml @@ -53,7 +53,7 @@ module Authentication = struct let client _ch sched addr port = let open Lwt_result_syntax in - let*! id2 = id2 in + let*! id2 in let* _, auth_fd = connect sched addr port id2 in let* conn = P2p_socket.accept ~canceler auth_fd encoding in let*! () = P2p_socket.close conn in @@ -99,7 +99,7 @@ module Nack = struct let client ch sched addr port = let open Lwt_result_syntax in - let*! id2 = id2 in + let*! id2 in let* _, auth_fd = connect sched addr port id2 in let*! _conn = P2p_socket.accept ~canceler auth_fd Data_encoding.bytes in sync ch @@ -164,7 +164,7 @@ module Read_and_write = struct let client ch sched addr port = let open Lwt_result_syntax in - let*! id2 = id2 in + let*! id2 in let* _, auth_fd = connect sched addr port id2 in let* conn = P2p_socket.accept ~canceler auth_fd Data_encoding.bytes in let* () = diff --git a/src/lib_p2p/test/test_p2p_socket.ml b/src/lib_p2p/test/test_p2p_socket.ml index 713b61493a34..27bb80f67805 100644 --- a/src/lib_p2p/test/test_p2p_socket.ml +++ b/src/lib_p2p/test/test_p2p_socket.ml @@ -275,7 +275,7 @@ module Nack = struct let open Lwt_result_syntax in let* info, auth_fd = accept sched socket in let* () = tzassert info.incoming __POS__ in - let*! id2 = id2 in + let*! id2 in let* () = tzassert (P2p_peer.Id.compare info.peer_id id2.peer_id = 0) __POS__ in @@ -284,7 +284,7 @@ module Nack = struct let client ch sched addr port = let open Lwt_result_syntax in - let*! id2 = id2 in + let*! id2 in let* auth_fd = connect sched addr port id2 in let*! conn = P2p_socket.accept ~canceler auth_fd encoding in let* () = tzassert (is_rejected conn) __POS__ in @@ -309,7 +309,7 @@ module Nacked = struct let client ch sched addr port = let open Lwt_result_syntax in - let*! id2 = id2 in + let*! id2 in let* auth_fd = connect sched addr port id2 in let*! () = P2p_socket.nack auth_fd P2p_rejection.No_motive [] in sync ch @@ -342,7 +342,7 @@ module Simple_message = struct let client ch sched addr port = let open Lwt_result_syntax in - let*! id2 = id2 in + let*! id2 in let* auth_fd = connect sched addr port id2 in let* conn = P2p_socket.accept ~canceler auth_fd encoding in let* () = P2p_socket.write_sync conn simple_msg2 in @@ -382,7 +382,7 @@ module Chunked_message = struct let client ch sched addr port = let open Lwt_result_syntax in - let*! id2 = id2 in + let*! id2 in let* auth_fd = connect sched addr port id2 in let* conn = P2p_socket.accept ~canceler ~binary_chunks_size:21 auth_fd encoding @@ -426,7 +426,7 @@ module Oversized_message = struct let client ch sched addr port = let open Lwt_result_syntax in - let*! id2 = id2 in + let*! id2 in let* auth_fd = connect sched addr port id2 in let* conn = P2p_socket.accept ~canceler auth_fd encoding in let* () = P2p_socket.write_sync conn simple_msg2 in @@ -456,7 +456,7 @@ module Close_on_read = struct let client ch sched addr port = let open Lwt_result_syntax in - let*! id2 = id2 in + let*! id2 in let* auth_fd = connect sched addr port id2 in let* conn = P2p_socket.accept ~canceler auth_fd encoding in let* () = sync ch in @@ -487,7 +487,7 @@ module Close_on_write = struct let client ch sched addr port = let open Lwt_result_syntax in - let*! id2 = id2 in + let*! id2 in let* auth_fd = connect sched addr port id2 in let* conn = P2p_socket.accept ~canceler auth_fd encoding in let* () = sync ch in @@ -533,7 +533,7 @@ module Garbled_data = struct let client _ch sched addr port = let open Lwt_result_syntax in - let*! id2 = id2 in + let*! id2 in let* auth_fd = connect sched addr port id2 in let* conn = P2p_socket.accept ~canceler auth_fd encoding in let*! err = P2p_socket.read conn in diff --git a/src/lib_rpc_http/test/test_rpc_http.ml b/src/lib_rpc_http/test/test_rpc_http.ml index 9b8eb08b612a..cab7cf33dee1 100644 --- a/src/lib_rpc_http/test/test_rpc_http.ml +++ b/src/lib_rpc_http/test/test_rpc_http.ml @@ -85,7 +85,7 @@ module Generator = struct let open Gen in let rec add_to_policy policy n = if n > 0 then - let* acl = acl and* endpoint = addr_port_id in + let* acl and* endpoint = addr_port_id in add_to_policy (put_policy (endpoint, acl) policy) (n - 1) else pure policy in @@ -116,7 +116,7 @@ module Generator = struct let find_policy_setup : find_policy_setup Gen.t = let open Gen in let generate_entry = - let* endpoint = addr_port_id and* acl = acl in + let* endpoint = addr_port_id and* acl in pure (endpoint, acl) in let* p = policy diff --git a/src/lib_shell/bootstrap_pipeline.ml b/src/lib_shell/bootstrap_pipeline.ml index bf2dbc627fe9..8b5556d39d0a 100644 --- a/src/lib_shell/bootstrap_pipeline.ml +++ b/src/lib_shell/bootstrap_pipeline.ml @@ -486,7 +486,7 @@ let rec validation_worker_loop pipeline = Bootstrap_pipeline_event.(emit requesting_validation) (hash, pipeline.peer_id) in - let* operations = operations in + let* operations in let* () = protect ~canceler:pipeline.canceler (fun () -> let*! r = diff --git a/src/lib_shell/chain_validator.ml b/src/lib_shell/chain_validator.ml index c5c6ebff6869..bed566cfc6be 100644 --- a/src/lib_shell/chain_validator.ml +++ b/src/lib_shell/chain_validator.ml @@ -609,7 +609,7 @@ let on_disconnection w peer_id = match P2p_peer.Error_table.find nv.active_peers peer_id with | None -> return_unit | Some pv -> ( - let*! pv = pv in + let*! pv in match pv with | Ok pv -> let*! () = Peer_validator.shutdown pv in diff --git a/src/lib_stdlib/hash_queue.ml b/src/lib_stdlib/hash_queue.ml index 632d29defd0b..e9b85e91c4be 100644 --- a/src/lib_stdlib/hash_queue.ml +++ b/src/lib_stdlib/hash_queue.ml @@ -67,7 +67,7 @@ struct let open Lwt.Syntax in fold (fun k v acc -> - let* acc = acc in + let* acc in f k v acc) q (Lwt.return acc) diff --git a/src/lib_stdlib/test-unix/test_circular_buffer.ml b/src/lib_stdlib/test-unix/test_circular_buffer.ml index 3347a799d494..f315f9260cd5 100644 --- a/src/lib_stdlib/test-unix/test_circular_buffer.ml +++ b/src/lib_stdlib/test-unix/test_circular_buffer.ml @@ -112,7 +112,7 @@ module Constant = struct Array.iteri (fun i data -> ignore - (let* data = data in + (let* data in let _ = Buff.read data circular_buffer ~into:buff ~offset:0 in assert ( Bytes.sub buff 0 (Buff.length data) @@ -130,7 +130,7 @@ module Constant = struct Array.iter (fun (i, data) -> ignore - (let* data = data in + (let* data in let max_iter = 10 in let rec exhaust data offset iter = let length = Buff.length data in diff --git a/src/lib_time_measurement/.ocamlformat b/src/lib_time_measurement/.ocamlformat index 4d3778114a8a..23c9b63c9c32 100644 --- a/src/lib_time_measurement/.ocamlformat +++ b/src/lib_time_measurement/.ocamlformat @@ -1,5 +1,5 @@ version=0.21.0 -ocaml-version=4.12.1 +ocaml-version=4.14 wrap-fun-args=false let-binding-spacing=compact field-space=loose diff --git a/src/proto_015_PtLimaPt/lib_benchmark/michelson_samplers.ml b/src/proto_015_PtLimaPt/lib_benchmark/michelson_samplers.ml index ab56005225f5..bab546c70b03 100644 --- a/src/proto_015_PtLimaPt/lib_benchmark/michelson_samplers.ml +++ b/src/proto_015_PtLimaPt/lib_benchmark/michelson_samplers.ml @@ -536,7 +536,7 @@ end) fun arg_ty -> let open M in let* c = originated in - let* entrypoint = entrypoint in + let* entrypoint in let destination = Alpha_context.Destination.Contract (Originated c) in return (Typed_contract.Internal_for_tests.typed_exn @@ -551,7 +551,7 @@ end) fun arg_ty -> let open M in let* ru = sc_rollup in - let* entrypoint = entrypoint in + let* entrypoint in let destination = Alpha_context.Destination.Sc_rollup ru in return (Typed_contract.Internal_for_tests.typed_exn @@ -593,7 +593,7 @@ end) | Pair_t (Ticket_t _, Tx_rollup_l2_address_t, _, _) -> let* b = Base_samplers.uniform_bool in if b then - let* tx_rollup = tx_rollup in + let* tx_rollup in let destination = Alpha_context.Destination.Tx_rollup tx_rollup in let entrypoint = Alpha_context.Entrypoint.deposit in return diff --git a/src/proto_015_PtLimaPt/lib_delegate/baking_simulator.ml b/src/proto_015_PtLimaPt/lib_delegate/baking_simulator.ml index 957768d1b412..daf2ddde0376 100644 --- a/src/proto_015_PtLimaPt/lib_delegate/baking_simulator.ml +++ b/src/proto_015_PtLimaPt/lib_delegate/baking_simulator.ml @@ -126,7 +126,7 @@ let begin_construction ~timestamp ~protocol_data let ( let** ) x k = let open Lwt_result_syntax in - let*! x = x in + let*! x in let*? x = Environment.wrap_tzresult x in k x diff --git a/src/proto_015_PtLimaPt/lib_delegate/baking_vdf.ml b/src/proto_015_PtLimaPt/lib_delegate/baking_vdf.ml index 621daa8e4022..e8994dc556a5 100644 --- a/src/proto_015_PtLimaPt/lib_delegate/baking_vdf.ml +++ b/src/proto_015_PtLimaPt/lib_delegate/baking_vdf.ml @@ -86,7 +86,7 @@ let restart_block_stream cctxt chain state = let log_errors_and_continue ~name p = let open Lwt_syntax in - let* p = p in + let* p in match p with | Ok () -> return_unit | Error errs -> Events.(emit vdf_daemon_error) (name, errs) diff --git a/src/proto_015_PtLimaPt/lib_plugin/test/test_consensus_filter.ml b/src/proto_015_PtLimaPt/lib_plugin/test/test_consensus_filter.ml index a0f2521fc594..683864c0a492 100644 --- a/src/proto_015_PtLimaPt/lib_plugin/test/test_consensus_filter.ml +++ b/src/proto_015_PtLimaPt/lib_plugin/test/test_consensus_filter.ml @@ -53,11 +53,11 @@ module Generator = struct let of_result = Result.value_f ~default:(fun _ -> assert false) let small_nat_32 = - let+ small_nat = small_nat in + let+ small_nat in Int32.of_int small_nat let small_signed_32 = - let+ small_signed_int = small_signed_int in + let+ small_signed_int in Int32.of_int small_signed_int let dup gen = diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/unit/test_sc_rollup_game.ml b/src/proto_015_PtLimaPt/lib_protocol/test/unit/test_sc_rollup_game.ml index 6e828799992d..4fd48905cc83 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/unit/test_sc_rollup_game.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/unit/test_sc_rollup_game.ml @@ -300,7 +300,7 @@ let test_staker_injectivity () = once. *) let* _, _, defender, res = staker_injectivity_gen ~refuter2_plays:true in let open Lwt_syntax in - let* res = res in + let* res in Assert.proto_error ~loc:__LOC__ res diff --git a/src/proto_015_PtLimaPt/lib_tx_rollup/batcher.ml b/src/proto_015_PtLimaPt/lib_tx_rollup/batcher.ml index 4241399ae2f0..e74d0da5a721 100644 --- a/src/proto_015_PtLimaPt/lib_tx_rollup/batcher.ml +++ b/src/proto_015_PtLimaPt/lib_tx_rollup/batcher.ml @@ -347,7 +347,7 @@ let get_queue () = let handle_request_error rq = let open Lwt_syntax in - let* rq = rq in + let* rq in match rq with | Ok res -> return_ok res | Error (Worker.Request_error errs) -> Lwt.return_error errs diff --git a/src/proto_016_PtMumbai/lib_benchmark/michelson_samplers.ml b/src/proto_016_PtMumbai/lib_benchmark/michelson_samplers.ml index fafdce74e0c3..27a0d98ef9da 100644 --- a/src/proto_016_PtMumbai/lib_benchmark/michelson_samplers.ml +++ b/src/proto_016_PtMumbai/lib_benchmark/michelson_samplers.ml @@ -525,7 +525,7 @@ end) fun arg_ty -> let open M in let* c = originated in - let* entrypoint = entrypoint in + let* entrypoint in let destination = Alpha_context.Destination.Contract (Originated c) in return (Typed_contract.Internal_for_tests.typed_exn diff --git a/src/proto_016_PtMumbai/lib_benchmarks_proto/sc_rollup_benchmarks.ml b/src/proto_016_PtMumbai/lib_benchmarks_proto/sc_rollup_benchmarks.ml index dcd9b2d4cde1..105a38bd6ff4 100644 --- a/src/proto_016_PtMumbai/lib_benchmarks_proto/sc_rollup_benchmarks.ml +++ b/src/proto_016_PtMumbai/lib_benchmarks_proto/sc_rollup_benchmarks.ml @@ -154,7 +154,7 @@ module Pvm_state_generator = struct gen_tree (tree_depth - 1) (let rec kont' nb_subtrees acc_subtrees subtree = - let*! subtree = subtree in + let*! subtree in let acc_subtrees = subtree :: acc_subtrees in let nb_subtrees = nb_subtrees + 1 in if nb_subtrees = tree_branching_factor then diff --git a/src/proto_016_PtMumbai/lib_dal/RPC.ml b/src/proto_016_PtMumbai/lib_dal/RPC.ml index 78bc23de7a88..710b481452fb 100644 --- a/src/proto_016_PtMumbai/lib_dal/RPC.ml +++ b/src/proto_016_PtMumbai/lib_dal/RPC.ml @@ -173,7 +173,7 @@ module DAC = struct let open Dac_manager.Reveal_hash in let external_message = let open Option_syntax in - let* encoded_l1_message = encoded_l1_message in + let* encoded_l1_message in let* as_bytes = Hex.to_bytes @@ `Hex encoded_l1_message in External_message.of_bytes as_bytes in diff --git a/src/proto_016_PtMumbai/lib_delegate/baking_simulator.ml b/src/proto_016_PtMumbai/lib_delegate/baking_simulator.ml index 2d09542279ad..5ae61e3f47c9 100644 --- a/src/proto_016_PtMumbai/lib_delegate/baking_simulator.ml +++ b/src/proto_016_PtMumbai/lib_delegate/baking_simulator.ml @@ -131,7 +131,7 @@ let begin_construction ~timestamp ~protocol_data let ( let** ) x k = let open Lwt_result_syntax in - let*! x = x in + let*! x in let*? x = Environment.wrap_tzresult x in k x diff --git a/src/proto_016_PtMumbai/lib_delegate/baking_vdf.ml b/src/proto_016_PtMumbai/lib_delegate/baking_vdf.ml index 8d2caefb709b..6c948c31a4b3 100644 --- a/src/proto_016_PtMumbai/lib_delegate/baking_vdf.ml +++ b/src/proto_016_PtMumbai/lib_delegate/baking_vdf.ml @@ -86,7 +86,7 @@ let restart_block_stream cctxt chain state = let log_errors_and_continue ~name p = let open Lwt_syntax in - let* p = p in + let* p in match p with | Ok () -> return_unit | Error errs -> Events.(emit vdf_daemon_error) (name, errs) diff --git a/src/proto_016_PtMumbai/lib_plugin/test/test_consensus_filter.ml b/src/proto_016_PtMumbai/lib_plugin/test/test_consensus_filter.ml index a0f2521fc594..683864c0a492 100644 --- a/src/proto_016_PtMumbai/lib_plugin/test/test_consensus_filter.ml +++ b/src/proto_016_PtMumbai/lib_plugin/test/test_consensus_filter.ml @@ -53,11 +53,11 @@ module Generator = struct let of_result = Result.value_f ~default:(fun _ -> assert false) let small_nat_32 = - let+ small_nat = small_nat in + let+ small_nat in Int32.of_int small_nat let small_signed_32 = - let+ small_signed_int = small_signed_int in + let+ small_signed_int in Int32.of_int small_signed_int let dup gen = diff --git a/src/proto_016_PtMumbai/lib_protocol/test/unit/test_sc_rollup_inbox_legacy.ml b/src/proto_016_PtMumbai/lib_protocol/test/unit/test_sc_rollup_inbox_legacy.ml index 8c02831d36f1..62d5c006230c 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/unit/test_sc_rollup_inbox_legacy.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/unit/test_sc_rollup_inbox_legacy.ml @@ -417,7 +417,7 @@ let test_inclusion_proofs_depending_on_history_capacity in let proof s v = let open Lwt_result_syntax in - let*! v = v in + let*! v in match Environment.wrap_tzresult v with | Ok v -> return v | Error _ -> tzfail (err (s ^ ": Expecting some inclusion proof.")) diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_node/RPC_directory_helpers.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/RPC_directory_helpers.ml index 8f29f3dbe634..9e0cbc672586 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_node/RPC_directory_helpers.ml +++ b/src/proto_016_PtMumbai/lib_sc_rollup_node/RPC_directory_helpers.ml @@ -48,14 +48,14 @@ module Make_directory (S : PARAM) = struct let register0 service f = let open Lwt_result_syntax in register (Tezos_rpc.Service.subst0 service) @@ fun ctxt query input -> - let*? ctxt = ctxt in + let*? ctxt in f ctxt query input let register1 service f = let open Lwt_result_syntax in register (Tezos_rpc.Service.subst1 service) @@ fun (ctxt, arg) query input -> - let*? ctxt = ctxt in + let*? ctxt in f ctxt arg query input let build_directory node_ctxt = diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_node/batcher.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/batcher.ml index 71cbb62d919f..357a86dbf91f 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_node/batcher.ml +++ b/src/proto_016_PtMumbai/lib_sc_rollup_node/batcher.ml @@ -359,7 +359,7 @@ module Make (Simulation : Simulation.S) : S = struct let handle_request_error rq = let open Lwt_syntax in - let* rq = rq in + let* rq in match rq with | Ok res -> return_ok res | Error (Worker.Request_error errs) -> Lwt.return_error errs diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_node/commitment.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/commitment.ml index 69f46477f999..6b4376b72743 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_node/commitment.ml +++ b/src/proto_016_PtMumbai/lib_sc_rollup_node/commitment.ml @@ -47,7 +47,7 @@ open Alpha_context module Lwt_result_option_syntax = struct let ( let** ) a f = let open Lwt_result_syntax in - let* a = a in + let* a in match a with None -> return_none | Some a -> f a end @@ -55,7 +55,7 @@ module Lwt_result_option_list_syntax = struct (** A small monadic combinator to return an empty list on None results. *) let ( let*& ) x f = let open Lwt_result_syntax in - let* x = x in + let* x in match x with None -> return_nil | Some x -> f x end diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_node/inbox.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/inbox.ml index c1db7fda7d65..fc92ac73074d 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_node/inbox.ml +++ b/src/proto_016_PtMumbai/lib_sc_rollup_node/inbox.ml @@ -37,7 +37,7 @@ let get_messages Node_context.{l1_ctxt; _} head = let apply (type kind) accu ~source:_ (operation : kind manager_operation) _result = let open Result_syntax in - let+ accu = accu in + let+ accu in match operation with | Sc_rollup_add_messages {messages} -> let messages = @@ -53,7 +53,7 @@ let get_messages Node_context.{l1_ctxt; _} head = (result : kind Apply_internal_results.successful_internal_operation_result) = let open Result_syntax in - let* accu = accu in + let* accu in match (operation, result) with | ( { operation = Transaction {destination = Sc_rollup rollup; parameters; _}; diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_node/node_context.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/node_context.ml index 747057383c66..cef0e85c76a5 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_node/node_context.ml +++ b/src/proto_016_PtMumbai/lib_sc_rollup_node/node_context.ml @@ -228,7 +228,7 @@ let trace_lwt_result_with x = module Lwt_result_option_syntax = struct let ( let** ) a f = let open Lwt_result_syntax in - let* a = a in + let* a in match a with None -> return_none | Some a -> f a end diff --git a/src/proto_alpha/lib_benchmark/michelson_samplers.ml b/src/proto_alpha/lib_benchmark/michelson_samplers.ml index fafdce74e0c3..27a0d98ef9da 100644 --- a/src/proto_alpha/lib_benchmark/michelson_samplers.ml +++ b/src/proto_alpha/lib_benchmark/michelson_samplers.ml @@ -525,7 +525,7 @@ end) fun arg_ty -> let open M in let* c = originated in - let* entrypoint = entrypoint in + let* entrypoint in let destination = Alpha_context.Destination.Contract (Originated c) in return (Typed_contract.Internal_for_tests.typed_exn diff --git a/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml b/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml index da9692cbbf78..ff3fbbc74a69 100644 --- a/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml +++ b/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml @@ -154,7 +154,7 @@ module Pvm_state_generator = struct gen_tree (tree_depth - 1) (let rec kont' nb_subtrees acc_subtrees subtree = - let*! subtree = subtree in + let*! subtree in let acc_subtrees = subtree :: acc_subtrees in let nb_subtrees = nb_subtrees + 1 in if nb_subtrees = tree_branching_factor then diff --git a/src/proto_alpha/lib_dac/RPC.ml b/src/proto_alpha/lib_dac/RPC.ml index 60b79ceb1eec..3e242f73cf6f 100644 --- a/src/proto_alpha/lib_dac/RPC.ml +++ b/src/proto_alpha/lib_dac/RPC.ml @@ -154,7 +154,7 @@ module DAC = struct let open Dac_manager.Reveal_hash in let external_message = let open Option_syntax in - let* encoded_l1_message = encoded_l1_message in + let* encoded_l1_message in let* as_bytes = Hex.to_bytes @@ `Hex encoded_l1_message in External_message.of_bytes as_bytes in diff --git a/src/proto_alpha/lib_delegate/baking_simulator.ml b/src/proto_alpha/lib_delegate/baking_simulator.ml index 2d09542279ad..5ae61e3f47c9 100644 --- a/src/proto_alpha/lib_delegate/baking_simulator.ml +++ b/src/proto_alpha/lib_delegate/baking_simulator.ml @@ -131,7 +131,7 @@ let begin_construction ~timestamp ~protocol_data let ( let** ) x k = let open Lwt_result_syntax in - let*! x = x in + let*! x in let*? x = Environment.wrap_tzresult x in k x diff --git a/src/proto_alpha/lib_delegate/baking_vdf.ml b/src/proto_alpha/lib_delegate/baking_vdf.ml index b08fd5ebea7b..8b8d472abbdc 100644 --- a/src/proto_alpha/lib_delegate/baking_vdf.ml +++ b/src/proto_alpha/lib_delegate/baking_vdf.ml @@ -86,7 +86,7 @@ let restart_block_stream cctxt chain state = let log_errors_and_continue ~name p = let open Lwt_syntax in - let* p = p in + let* p in match p with | Ok () -> return_unit | Error errs -> Events.(emit vdf_daemon_error) (name, errs) diff --git a/src/proto_alpha/lib_plugin/test/test_consensus_filter.ml b/src/proto_alpha/lib_plugin/test/test_consensus_filter.ml index a0f2521fc594..683864c0a492 100644 --- a/src/proto_alpha/lib_plugin/test/test_consensus_filter.ml +++ b/src/proto_alpha/lib_plugin/test/test_consensus_filter.ml @@ -53,11 +53,11 @@ module Generator = struct let of_result = Result.value_f ~default:(fun _ -> assert false) let small_nat_32 = - let+ small_nat = small_nat in + let+ small_nat in Int32.of_int small_nat let small_signed_32 = - let+ small_signed_int = small_signed_int in + let+ small_signed_int in Int32.of_int small_signed_int let dup gen = diff --git a/src/proto_alpha/lib_protocol/delegate_consensus_key.ml b/src/proto_alpha/lib_protocol/delegate_consensus_key.ml index f981f386e287..853e220c62d3 100644 --- a/src/proto_alpha/lib_protocol/delegate_consensus_key.ml +++ b/src/proto_alpha/lib_protocol/delegate_consensus_key.ml @@ -219,7 +219,7 @@ let activate ctxt ~new_cycle = ~order:`Undefined ~init:(ok ctxt) ~f:(fun delegate ctxt -> - let*? ctxt = ctxt in + let*? ctxt in let delegate = Contract_repr.Implicit delegate in let* update = Storage.Contract.Pending_consensus_keys.find (ctxt, delegate) new_cycle diff --git a/src/proto_alpha/lib_protocol/skip_list_repr.ml b/src/proto_alpha/lib_protocol/skip_list_repr.ml index 17203bd1329f..928a4514f995 100644 --- a/src/proto_alpha/lib_protocol/skip_list_repr.ml +++ b/src/proto_alpha/lib_protocol/skip_list_repr.ml @@ -438,7 +438,7 @@ end) : S = struct let assume_some o f = let open Monad_syntax in - let* o = o in + let* o in match o with None -> return false | Some x -> f x let valid_back_path ~equal_ptr ~deref ~cell_ptr ~target_ptr path = diff --git a/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_inbox_legacy.ml b/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_inbox_legacy.ml index 1ecd4abbbd42..1c8a4f180afc 100644 --- a/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_inbox_legacy.ml +++ b/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_inbox_legacy.ml @@ -415,7 +415,7 @@ let test_inclusion_proofs_depending_on_history_capacity in let proof s v = let open Lwt_result_syntax in - let*! v = v in + let*! v in match Environment.wrap_tzresult v with | Ok v -> return v | Error _ -> tzfail (err (s ^ ": Expecting some inclusion proof.")) diff --git a/src/proto_alpha/lib_sc_rollup_node/RPC_directory_helpers.ml b/src/proto_alpha/lib_sc_rollup_node/RPC_directory_helpers.ml index 8f29f3dbe634..9e0cbc672586 100644 --- a/src/proto_alpha/lib_sc_rollup_node/RPC_directory_helpers.ml +++ b/src/proto_alpha/lib_sc_rollup_node/RPC_directory_helpers.ml @@ -48,14 +48,14 @@ module Make_directory (S : PARAM) = struct let register0 service f = let open Lwt_result_syntax in register (Tezos_rpc.Service.subst0 service) @@ fun ctxt query input -> - let*? ctxt = ctxt in + let*? ctxt in f ctxt query input let register1 service f = let open Lwt_result_syntax in register (Tezos_rpc.Service.subst1 service) @@ fun (ctxt, arg) query input -> - let*? ctxt = ctxt in + let*? ctxt in f ctxt arg query input let build_directory node_ctxt = diff --git a/src/proto_alpha/lib_sc_rollup_node/batcher.ml b/src/proto_alpha/lib_sc_rollup_node/batcher.ml index 0460e4733c5e..b1782893b7a0 100644 --- a/src/proto_alpha/lib_sc_rollup_node/batcher.ml +++ b/src/proto_alpha/lib_sc_rollup_node/batcher.ml @@ -359,7 +359,7 @@ module Make (Simulation : Simulation.S) : S = struct let handle_request_error rq = let open Lwt_syntax in - let* rq = rq in + let* rq in match rq with | Ok res -> return_ok res | Error (Worker.Request_error errs) -> Lwt.return_error errs diff --git a/src/proto_alpha/lib_sc_rollup_node/commitment.ml b/src/proto_alpha/lib_sc_rollup_node/commitment.ml index 69f46477f999..6b4376b72743 100644 --- a/src/proto_alpha/lib_sc_rollup_node/commitment.ml +++ b/src/proto_alpha/lib_sc_rollup_node/commitment.ml @@ -47,7 +47,7 @@ open Alpha_context module Lwt_result_option_syntax = struct let ( let** ) a f = let open Lwt_result_syntax in - let* a = a in + let* a in match a with None -> return_none | Some a -> f a end @@ -55,7 +55,7 @@ module Lwt_result_option_list_syntax = struct (** A small monadic combinator to return an empty list on None results. *) let ( let*& ) x f = let open Lwt_result_syntax in - let* x = x in + let* x in match x with None -> return_nil | Some x -> f x end diff --git a/src/proto_alpha/lib_sc_rollup_node/inbox.ml b/src/proto_alpha/lib_sc_rollup_node/inbox.ml index c1db7fda7d65..fc92ac73074d 100644 --- a/src/proto_alpha/lib_sc_rollup_node/inbox.ml +++ b/src/proto_alpha/lib_sc_rollup_node/inbox.ml @@ -37,7 +37,7 @@ let get_messages Node_context.{l1_ctxt; _} head = let apply (type kind) accu ~source:_ (operation : kind manager_operation) _result = let open Result_syntax in - let+ accu = accu in + let+ accu in match operation with | Sc_rollup_add_messages {messages} -> let messages = @@ -53,7 +53,7 @@ let get_messages Node_context.{l1_ctxt; _} head = (result : kind Apply_internal_results.successful_internal_operation_result) = let open Result_syntax in - let* accu = accu in + let* accu in match (operation, result) with | ( { operation = Transaction {destination = Sc_rollup rollup; parameters; _}; diff --git a/src/proto_alpha/lib_sc_rollup_node/node_context.ml b/src/proto_alpha/lib_sc_rollup_node/node_context.ml index 392634b3909e..503b529db742 100644 --- a/src/proto_alpha/lib_sc_rollup_node/node_context.ml +++ b/src/proto_alpha/lib_sc_rollup_node/node_context.ml @@ -228,7 +228,7 @@ let trace_lwt_result_with x = module Lwt_result_option_syntax = struct let ( let** ) a f = let open Lwt_result_syntax in - let* a = a in + let* a in match a with None -> return_none | Some a -> f a end diff --git a/tezt/tests/sc_rollup.ml b/tezt/tests/sc_rollup.ml index 3c78c4dc93f3..3d0a6e140be2 100644 --- a/tezt/tests/sc_rollup.ml +++ b/tezt/tests/sc_rollup.ml @@ -1426,8 +1426,8 @@ let mode_publish mode publishes protocol sc_rollup_node sc_rollup_client and state_hash_other = Sc_rollup_client.state_hash ~hooks sc_rollup_other_client in - let*! state_hash = state_hash in - let*! state_hash_other = state_hash_other in + let*! state_hash in + let*! state_hash_other in Check.((state_hash = state_hash_other) string) ~error_msg: "State hash of other rollup node is %R but the first rollup node has %L" ; -- GitLab From 036193f9ae1d96b11e48a6f45d63595f340735be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Wed, 1 Feb 2023 08:02:31 +0100 Subject: [PATCH 2/2] Manifest: set a default ocaml dependency for all targets --- manifest/main.ml | 8 ---- manifest/manifest.ml | 37 +++++++++++++------ opam/internal-devtools.opam | 1 + opam/octez-accuser-PtLimaPt.opam | 1 + opam/octez-accuser-PtMumbai.opam | 1 + opam/octez-accuser-alpha.opam | 1 + opam/octez-baker-PtLimaPt.opam | 1 + opam/octez-baker-PtMumbai.opam | 1 + opam/octez-baker-alpha.opam | 1 + opam/octez-client.opam | 1 + opam/octez-codec.opam | 1 + opam/octez-dac-node.opam | 1 + opam/octez-dal-node.opam | 1 + opam/octez-node-config.opam | 1 + opam/octez-node.opam | 1 + opam/octez-protocol-compiler.opam | 1 + opam/octez-proxy-server.opam | 1 + opam/octez-signer.opam | 1 + opam/octez-smart-rollup-client-PtMumbai.opam | 1 + opam/octez-smart-rollup-client-alpha.opam | 1 + opam/octez-smart-rollup-node-PtMumbai.opam | 1 + opam/octez-smart-rollup-node-alpha.opam | 1 + opam/octez-smart-rollup-wasm-debugger.opam | 1 + opam/octez-snoop.opam | 1 + opam/octez-tx-rollup-client-PtLimaPt.opam | 1 + opam/octez-tx-rollup-node-PtLimaPt.opam | 1 + opam/tezos-015-PtLimaPt-test-helpers.opam | 1 + opam/tezos-016-PtMumbai-test-helpers.opam | 1 + opam/tezos-alpha-test-helpers.opam | 1 + opam/tezos-baking-015-PtLimaPt-commands.opam | 1 + opam/tezos-baking-015-PtLimaPt.opam | 1 + opam/tezos-baking-016-PtMumbai-commands.opam | 1 + opam/tezos-baking-016-PtMumbai.opam | 1 + opam/tezos-baking-alpha-commands.opam | 1 + opam/tezos-baking-alpha.opam | 1 + opam/tezos-base-test-helpers.opam | 1 + opam/tezos-base.opam | 1 + opam/tezos-benchmark-015-PtLimaPt.opam | 1 + opam/tezos-benchmark-016-PtMumbai.opam | 1 + opam/tezos-benchmark-alpha.opam | 1 + opam/tezos-benchmark-examples.opam | 1 + opam/tezos-benchmark-tests.opam | 1 + ...benchmark-type-inference-015-PtLimaPt.opam | 1 + ...benchmark-type-inference-016-PtMumbai.opam | 1 + .../tezos-benchmark-type-inference-alpha.opam | 1 + opam/tezos-benchmark.opam | 1 + opam/tezos-benchmarks-proto-015-PtLimaPt.opam | 1 + opam/tezos-benchmarks-proto-016-PtMumbai.opam | 1 + opam/tezos-benchmarks-proto-alpha.opam | 1 + opam/tezos-clic.opam | 1 + opam/tezos-client-000-Ps9mPmXa.opam | 1 + opam/tezos-client-001-PtCJ7pwo.opam | 1 + opam/tezos-client-002-PsYLVpVv.opam | 1 + opam/tezos-client-003-PsddFKi3.opam | 1 + opam/tezos-client-004-Pt24m4xi.opam | 1 + opam/tezos-client-005-PsBabyM1.opam | 1 + opam/tezos-client-006-PsCARTHA.opam | 1 + opam/tezos-client-007-PsDELPH1.opam | 1 + opam/tezos-client-008-PtEdo2Zk.opam | 1 + opam/tezos-client-009-PsFLoren.opam | 1 + opam/tezos-client-010-PtGRANAD.opam | 1 + opam/tezos-client-011-PtHangz2.opam | 1 + opam/tezos-client-012-Psithaca.opam | 1 + opam/tezos-client-013-PtJakart.opam | 1 + opam/tezos-client-014-PtKathma.opam | 1 + opam/tezos-client-015-PtLimaPt.opam | 1 + opam/tezos-client-016-PtMumbai.opam | 1 + opam/tezos-client-alpha.opam | 1 + opam/tezos-client-base-unix.opam | 1 + opam/tezos-client-base.opam | 1 + opam/tezos-client-commands.opam | 1 + opam/tezos-client-demo-counter.opam | 1 + opam/tezos-client-genesis.opam | 1 + opam/tezos-context-ops.opam | 1 + opam/tezos-context.opam | 1 + opam/tezos-crypto-dal.opam | 1 + opam/tezos-crypto.opam | 1 + opam/tezos-dac-alpha.opam | 1 + opam/tezos-dac-node-lib.opam | 1 + opam/tezos-dal-016-PtMumbai.opam | 1 + opam/tezos-dal-alpha.opam | 1 + opam/tezos-dal-node-lib.opam | 1 + opam/tezos-dal-node-services.opam | 1 + .../tezos-embedded-protocol-000-Ps9mPmXa.opam | 1 + .../tezos-embedded-protocol-001-PtCJ7pwo.opam | 1 + .../tezos-embedded-protocol-002-PsYLVpVv.opam | 1 + .../tezos-embedded-protocol-003-PsddFKi3.opam | 1 + .../tezos-embedded-protocol-004-Pt24m4xi.opam | 1 + .../tezos-embedded-protocol-005-PsBABY5H.opam | 1 + .../tezos-embedded-protocol-005-PsBabyM1.opam | 1 + .../tezos-embedded-protocol-006-PsCARTHA.opam | 1 + .../tezos-embedded-protocol-007-PsDELPH1.opam | 1 + .../tezos-embedded-protocol-008-PtEdo2Zk.opam | 1 + .../tezos-embedded-protocol-008-PtEdoTez.opam | 1 + .../tezos-embedded-protocol-009-PsFLoren.opam | 1 + .../tezos-embedded-protocol-010-PtGRANAD.opam | 1 + .../tezos-embedded-protocol-011-PtHangz2.opam | 1 + .../tezos-embedded-protocol-012-Psithaca.opam | 1 + .../tezos-embedded-protocol-013-PtJakart.opam | 1 + .../tezos-embedded-protocol-014-PtKathma.opam | 1 + .../tezos-embedded-protocol-015-PtLimaPt.opam | 1 + .../tezos-embedded-protocol-016-PtMumbai.opam | 1 + opam/tezos-embedded-protocol-alpha.opam | 1 + .../tezos-embedded-protocol-demo-counter.opam | 1 + opam/tezos-embedded-protocol-demo-noops.opam | 1 + opam/tezos-embedded-protocol-genesis.opam | 1 + opam/tezos-error-monad.opam | 2 +- opam/tezos-event-logging-test-helpers.opam | 1 + opam/tezos-event-logging.opam | 1 + opam/tezos-expect-helper.opam | 1 + opam/tezos-injector-013-PtJakart.opam | 1 + opam/tezos-injector-014-PtKathma.opam | 1 + opam/tezos-injector-015-PtLimaPt.opam | 1 + opam/tezos-injector-016-PtMumbai.opam | 1 + opam/tezos-injector-alpha.opam | 1 + opam/tezos-layer2-store.opam | 1 + opam/tezos-layer2-utils-016-PtMumbai.opam | 1 + opam/tezos-layer2-utils-alpha.opam | 1 + opam/tezos-lazy-containers-tests.opam | 1 + opam/tezos-lwt-result-stdlib.opam | 2 +- opam/tezos-micheline-rewriting.opam | 1 + opam/tezos-micheline.opam | 1 + opam/tezos-mockup-commands.opam | 1 + opam/tezos-mockup-proxy.opam | 1 + opam/tezos-mockup-registration.opam | 1 + opam/tezos-mockup.opam | 1 + opam/tezos-openapi.opam | 1 + opam/tezos-p2p-services.opam | 1 + opam/tezos-p2p.opam | 1 + opam/tezos-protocol-000-Ps9mPmXa.opam | 1 + opam/tezos-protocol-001-PtCJ7pwo.opam | 1 + opam/tezos-protocol-002-PsYLVpVv.opam | 1 + opam/tezos-protocol-003-PsddFKi3.opam | 1 + opam/tezos-protocol-004-Pt24m4xi.opam | 1 + opam/tezos-protocol-005-PsBABY5H.opam | 1 + opam/tezos-protocol-005-PsBabyM1.opam | 1 + opam/tezos-protocol-006-PsCARTHA.opam | 1 + opam/tezos-protocol-007-PsDELPH1.opam | 1 + opam/tezos-protocol-008-PtEdo2Zk.opam | 1 + opam/tezos-protocol-008-PtEdoTez.opam | 1 + opam/tezos-protocol-009-PsFLoren.opam | 1 + opam/tezos-protocol-010-PtGRANAD.opam | 1 + opam/tezos-protocol-011-PtHangz2.opam | 1 + opam/tezos-protocol-012-Psithaca.opam | 1 + opam/tezos-protocol-013-PtJakart.opam | 1 + opam/tezos-protocol-014-PtKathma.opam | 1 + opam/tezos-protocol-015-PtLimaPt-tests.opam | 1 + opam/tezos-protocol-015-PtLimaPt.opam | 1 + opam/tezos-protocol-016-PtMumbai-tests.opam | 1 + opam/tezos-protocol-016-PtMumbai.opam | 1 + opam/tezos-protocol-alpha-tests.opam | 1 + opam/tezos-protocol-alpha.opam | 1 + opam/tezos-protocol-demo-counter.opam | 1 + opam/tezos-protocol-demo-noops.opam | 1 + opam/tezos-protocol-genesis.opam | 1 + ...otocol-plugin-007-PsDELPH1-registerer.opam | 1 + opam/tezos-protocol-plugin-007-PsDELPH1.opam | 1 + ...otocol-plugin-008-PtEdo2Zk-registerer.opam | 1 + opam/tezos-protocol-plugin-008-PtEdo2Zk.opam | 1 + ...otocol-plugin-009-PsFLoren-registerer.opam | 1 + opam/tezos-protocol-plugin-009-PsFLoren.opam | 1 + ...otocol-plugin-010-PtGRANAD-registerer.opam | 1 + opam/tezos-protocol-plugin-010-PtGRANAD.opam | 1 + ...otocol-plugin-011-PtHangz2-registerer.opam | 1 + opam/tezos-protocol-plugin-011-PtHangz2.opam | 1 + ...otocol-plugin-012-Psithaca-registerer.opam | 1 + opam/tezos-protocol-plugin-012-Psithaca.opam | 1 + ...otocol-plugin-013-PtJakart-registerer.opam | 1 + opam/tezos-protocol-plugin-013-PtJakart.opam | 1 + ...otocol-plugin-014-PtKathma-registerer.opam | 1 + opam/tezos-protocol-plugin-014-PtKathma.opam | 1 + ...otocol-plugin-015-PtLimaPt-registerer.opam | 1 + ...os-protocol-plugin-015-PtLimaPt-tests.opam | 1 + opam/tezos-protocol-plugin-015-PtLimaPt.opam | 1 + ...otocol-plugin-016-PtMumbai-registerer.opam | 1 + ...os-protocol-plugin-016-PtMumbai-tests.opam | 1 + opam/tezos-protocol-plugin-016-PtMumbai.opam | 1 + ...ezos-protocol-plugin-alpha-registerer.opam | 1 + opam/tezos-protocol-plugin-alpha-tests.opam | 1 + opam/tezos-protocol-plugin-alpha.opam | 1 + opam/tezos-protocol-updater.opam | 1 + opam/tezos-proxy-server-config.opam | 1 + opam/tezos-proxy.opam | 1 + opam/tezos-requester.opam | 1 + opam/tezos-rpc-http-client-unix.opam | 1 + opam/tezos-rpc-http-client.opam | 1 + opam/tezos-rpc-http-server.opam | 1 + opam/tezos-rpc-http.opam | 1 + opam/tezos-rpc.opam | 1 + opam/tezos-sapling.opam | 1 + opam/tezos-scoru-wasm-benchmark.opam | 1 + opam/tezos-scoru-wasm-fast-test.opam | 1 + opam/tezos-scoru-wasm-fast.opam | 1 + opam/tezos-scoru-wasm-helpers.opam | 1 + opam/tezos-scoru-wasm-test-helpers.opam | 1 + opam/tezos-scoru-wasm-test.opam | 1 + opam/tezos-scoru-wasm.opam | 1 + opam/tezos-shell-benchmarks.opam | 1 + opam/tezos-shell-context-test.opam | 1 + opam/tezos-shell-context.opam | 1 + opam/tezos-shell-services-test-helpers.opam | 1 + opam/tezos-shell-services.opam | 1 + opam/tezos-shell.opam | 1 + opam/tezos-signer-backends.opam | 1 + opam/tezos-signer-services.opam | 1 + opam/tezos-smart-rollup-016-PtMumbai.opam | 1 + opam/tezos-smart-rollup-alpha.opam | 1 + opam/tezos-stdlib-unix.opam | 1 + opam/tezos-store.opam | 1 + opam/tezos-test-helpers-extra.opam | 2 +- opam/tezos-test-helpers.opam | 2 +- opam/tezos-tooling.opam | 1 + opam/tezos-tps-evaluation.opam | 1 + opam/tezos-tree-encoding-test.opam | 1 + opam/tezos-tree-encoding.opam | 1 + opam/tezos-tx-rollup-015-PtLimaPt.opam | 1 + opam/tezos-validation.opam | 1 + opam/tezos-version.opam | 1 + opam/tezos-wasmer.opam | 1 + opam/tezos-webassembly-interpreter-extra.opam | 1 + opam/tezos-workers.opam | 1 + opam/tezt-performance-regression.opam | 1 + opam/tezt-self-tests.opam | 1 + opam/tezt-tezos.opam | 1 + 224 files changed, 248 insertions(+), 23 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 5a20e5c0ff4e..fdd29ac15071 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -397,7 +397,6 @@ let octez_test_helpers = ~deps: [uri; fmt; qcheck_alcotest; alcotest; lwt; pure_splitmix; data_encoding] ~js_compatible:true - ~ocaml:V.(at_least "4.12") ~linkall:true ~dune: Dune. @@ -438,7 +437,6 @@ let octez_stdlib = ~path:"src/lib_stdlib" ~synopsis:"Tezos: yet-another local-extension of the OCaml standard library" ~deps:[hex; zarith; zarith_stubs_js; lwt; aches] - ~ocaml:V.(at_least "4.14") ~js_compatible:true ~js_of_ocaml: [[S "javascript_files"; G (Dune.of_atom_list ["tzBytes_js.js"])]] @@ -562,7 +560,6 @@ let octez_lwt_result_stdlib = "tezos-lwt-result-stdlib" ~path:"src/lib_lwt_result_stdlib" ~synopsis:"Tezos: error-aware stdlib replacement" - ~ocaml:V.(at_least "4.12") ~js_compatible:true ~documentation:[Dune.[S "package"; S "tezos-lwt-result-stdlib"]] ~deps: @@ -620,7 +617,6 @@ let octez_error_monad = "tezos-error-monad" ~path:"src/lib_error_monad" ~synopsis:"Tezos: error monad" - ~ocaml:V.(at_least "4.07") ~deps: [ octez_stdlib |> open_; @@ -640,7 +636,6 @@ let octez_hacl = "tezos-hacl" ~path:"src/lib_hacl" ~synopsis:"Tezos: thin layer around hacl-star" - ~ocaml:V.(at_least "4.14") ~deps:[hacl_star; hacl_star_raw; ctypes_stubs_js] ~js_of_ocaml: [ @@ -1177,7 +1172,6 @@ let lazy_containers = ~synopsis: "A collection of lazy containers whose contents is fetched from \ arbitrary backend on-demand" - ~ocaml:V.(at_least "4.14") ~deps:[octez_lwt_result_stdlib; zarith] let _lazy_containers_tests = @@ -1218,7 +1212,6 @@ let octez_webassembly_interpreter = ~extra_authors:["WebAssembly Authors"] ~synopsis:"WebAssembly reference interpreter with tweaks for Tezos" ~dune:Dune.[[S "include_subdirs"; S "unqualified"]] - ~ocaml:V.(at_least "4.14") ~deps:[octez_lwt_result_stdlib; zarith; lazy_containers |> open_] ~preprocess:[pps ppx_deriving_show] @@ -1399,7 +1392,6 @@ let octez_test_helpers_extra = ~internal_name:"lib_test_extra" ~synopsis:"Test helpers dependent on tezos-base" ~deps:[octez_base; octez_crypto; octez_test_helpers] - ~ocaml:V.(at_least "4.08") ~dune: Dune. [ diff --git a/manifest/manifest.ml b/manifest/manifest.ml index 70c6086ddc05..a0133835958e 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -939,6 +939,12 @@ end (* TARGETS *) (*****************************************************************************) +let default_ocaml_dependency = + (* ocamlformat is set to produce code compatible with this version; thus, the + code may contain syntactic constructs which are not available beforehand; + e.g., let-punning in binding-operator *) + Version.at_least "4.14" + module Target = struct let invalid_argf x = Printf.ksprintf invalid_arg x @@ -1014,7 +1020,7 @@ module Target = struct modes : Dune.mode list option; modules : modules; modules_without_implementation : string list; - ocaml : Version.constraints option; + ocaml : Version.constraints; opam : string option; opam_bug_reports : string option; opam_doc : string option; @@ -1263,14 +1269,14 @@ module Target = struct ?(dep_globs_rec = []) ?(deps = []) ?(dune = Dune.[]) ?flags ?foreign_stubs ?ctypes ?implements ?inline_tests ?js_compatible ?js_of_ocaml ?documentation ?(linkall = false) ?modes ?modules - ?(modules_without_implementation = []) ?(npm_deps = []) ?ocaml ?opam - ?opam_bug_reports ?opam_doc ?opam_homepage ?(opam_with_test = Always) - ?(optional = false) ?(preprocess = []) ?(preprocessor_deps = []) - ?(private_modules = []) ?profile ?(opam_only_deps = []) - ?(release_status = Auto_opam) ?static ?synopsis ?description - ?(time_measurement_ppx = false) ?(virtual_modules = []) - ?default_implementation ?(cram = false) ?license ?(extra_authors = []) - ~path names = + ?(modules_without_implementation = []) ?(npm_deps = []) + ?(ocaml = default_ocaml_dependency) ?opam ?opam_bug_reports ?opam_doc + ?opam_homepage ?(opam_with_test = Always) ?(optional = false) + ?(preprocess = []) ?(preprocessor_deps = []) ?(private_modules = []) + ?profile ?(opam_only_deps = []) ?(release_status = Auto_opam) ?static + ?synopsis ?description ?(time_measurement_ppx = false) + ?(virtual_modules = []) ?default_implementation ?(cram = false) ?license + ?(extra_authors = []) ~path names = let conflicts = List.filter_map Fun.id conflicts in let deps = List.filter_map Fun.id deps in let opam_only_deps = List.filter_map Fun.id opam_only_deps in @@ -2474,10 +2480,19 @@ let generate_opam ?release for_package (internals : Target.internal list) : let depends = match List.filter_map - (fun (internal : Target.internal) -> internal.ocaml) + (fun (internal : Target.internal) -> + if internal.ocaml == default_ocaml_dependency then None + else Some internal.ocaml) internals with - | [] -> depends + | [] -> + { + Opam.package = "ocaml"; + version = default_ocaml_dependency; + with_test = Never; + optional = false; + } + :: depends | versions -> { Opam.package = "ocaml"; diff --git a/opam/internal-devtools.opam b/opam/internal-devtools.opam index fa35a8033d93..bbfbfcbae98d 100644 --- a/opam/internal-devtools.opam +++ b/opam/internal-devtools.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "num" "re" { >= "1.9.0" } "octez-protocol-compiler" diff --git a/opam/octez-accuser-PtLimaPt.opam b/opam/octez-accuser-PtLimaPt.opam index 253a77d4c4a2..e772fd499fea 100644 --- a/opam/octez-accuser-PtLimaPt.opam +++ b/opam/octez-accuser-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-protocol-015-PtLimaPt" diff --git a/opam/octez-accuser-PtMumbai.opam b/opam/octez-accuser-PtMumbai.opam index 7cdfbaa8e141..5cc6f6bcb3ea 100644 --- a/opam/octez-accuser-PtMumbai.opam +++ b/opam/octez-accuser-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-protocol-016-PtMumbai" diff --git a/opam/octez-accuser-alpha.opam b/opam/octez-accuser-alpha.opam index 06a64fa0510e..1287560e77ba 100644 --- a/opam/octez-accuser-alpha.opam +++ b/opam/octez-accuser-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-protocol-alpha" diff --git a/opam/octez-baker-PtLimaPt.opam b/opam/octez-baker-PtLimaPt.opam index 2ebf82653bad..97f75ab79bb1 100644 --- a/opam/octez-baker-PtLimaPt.opam +++ b/opam/octez-baker-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-protocol-015-PtLimaPt" diff --git a/opam/octez-baker-PtMumbai.opam b/opam/octez-baker-PtMumbai.opam index 28c68beb5374..a28919ebb272 100644 --- a/opam/octez-baker-PtMumbai.opam +++ b/opam/octez-baker-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-protocol-016-PtMumbai" diff --git a/opam/octez-baker-alpha.opam b/opam/octez-baker-alpha.opam index 4075a4e0a078..758737cb5af8 100644 --- a/opam/octez-baker-alpha.opam +++ b/opam/octez-baker-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-protocol-alpha" diff --git a/opam/octez-client.opam b/opam/octez-client.opam index b65f24045f90..a8592e2f90ea 100644 --- a/opam/octez-client.opam +++ b/opam/octez-client.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-rpc-http-client" diff --git a/opam/octez-codec.opam b/opam/octez-codec.opam index 0a51bfe32443..2ac24acb68f0 100644 --- a/opam/octez-codec.opam +++ b/opam/octez-codec.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "data-encoding" { >= "0.7.1" & < "1.0.0" } "tezos-base" "tezos-client-base-unix" diff --git a/opam/octez-dac-node.opam b/opam/octez-dac-node.opam index a27cf50fb14f..09815b5c0fe9 100644 --- a/opam/octez-dac-node.opam +++ b/opam/octez-dac-node.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-client-base" diff --git a/opam/octez-dal-node.opam b/opam/octez-dal-node.opam index 726ae6a440c6..a5ad7d454198 100644 --- a/opam/octez-dal-node.opam +++ b/opam/octez-dal-node.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-client-base" diff --git a/opam/octez-node-config.opam b/opam/octez-node-config.opam index 09667a51908a..48a3e6a157c9 100644 --- a/opam/octez-node-config.opam +++ b/opam/octez-node-config.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib-unix" "tezos-shell-services" diff --git a/opam/octez-node.opam b/opam/octez-node.opam index 5318c9e40aa7..895a18ee1c05 100644 --- a/opam/octez-node.opam +++ b/opam/octez-node.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-version" "octez-node-config" diff --git a/opam/octez-protocol-compiler.opam b/opam/octez-protocol-compiler.opam index 8aedf5d6dba4..d8d78bf81482 100644 --- a/opam/octez-protocol-compiler.opam +++ b/opam/octez-protocol-compiler.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-environment" "tezos-version" diff --git a/opam/octez-proxy-server.opam b/opam/octez-proxy-server.opam index 1080aeac1209..39804ccb04b6 100644 --- a/opam/octez-proxy-server.opam +++ b/opam/octez-proxy-server.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib-unix" "tezos-rpc" diff --git a/opam/octez-signer.opam b/opam/octez-signer.opam index 0a7ddcc5c1b9..e3374c24ea9a 100644 --- a/opam/octez-signer.opam +++ b/opam/octez-signer.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-client-base" diff --git a/opam/octez-smart-rollup-client-PtMumbai.opam b/opam/octez-smart-rollup-client-PtMumbai.opam index 1c0092320610..b7cb605e0dd0 100644 --- a/opam/octez-smart-rollup-client-PtMumbai.opam +++ b/opam/octez-smart-rollup-client-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-016-PtMumbai" "tezos-client-commands" diff --git a/opam/octez-smart-rollup-client-alpha.opam b/opam/octez-smart-rollup-client-alpha.opam index d7ab22730122..ae34ea100e43 100644 --- a/opam/octez-smart-rollup-client-alpha.opam +++ b/opam/octez-smart-rollup-client-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-alpha" "tezos-client-commands" diff --git a/opam/octez-smart-rollup-node-PtMumbai.opam b/opam/octez-smart-rollup-node-PtMumbai.opam index 1c67e3d577ea..47909392d921 100644 --- a/opam/octez-smart-rollup-node-PtMumbai.opam +++ b/opam/octez-smart-rollup-node-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib-unix" "tezos-client-base" diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam index 12f4606428b9..4802737892e2 100644 --- a/opam/octez-smart-rollup-node-alpha.opam +++ b/opam/octez-smart-rollup-node-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib-unix" "tezos-client-base" diff --git a/opam/octez-smart-rollup-wasm-debugger.opam b/opam/octez-smart-rollup-wasm-debugger.opam index 859c997c30a6..329670a563b3 100644 --- a/opam/octez-smart-rollup-wasm-debugger.opam +++ b/opam/octez-smart-rollup-wasm-debugger.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-tree-encoding" diff --git a/opam/octez-snoop.opam b/opam/octez-snoop.opam index fe5c9d5aa518..fc303f43035f 100644 --- a/opam/octez-snoop.opam +++ b/opam/octez-snoop.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib-unix" "tezos-clic" diff --git a/opam/octez-tx-rollup-client-PtLimaPt.opam b/opam/octez-tx-rollup-client-PtLimaPt.opam index 444b1044de69..a311a1ade58a 100644 --- a/opam/octez-tx-rollup-client-PtLimaPt.opam +++ b/opam/octez-tx-rollup-client-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-protocol-015-PtLimaPt" diff --git a/opam/octez-tx-rollup-node-PtLimaPt.opam b/opam/octez-tx-rollup-node-PtLimaPt.opam index 48ad9ecf7c8d..f2d0cc84dc8f 100644 --- a/opam/octez-tx-rollup-node-PtLimaPt.opam +++ b/opam/octez-tx-rollup-node-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-protocol-015-PtLimaPt" diff --git a/opam/tezos-015-PtLimaPt-test-helpers.opam b/opam/tezos-015-PtLimaPt-test-helpers.opam index f186ddd233ca..d315039c5bca 100644 --- a/opam/tezos-015-PtLimaPt-test-helpers.opam +++ b/opam/tezos-015-PtLimaPt-test-helpers.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "alcotest-lwt" { >= "1.5.0" } "qcheck-alcotest" { >= "0.20" } "tezos-test-helpers" diff --git a/opam/tezos-016-PtMumbai-test-helpers.opam b/opam/tezos-016-PtMumbai-test-helpers.opam index f6055f077785..6f1f1d6cb1f2 100644 --- a/opam/tezos-016-PtMumbai-test-helpers.opam +++ b/opam/tezos-016-PtMumbai-test-helpers.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "alcotest-lwt" { >= "1.5.0" } "qcheck-alcotest" { >= "0.20" } "tezos-test-helpers" diff --git a/opam/tezos-alpha-test-helpers.opam b/opam/tezos-alpha-test-helpers.opam index d9a83f6ff729..28b43b89b5b8 100644 --- a/opam/tezos-alpha-test-helpers.opam +++ b/opam/tezos-alpha-test-helpers.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "alcotest-lwt" { >= "1.5.0" } "qcheck-alcotest" { >= "0.20" } "tezos-test-helpers" diff --git a/opam/tezos-baking-015-PtLimaPt-commands.opam b/opam/tezos-baking-015-PtLimaPt-commands.opam index 791d3bd31cd2..1544e16301f0 100644 --- a/opam/tezos-baking-015-PtLimaPt-commands.opam +++ b/opam/tezos-baking-015-PtLimaPt-commands.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-015-PtLimaPt" "tezos-stdlib-unix" diff --git a/opam/tezos-baking-015-PtLimaPt.opam b/opam/tezos-baking-015-PtLimaPt.opam index c5091fd1f7a2..4a3fa3bfcbc6 100644 --- a/opam/tezos-baking-015-PtLimaPt.opam +++ b/opam/tezos-baking-015-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-version" diff --git a/opam/tezos-baking-016-PtMumbai-commands.opam b/opam/tezos-baking-016-PtMumbai-commands.opam index 24be5de660bb..2ac37cc84411 100644 --- a/opam/tezos-baking-016-PtMumbai-commands.opam +++ b/opam/tezos-baking-016-PtMumbai-commands.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-016-PtMumbai" "tezos-stdlib-unix" diff --git a/opam/tezos-baking-016-PtMumbai.opam b/opam/tezos-baking-016-PtMumbai.opam index aa5b756eddf1..dab9b35f645d 100644 --- a/opam/tezos-baking-016-PtMumbai.opam +++ b/opam/tezos-baking-016-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-version" diff --git a/opam/tezos-baking-alpha-commands.opam b/opam/tezos-baking-alpha-commands.opam index 313fda468735..e8bef8b44d49 100644 --- a/opam/tezos-baking-alpha-commands.opam +++ b/opam/tezos-baking-alpha-commands.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-alpha" "tezos-stdlib-unix" diff --git a/opam/tezos-baking-alpha.opam b/opam/tezos-baking-alpha.opam index e3a7180be384..27607140bd14 100644 --- a/opam/tezos-baking-alpha.opam +++ b/opam/tezos-baking-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-version" diff --git a/opam/tezos-base-test-helpers.opam b/opam/tezos-base-test-helpers.opam index 025b88546842..b90aaa1d71d2 100644 --- a/opam/tezos-base-test-helpers.opam +++ b/opam/tezos-base-test-helpers.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib-unix" "tezos-event-logging-test-helpers" diff --git a/opam/tezos-base.opam b/opam/tezos-base.opam index ab4331423de7..ccae4c4d6f5a 100644 --- a/opam/tezos-base.opam +++ b/opam/tezos-base.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "tezos-crypto" "data-encoding" { >= "0.7.1" & < "1.0.0" } diff --git a/opam/tezos-benchmark-015-PtLimaPt.opam b/opam/tezos-benchmark-015-PtLimaPt.opam index 25109ff15475..959d70ae835f 100644 --- a/opam/tezos-benchmark-015-PtLimaPt.opam +++ b/opam/tezos-benchmark-015-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-benchmark-016-PtMumbai.opam b/opam/tezos-benchmark-016-PtMumbai.opam index beb5feef20f8..17b07e911ef5 100644 --- a/opam/tezos-benchmark-016-PtMumbai.opam +++ b/opam/tezos-benchmark-016-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-benchmark-alpha.opam b/opam/tezos-benchmark-alpha.opam index eb7509433889..3265c987a4d7 100644 --- a/opam/tezos-benchmark-alpha.opam +++ b/opam/tezos-benchmark-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-benchmark-examples.opam b/opam/tezos-benchmark-examples.opam index 5253f718f254..45ede119849c 100644 --- a/opam/tezos-benchmark-examples.opam +++ b/opam/tezos-benchmark-examples.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib-unix" "tezos-crypto" diff --git a/opam/tezos-benchmark-tests.opam b/opam/tezos-benchmark-tests.opam index 759611935b18..d542840b3295 100644 --- a/opam/tezos-benchmark-tests.opam +++ b/opam/tezos-benchmark-tests.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "alcotest-lwt" { with-test & >= "1.5.0" } "tezos-base" {with-test} "tezos-stdlib-unix" {with-test} diff --git a/opam/tezos-benchmark-type-inference-015-PtLimaPt.opam b/opam/tezos-benchmark-type-inference-015-PtLimaPt.opam index 3c3e2f5d9ffd..8b52d7d2a28f 100644 --- a/opam/tezos-benchmark-type-inference-015-PtLimaPt.opam +++ b/opam/tezos-benchmark-type-inference-015-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "tezos-error-monad" "tezos-crypto" diff --git a/opam/tezos-benchmark-type-inference-016-PtMumbai.opam b/opam/tezos-benchmark-type-inference-016-PtMumbai.opam index bba0545f9e9c..7a7ba310d590 100644 --- a/opam/tezos-benchmark-type-inference-016-PtMumbai.opam +++ b/opam/tezos-benchmark-type-inference-016-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "tezos-error-monad" "tezos-crypto" diff --git a/opam/tezos-benchmark-type-inference-alpha.opam b/opam/tezos-benchmark-type-inference-alpha.opam index 5a9178e5abc0..d1032c791999 100644 --- a/opam/tezos-benchmark-type-inference-alpha.opam +++ b/opam/tezos-benchmark-type-inference-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "tezos-error-monad" "tezos-crypto" diff --git a/opam/tezos-benchmark.opam b/opam/tezos-benchmark.opam index dcc203a4f8f6..a3c55eda28d8 100644 --- a/opam/tezos-benchmark.opam +++ b/opam/tezos-benchmark.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-stdlib-unix" diff --git a/opam/tezos-benchmarks-proto-015-PtLimaPt.opam b/opam/tezos-benchmarks-proto-015-PtLimaPt.opam index de8e5e495d8e..81e9786f7b39 100644 --- a/opam/tezos-benchmarks-proto-015-PtLimaPt.opam +++ b/opam/tezos-benchmarks-proto-015-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-benchmarks-proto-016-PtMumbai.opam b/opam/tezos-benchmarks-proto-016-PtMumbai.opam index 3de7e1abbaf7..0fdc37e64aee 100644 --- a/opam/tezos-benchmarks-proto-016-PtMumbai.opam +++ b/opam/tezos-benchmarks-proto-016-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-benchmarks-proto-alpha.opam b/opam/tezos-benchmarks-proto-alpha.opam index c02e66d5bfe7..b514fbd75814 100644 --- a/opam/tezos-benchmarks-proto-alpha.opam +++ b/opam/tezos-benchmarks-proto-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-clic.opam b/opam/tezos-clic.opam index f6b7e6c5414b..b5132eac27cb 100644 --- a/opam/tezos-clic.opam +++ b/opam/tezos-clic.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "lwt" { >= "5.6.0" } "re" { >= "1.9.0" } diff --git a/opam/tezos-client-000-Ps9mPmXa.opam b/opam/tezos-client-000-Ps9mPmXa.opam index 6ef211d18daa..9e674739be9b 100644 --- a/opam/tezos-client-000-Ps9mPmXa.opam +++ b/opam/tezos-client-000-Ps9mPmXa.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-shell-services" diff --git a/opam/tezos-client-001-PtCJ7pwo.opam b/opam/tezos-client-001-PtCJ7pwo.opam index 673fc7745436..c2da38a1d003 100644 --- a/opam/tezos-client-001-PtCJ7pwo.opam +++ b/opam/tezos-client-001-PtCJ7pwo.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-shell-services" diff --git a/opam/tezos-client-002-PsYLVpVv.opam b/opam/tezos-client-002-PsYLVpVv.opam index be463951882a..cd13e5891cc2 100644 --- a/opam/tezos-client-002-PsYLVpVv.opam +++ b/opam/tezos-client-002-PsYLVpVv.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-shell-services" diff --git a/opam/tezos-client-003-PsddFKi3.opam b/opam/tezos-client-003-PsddFKi3.opam index 275623afb9bb..695d86deb350 100644 --- a/opam/tezos-client-003-PsddFKi3.opam +++ b/opam/tezos-client-003-PsddFKi3.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-shell-services" diff --git a/opam/tezos-client-004-Pt24m4xi.opam b/opam/tezos-client-004-Pt24m4xi.opam index a350413f0b64..eed3ad4aee13 100644 --- a/opam/tezos-client-004-Pt24m4xi.opam +++ b/opam/tezos-client-004-Pt24m4xi.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-shell-services" diff --git a/opam/tezos-client-005-PsBabyM1.opam b/opam/tezos-client-005-PsBabyM1.opam index ab3f20f060c8..c2ab6573a647 100644 --- a/opam/tezos-client-005-PsBabyM1.opam +++ b/opam/tezos-client-005-PsBabyM1.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-shell-services" diff --git a/opam/tezos-client-006-PsCARTHA.opam b/opam/tezos-client-006-PsCARTHA.opam index c8af095fa201..45235fc2d0a4 100644 --- a/opam/tezos-client-006-PsCARTHA.opam +++ b/opam/tezos-client-006-PsCARTHA.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-shell-services" diff --git a/opam/tezos-client-007-PsDELPH1.opam b/opam/tezos-client-007-PsDELPH1.opam index e7219ce951ce..7bac04368266 100644 --- a/opam/tezos-client-007-PsDELPH1.opam +++ b/opam/tezos-client-007-PsDELPH1.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-shell-services" diff --git a/opam/tezos-client-008-PtEdo2Zk.opam b/opam/tezos-client-008-PtEdo2Zk.opam index af8b0df7a24e..a585686fb45e 100644 --- a/opam/tezos-client-008-PtEdo2Zk.opam +++ b/opam/tezos-client-008-PtEdo2Zk.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-shell-services" diff --git a/opam/tezos-client-009-PsFLoren.opam b/opam/tezos-client-009-PsFLoren.opam index a85b3757f286..0e939920859e 100644 --- a/opam/tezos-client-009-PsFLoren.opam +++ b/opam/tezos-client-009-PsFLoren.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-clic" diff --git a/opam/tezos-client-010-PtGRANAD.opam b/opam/tezos-client-010-PtGRANAD.opam index 75cc5f91b6ef..1af66b2cffce 100644 --- a/opam/tezos-client-010-PtGRANAD.opam +++ b/opam/tezos-client-010-PtGRANAD.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-clic" diff --git a/opam/tezos-client-011-PtHangz2.opam b/opam/tezos-client-011-PtHangz2.opam index ac738c5963f8..3aaa1c23698c 100644 --- a/opam/tezos-client-011-PtHangz2.opam +++ b/opam/tezos-client-011-PtHangz2.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-clic" diff --git a/opam/tezos-client-012-Psithaca.opam b/opam/tezos-client-012-Psithaca.opam index 49b54f2a9b6c..dce186e88440 100644 --- a/opam/tezos-client-012-Psithaca.opam +++ b/opam/tezos-client-012-Psithaca.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-clic" diff --git a/opam/tezos-client-013-PtJakart.opam b/opam/tezos-client-013-PtJakart.opam index 9fc7e4500c3b..3767857e3bbe 100644 --- a/opam/tezos-client-013-PtJakart.opam +++ b/opam/tezos-client-013-PtJakart.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-clic" diff --git a/opam/tezos-client-014-PtKathma.opam b/opam/tezos-client-014-PtKathma.opam index 5534493687b2..2509797daba7 100644 --- a/opam/tezos-client-014-PtKathma.opam +++ b/opam/tezos-client-014-PtKathma.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-clic" diff --git a/opam/tezos-client-015-PtLimaPt.opam b/opam/tezos-client-015-PtLimaPt.opam index 98ea6d57911e..fda28d1432e2 100644 --- a/opam/tezos-client-015-PtLimaPt.opam +++ b/opam/tezos-client-015-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-clic" diff --git a/opam/tezos-client-016-PtMumbai.opam b/opam/tezos-client-016-PtMumbai.opam index 93dd4d0f7185..29d14308f6f9 100644 --- a/opam/tezos-client-016-PtMumbai.opam +++ b/opam/tezos-client-016-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-clic" diff --git a/opam/tezos-client-alpha.opam b/opam/tezos-client-alpha.opam index 16301d4b022b..9f16140f182b 100644 --- a/opam/tezos-client-alpha.opam +++ b/opam/tezos-client-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-clic" diff --git a/opam/tezos-client-base-unix.opam b/opam/tezos-client-base-unix.opam index f0745281cc15..f7bed0a8480a 100644 --- a/opam/tezos-client-base-unix.opam +++ b/opam/tezos-client-base-unix.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-rpc" diff --git a/opam/tezos-client-base.opam b/opam/tezos-client-base.opam index b6820424a9eb..4601644e9de4 100644 --- a/opam/tezos-client-base.opam +++ b/opam/tezos-client-base.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-rpc" diff --git a/opam/tezos-client-commands.opam b/opam/tezos-client-commands.opam index 80c2a9db7c46..b458c09745b4 100644 --- a/opam/tezos-client-commands.opam +++ b/opam/tezos-client-commands.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-rpc" "tezos-clic" diff --git a/opam/tezos-client-demo-counter.opam b/opam/tezos-client-demo-counter.opam index 8dae6761e709..952e36b34674 100644 --- a/opam/tezos-client-demo-counter.opam +++ b/opam/tezos-client-demo-counter.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client-genesis.opam b/opam/tezos-client-genesis.opam index 22376ba2f79f..923ca9883693 100644 --- a/opam/tezos-client-genesis.opam +++ b/opam/tezos-client-genesis.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-context-ops.opam b/opam/tezos-context-ops.opam index a40ff4c75468..262d212ef07f 100644 --- a/opam/tezos-context-ops.opam +++ b/opam/tezos-context-ops.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-error-monad" "tezos-protocol-environment" diff --git a/opam/tezos-context.opam b/opam/tezos-context.opam index 74f30a52784a..6dabdc3a8733 100644 --- a/opam/tezos-context.opam +++ b/opam/tezos-context.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib" "irmin" { >= "3.5.1" & < "3.6.0" } diff --git a/opam/tezos-crypto-dal.opam b/opam/tezos-crypto-dal.opam index dbd75e840726..9f846efb25a8 100644 --- a/opam/tezos-crypto-dal.opam +++ b/opam/tezos-crypto-dal.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "tezos-error-monad" "data-encoding" { >= "0.7.1" & < "1.0.0" } diff --git a/opam/tezos-crypto.opam b/opam/tezos-crypto.opam index 371299374881..360fd0602f81 100644 --- a/opam/tezos-crypto.opam +++ b/opam/tezos-crypto.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "data-encoding" { >= "0.7.1" & < "1.0.0" } "tezos-lwt-result-stdlib" diff --git a/opam/tezos-dac-alpha.opam b/opam/tezos-dac-alpha.opam index fe14601262bd..d3dff693e506 100644 --- a/opam/tezos-dac-alpha.opam +++ b/opam/tezos-dac-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "octez-protocol-compiler" diff --git a/opam/tezos-dac-node-lib.opam b/opam/tezos-dac-node-lib.opam index b838c8195f15..34938fcacd8e 100644 --- a/opam/tezos-dac-node-lib.opam +++ b/opam/tezos-dac-node-lib.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-client-base" "tezos-protocol-updater" diff --git a/opam/tezos-dal-016-PtMumbai.opam b/opam/tezos-dal-016-PtMumbai.opam index 4077d74792f3..24e56628f6b6 100644 --- a/opam/tezos-dal-016-PtMumbai.opam +++ b/opam/tezos-dal-016-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "octez-protocol-compiler" diff --git a/opam/tezos-dal-alpha.opam b/opam/tezos-dal-alpha.opam index 8f7faa4f73b6..054b02ffe0c5 100644 --- a/opam/tezos-dal-alpha.opam +++ b/opam/tezos-dal-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "octez-protocol-compiler" diff --git a/opam/tezos-dal-node-lib.opam b/opam/tezos-dal-node-lib.opam index 8a97c9a18a43..7f3dd1d6870c 100644 --- a/opam/tezos-dal-node-lib.opam +++ b/opam/tezos-dal-node-lib.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-dal-node-services" "tezos-client-base" diff --git a/opam/tezos-dal-node-services.opam b/opam/tezos-dal-node-services.opam index c97ff0da3341..e81e44f90c82 100644 --- a/opam/tezos-dal-node-services.opam +++ b/opam/tezos-dal-node-services.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-rpc" "tezos-crypto-dal" diff --git a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam index 0d0d36014b7c..3a00e07e317e 100644 --- a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam +++ b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-000-Ps9mPmXa" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam index 907cbf4ed6fb..aa116496718b 100644 --- a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam +++ b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-001-PtCJ7pwo" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam index 860ba2628d60..4a5e513cf906 100644 --- a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam +++ b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-002-PsYLVpVv" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-003-PsddFKi3.opam b/opam/tezos-embedded-protocol-003-PsddFKi3.opam index 91192a3f7d31..60a126fc7c79 100644 --- a/opam/tezos-embedded-protocol-003-PsddFKi3.opam +++ b/opam/tezos-embedded-protocol-003-PsddFKi3.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-003-PsddFKi3" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam index 3d6101127e8e..24f34239c8fc 100644 --- a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam +++ b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-004-Pt24m4xi" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-005-PsBABY5H.opam b/opam/tezos-embedded-protocol-005-PsBABY5H.opam index d2726bb9f51a..c716326d1d9d 100644 --- a/opam/tezos-embedded-protocol-005-PsBABY5H.opam +++ b/opam/tezos-embedded-protocol-005-PsBABY5H.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-005-PsBABY5H" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-005-PsBabyM1.opam b/opam/tezos-embedded-protocol-005-PsBabyM1.opam index d5a21321c32d..696943c72dca 100644 --- a/opam/tezos-embedded-protocol-005-PsBabyM1.opam +++ b/opam/tezos-embedded-protocol-005-PsBabyM1.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-005-PsBabyM1" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-006-PsCARTHA.opam b/opam/tezos-embedded-protocol-006-PsCARTHA.opam index a3c0571fd715..f0f48fcd09c0 100644 --- a/opam/tezos-embedded-protocol-006-PsCARTHA.opam +++ b/opam/tezos-embedded-protocol-006-PsCARTHA.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-006-PsCARTHA" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-007-PsDELPH1.opam b/opam/tezos-embedded-protocol-007-PsDELPH1.opam index cceaac302d75..39a251507b4b 100644 --- a/opam/tezos-embedded-protocol-007-PsDELPH1.opam +++ b/opam/tezos-embedded-protocol-007-PsDELPH1.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-007-PsDELPH1" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam index d2c47ea8a534..55e8aec35df7 100644 --- a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-008-PtEdo2Zk" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-008-PtEdoTez.opam b/opam/tezos-embedded-protocol-008-PtEdoTez.opam index 82d2a4ec89ce..952e2da53e40 100644 --- a/opam/tezos-embedded-protocol-008-PtEdoTez.opam +++ b/opam/tezos-embedded-protocol-008-PtEdoTez.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-008-PtEdoTez" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-009-PsFLoren.opam b/opam/tezos-embedded-protocol-009-PsFLoren.opam index c168d79e5772..410c358a4c8d 100644 --- a/opam/tezos-embedded-protocol-009-PsFLoren.opam +++ b/opam/tezos-embedded-protocol-009-PsFLoren.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-009-PsFLoren" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-010-PtGRANAD.opam b/opam/tezos-embedded-protocol-010-PtGRANAD.opam index d027c57e21f2..4885258e4aab 100644 --- a/opam/tezos-embedded-protocol-010-PtGRANAD.opam +++ b/opam/tezos-embedded-protocol-010-PtGRANAD.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-010-PtGRANAD" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-011-PtHangz2.opam b/opam/tezos-embedded-protocol-011-PtHangz2.opam index 8b8930ff34a0..d5999d7e01e4 100644 --- a/opam/tezos-embedded-protocol-011-PtHangz2.opam +++ b/opam/tezos-embedded-protocol-011-PtHangz2.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-011-PtHangz2" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-012-Psithaca.opam b/opam/tezos-embedded-protocol-012-Psithaca.opam index 05d8d83ca34f..f11dde981588 100644 --- a/opam/tezos-embedded-protocol-012-Psithaca.opam +++ b/opam/tezos-embedded-protocol-012-Psithaca.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-012-Psithaca" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-013-PtJakart.opam b/opam/tezos-embedded-protocol-013-PtJakart.opam index 87cf77073fa2..f8d307315c89 100644 --- a/opam/tezos-embedded-protocol-013-PtJakart.opam +++ b/opam/tezos-embedded-protocol-013-PtJakart.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-013-PtJakart" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-014-PtKathma.opam b/opam/tezos-embedded-protocol-014-PtKathma.opam index f32a4f7b09c6..6190f85022af 100644 --- a/opam/tezos-embedded-protocol-014-PtKathma.opam +++ b/opam/tezos-embedded-protocol-014-PtKathma.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-014-PtKathma" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-015-PtLimaPt.opam b/opam/tezos-embedded-protocol-015-PtLimaPt.opam index de2946e70df1..18ab93075a01 100644 --- a/opam/tezos-embedded-protocol-015-PtLimaPt.opam +++ b/opam/tezos-embedded-protocol-015-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-015-PtLimaPt" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-016-PtMumbai.opam b/opam/tezos-embedded-protocol-016-PtMumbai.opam index 9e84c1617062..5fc454312681 100644 --- a/opam/tezos-embedded-protocol-016-PtMumbai.opam +++ b/opam/tezos-embedded-protocol-016-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-016-PtMumbai" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-alpha.opam b/opam/tezos-embedded-protocol-alpha.opam index dcd97d77dba2..5660489100b2 100644 --- a/opam/tezos-embedded-protocol-alpha.opam +++ b/opam/tezos-embedded-protocol-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-alpha" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-demo-counter.opam b/opam/tezos-embedded-protocol-demo-counter.opam index 8d196b26b644..bddeefde6683 100644 --- a/opam/tezos-embedded-protocol-demo-counter.opam +++ b/opam/tezos-embedded-protocol-demo-counter.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-demo-counter" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-demo-noops.opam b/opam/tezos-embedded-protocol-demo-noops.opam index cc4ea9becd7c..67dcea239646 100644 --- a/opam/tezos-embedded-protocol-demo-noops.opam +++ b/opam/tezos-embedded-protocol-demo-noops.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-demo-noops" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-genesis.opam b/opam/tezos-embedded-protocol-genesis.opam index 461df939c456..872c3725af35 100644 --- a/opam/tezos-embedded-protocol-genesis.opam +++ b/opam/tezos-embedded-protocol-genesis.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-genesis" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-error-monad.opam b/opam/tezos-error-monad.opam index d7ad9b03ac39..401f99dacd55 100644 --- a/opam/tezos-error-monad.opam +++ b/opam/tezos-error-monad.opam @@ -9,7 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } - "ocaml" { >= "4.07" } + "ocaml" { >= "4.14" } "tezos-stdlib" "data-encoding" { >= "0.7.1" & < "1.0.0" } "lwt-canceler" { >= "0.3" & < "0.4" } diff --git a/opam/tezos-event-logging-test-helpers.opam b/opam/tezos-event-logging-test-helpers.opam index 831e5b7e8b3c..a7c013a54a95 100644 --- a/opam/tezos-event-logging-test-helpers.opam +++ b/opam/tezos-event-logging-test-helpers.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "tezos-lwt-result-stdlib" "data-encoding" { >= "0.7.1" & < "1.0.0" } diff --git a/opam/tezos-event-logging.opam b/opam/tezos-event-logging.opam index ccafb1b2853c..2e55d3f300e0 100644 --- a/opam/tezos-event-logging.opam +++ b/opam/tezos-event-logging.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "data-encoding" { >= "0.7.1" & < "1.0.0" } "tezos-error-monad" diff --git a/opam/tezos-expect-helper.opam b/opam/tezos-expect-helper.opam index f05a8bff98b1..ec5502d38e2d 100644 --- a/opam/tezos-expect-helper.opam +++ b/opam/tezos-expect-helper.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" ] build: [ diff --git a/opam/tezos-injector-013-PtJakart.opam b/opam/tezos-injector-013-PtJakart.opam index 91987cb297e4..b2223f3099a7 100644 --- a/opam/tezos-injector-013-PtJakart.opam +++ b/opam/tezos-injector-013-PtJakart.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-stdlib-unix" diff --git a/opam/tezos-injector-014-PtKathma.opam b/opam/tezos-injector-014-PtKathma.opam index e39d8184ea1d..4801dd614ddc 100644 --- a/opam/tezos-injector-014-PtKathma.opam +++ b/opam/tezos-injector-014-PtKathma.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-stdlib-unix" diff --git a/opam/tezos-injector-015-PtLimaPt.opam b/opam/tezos-injector-015-PtLimaPt.opam index 06884a10706b..0831390f1b1c 100644 --- a/opam/tezos-injector-015-PtLimaPt.opam +++ b/opam/tezos-injector-015-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-stdlib-unix" diff --git a/opam/tezos-injector-016-PtMumbai.opam b/opam/tezos-injector-016-PtMumbai.opam index 40ab5d1b8f80..c03e76a04cfa 100644 --- a/opam/tezos-injector-016-PtMumbai.opam +++ b/opam/tezos-injector-016-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-stdlib-unix" diff --git a/opam/tezos-injector-alpha.opam b/opam/tezos-injector-alpha.opam index aada70fca7ff..0133c8b3445a 100644 --- a/opam/tezos-injector-alpha.opam +++ b/opam/tezos-injector-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-stdlib-unix" diff --git a/opam/tezos-layer2-store.opam b/opam/tezos-layer2-store.opam index 870cd410cbe6..3cea98b311aa 100644 --- a/opam/tezos-layer2-store.opam +++ b/opam/tezos-layer2-store.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "index" { >= "1.6.0" & < "1.7.0" } "tezos-base" "irmin-pack" { >= "3.5.1" & < "3.6.0" } diff --git a/opam/tezos-layer2-utils-016-PtMumbai.opam b/opam/tezos-layer2-utils-016-PtMumbai.opam index d9eadc552aee..75976a5d6284 100644 --- a/opam/tezos-layer2-utils-016-PtMumbai.opam +++ b/opam/tezos-layer2-utils-016-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-protocol-016-PtMumbai" diff --git a/opam/tezos-layer2-utils-alpha.opam b/opam/tezos-layer2-utils-alpha.opam index bba5faebf26e..faaf4f43e59d 100644 --- a/opam/tezos-layer2-utils-alpha.opam +++ b/opam/tezos-layer2-utils-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-protocol-alpha" diff --git a/opam/tezos-lazy-containers-tests.opam b/opam/tezos-lazy-containers-tests.opam index 9918b1636792..6a8112667da3 100644 --- a/opam/tezos-lazy-containers-tests.opam +++ b/opam/tezos-lazy-containers-tests.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-lazy-containers" {with-test} "qcheck-core" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-lwt-result-stdlib.opam b/opam/tezos-lwt-result-stdlib.opam index 603969c65135..275f1eb38155 100644 --- a/opam/tezos-lwt-result-stdlib.opam +++ b/opam/tezos-lwt-result-stdlib.opam @@ -9,7 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } - "ocaml" { >= "4.12" } + "ocaml" { >= "4.14" } "lwt" { >= "5.6.0" } "alcotest-lwt" { with-test & >= "1.5.0" } "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-micheline-rewriting.opam b/opam/tezos-micheline-rewriting.opam index 7b8e9e569f2e..2dd4236d3de4 100644 --- a/opam/tezos-micheline-rewriting.opam +++ b/opam/tezos-micheline-rewriting.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "zarith" { >= "1.12" & < "1.13" } "zarith_stubs_js" "tezos-stdlib" diff --git a/opam/tezos-micheline.opam b/opam/tezos-micheline.opam index cc78ef114c85..5b5358c94f1d 100644 --- a/opam/tezos-micheline.opam +++ b/opam/tezos-micheline.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "uutf" "zarith" { >= "1.12" & < "1.13" } diff --git a/opam/tezos-mockup-commands.opam b/opam/tezos-mockup-commands.opam index 83026c24c394..8ed94dfa9cf8 100644 --- a/opam/tezos-mockup-commands.opam +++ b/opam/tezos-mockup-commands.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-clic" "tezos-client-commands" diff --git a/opam/tezos-mockup-proxy.opam b/opam/tezos-mockup-proxy.opam index c6a7604e81bf..d0984756cf08 100644 --- a/opam/tezos-mockup-proxy.opam +++ b/opam/tezos-mockup-proxy.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-client-base" "tezos-protocol-environment" diff --git a/opam/tezos-mockup-registration.opam b/opam/tezos-mockup-registration.opam index 1f24dd1db643..7cbb231880d2 100644 --- a/opam/tezos-mockup-registration.opam +++ b/opam/tezos-mockup-registration.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-client-base" "tezos-shell-services" diff --git a/opam/tezos-mockup.opam b/opam/tezos-mockup.opam index 731ca7f44b7b..1a9f49eeee0a 100644 --- a/opam/tezos-mockup.opam +++ b/opam/tezos-mockup.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-client-base" "tezos-mockup-proxy" diff --git a/opam/tezos-openapi.opam b/opam/tezos-openapi.opam index 5e9e9a25f3b9..89cf19c62e9f 100644 --- a/opam/tezos-openapi.opam +++ b/opam/tezos-openapi.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ezjsonm" { >= "1.1.0" } "json-data-encoding" { >= "0.12" & < "0.13" } "tezt" { >= "3.0.0" } diff --git a/opam/tezos-p2p-services.opam b/opam/tezos-p2p-services.opam index f8b86b3bfdf1..b76c9ec83aea 100644 --- a/opam/tezos-p2p-services.opam +++ b/opam/tezos-p2p-services.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-rpc" ] diff --git a/opam/tezos-p2p.opam b/opam/tezos-p2p.opam index f9d3fe95f013..25923a9c3f2f 100644 --- a/opam/tezos-p2p.opam +++ b/opam/tezos-p2p.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "lwt-watcher" { = "0.2" } "lwt-canceler" { >= "0.3" & < "0.4" } "ringo" { >= "1.0.0" } diff --git a/opam/tezos-protocol-000-Ps9mPmXa.opam b/opam/tezos-protocol-000-Ps9mPmXa.opam index e82b6e441418..8aa26d264c07 100644 --- a/opam/tezos-protocol-000-Ps9mPmXa.opam +++ b/opam/tezos-protocol-000-Ps9mPmXa.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-001-PtCJ7pwo.opam b/opam/tezos-protocol-001-PtCJ7pwo.opam index f2f1779f56af..3b542c27f061 100644 --- a/opam/tezos-protocol-001-PtCJ7pwo.opam +++ b/opam/tezos-protocol-001-PtCJ7pwo.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-002-PsYLVpVv.opam b/opam/tezos-protocol-002-PsYLVpVv.opam index 3a24c4d32e91..acff93255f36 100644 --- a/opam/tezos-protocol-002-PsYLVpVv.opam +++ b/opam/tezos-protocol-002-PsYLVpVv.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-003-PsddFKi3.opam b/opam/tezos-protocol-003-PsddFKi3.opam index a6504eb48c82..453ad0cdfe3f 100644 --- a/opam/tezos-protocol-003-PsddFKi3.opam +++ b/opam/tezos-protocol-003-PsddFKi3.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-004-Pt24m4xi.opam b/opam/tezos-protocol-004-Pt24m4xi.opam index f0ea0dd31c12..e3b7e5ce7fa9 100644 --- a/opam/tezos-protocol-004-Pt24m4xi.opam +++ b/opam/tezos-protocol-004-Pt24m4xi.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-005-PsBABY5H.opam b/opam/tezos-protocol-005-PsBABY5H.opam index f0ea0dd31c12..e3b7e5ce7fa9 100644 --- a/opam/tezos-protocol-005-PsBABY5H.opam +++ b/opam/tezos-protocol-005-PsBABY5H.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-005-PsBabyM1.opam b/opam/tezos-protocol-005-PsBabyM1.opam index f0ea0dd31c12..e3b7e5ce7fa9 100644 --- a/opam/tezos-protocol-005-PsBabyM1.opam +++ b/opam/tezos-protocol-005-PsBabyM1.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-006-PsCARTHA.opam b/opam/tezos-protocol-006-PsCARTHA.opam index f0ea0dd31c12..e3b7e5ce7fa9 100644 --- a/opam/tezos-protocol-006-PsCARTHA.opam +++ b/opam/tezos-protocol-006-PsCARTHA.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-007-PsDELPH1.opam b/opam/tezos-protocol-007-PsDELPH1.opam index f0ea0dd31c12..e3b7e5ce7fa9 100644 --- a/opam/tezos-protocol-007-PsDELPH1.opam +++ b/opam/tezos-protocol-007-PsDELPH1.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-008-PtEdo2Zk.opam b/opam/tezos-protocol-008-PtEdo2Zk.opam index f0ea0dd31c12..e3b7e5ce7fa9 100644 --- a/opam/tezos-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-protocol-008-PtEdo2Zk.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-008-PtEdoTez.opam b/opam/tezos-protocol-008-PtEdoTez.opam index f0ea0dd31c12..e3b7e5ce7fa9 100644 --- a/opam/tezos-protocol-008-PtEdoTez.opam +++ b/opam/tezos-protocol-008-PtEdoTez.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-009-PsFLoren.opam b/opam/tezos-protocol-009-PsFLoren.opam index f0ea0dd31c12..e3b7e5ce7fa9 100644 --- a/opam/tezos-protocol-009-PsFLoren.opam +++ b/opam/tezos-protocol-009-PsFLoren.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-010-PtGRANAD.opam b/opam/tezos-protocol-010-PtGRANAD.opam index f0ea0dd31c12..e3b7e5ce7fa9 100644 --- a/opam/tezos-protocol-010-PtGRANAD.opam +++ b/opam/tezos-protocol-010-PtGRANAD.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-011-PtHangz2.opam b/opam/tezos-protocol-011-PtHangz2.opam index a7ac2f52c9da..59f5b6b0b44a 100644 --- a/opam/tezos-protocol-011-PtHangz2.opam +++ b/opam/tezos-protocol-011-PtHangz2.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" "tezos-base" ] diff --git a/opam/tezos-protocol-012-Psithaca.opam b/opam/tezos-protocol-012-Psithaca.opam index a7ac2f52c9da..59f5b6b0b44a 100644 --- a/opam/tezos-protocol-012-Psithaca.opam +++ b/opam/tezos-protocol-012-Psithaca.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" "tezos-base" ] diff --git a/opam/tezos-protocol-013-PtJakart.opam b/opam/tezos-protocol-013-PtJakart.opam index a7ac2f52c9da..59f5b6b0b44a 100644 --- a/opam/tezos-protocol-013-PtJakart.opam +++ b/opam/tezos-protocol-013-PtJakart.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" "tezos-base" ] diff --git a/opam/tezos-protocol-014-PtKathma.opam b/opam/tezos-protocol-014-PtKathma.opam index a7ac2f52c9da..59f5b6b0b44a 100644 --- a/opam/tezos-protocol-014-PtKathma.opam +++ b/opam/tezos-protocol-014-PtKathma.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" "tezos-base" ] diff --git a/opam/tezos-protocol-015-PtLimaPt-tests.opam b/opam/tezos-protocol-015-PtLimaPt-tests.opam index 5ee85058b9d3..4ef48983946e 100644 --- a/opam/tezos-protocol-015-PtLimaPt-tests.opam +++ b/opam/tezos-protocol-015-PtLimaPt-tests.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "alcotest-lwt" { with-test & >= "1.5.0" } "tezos-base" {with-test} "tezos-protocol-015-PtLimaPt" {with-test} diff --git a/opam/tezos-protocol-015-PtLimaPt.opam b/opam/tezos-protocol-015-PtLimaPt.opam index a7ac2f52c9da..59f5b6b0b44a 100644 --- a/opam/tezos-protocol-015-PtLimaPt.opam +++ b/opam/tezos-protocol-015-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" "tezos-base" ] diff --git a/opam/tezos-protocol-016-PtMumbai-tests.opam b/opam/tezos-protocol-016-PtMumbai-tests.opam index 742f40a26694..9520acf154ff 100644 --- a/opam/tezos-protocol-016-PtMumbai-tests.opam +++ b/opam/tezos-protocol-016-PtMumbai-tests.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "alcotest-lwt" { with-test & >= "1.5.0" } "tezos-base" {with-test} "tezos-protocol-016-PtMumbai" {with-test} diff --git a/opam/tezos-protocol-016-PtMumbai.opam b/opam/tezos-protocol-016-PtMumbai.opam index a7ac2f52c9da..59f5b6b0b44a 100644 --- a/opam/tezos-protocol-016-PtMumbai.opam +++ b/opam/tezos-protocol-016-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" "tezos-base" ] diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index f9ab2442e9f7..63e248aa4ec7 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "alcotest-lwt" { with-test & >= "1.5.0" } "tezos-base" {with-test} "tezos-protocol-alpha" {with-test} diff --git a/opam/tezos-protocol-alpha.opam b/opam/tezos-protocol-alpha.opam index a7ac2f52c9da..59f5b6b0b44a 100644 --- a/opam/tezos-protocol-alpha.opam +++ b/opam/tezos-protocol-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" "tezos-base" ] diff --git a/opam/tezos-protocol-demo-counter.opam b/opam/tezos-protocol-demo-counter.opam index d6516123b5b6..216bca84a51e 100644 --- a/opam/tezos-protocol-demo-counter.opam +++ b/opam/tezos-protocol-demo-counter.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-demo-noops.opam b/opam/tezos-protocol-demo-noops.opam index 7150f4fa9a08..98f4cb83c0e6 100644 --- a/opam/tezos-protocol-demo-noops.opam +++ b/opam/tezos-protocol-demo-noops.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-genesis.opam b/opam/tezos-protocol-genesis.opam index 80c396703c4c..471d077a4401 100644 --- a/opam/tezos-protocol-genesis.opam +++ b/opam/tezos-protocol-genesis.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam index 254448fc182a..bc9f4679581e 100644 --- a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam +++ b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-embedded-protocol-007-PsDELPH1" "tezos-protocol-plugin-007-PsDELPH1" diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1.opam b/opam/tezos-protocol-plugin-007-PsDELPH1.opam index 5feaf3f33835..aa2d166adfb0 100644 --- a/opam/tezos-protocol-plugin-007-PsDELPH1.opam +++ b/opam/tezos-protocol-plugin-007-PsDELPH1.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-007-PsDELPH1" ] diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam index 14ad2cdabe9d..7ee87971a122 100644 --- a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam +++ b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-embedded-protocol-008-PtEdo2Zk" "tezos-protocol-plugin-008-PtEdo2Zk" diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam index 255c89485831..3f1f885c8cb6 100644 --- a/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam +++ b/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-008-PtEdo2Zk" ] diff --git a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam index 4416b1e6e20d..a1e464f3b37d 100644 --- a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam +++ b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-embedded-protocol-009-PsFLoren" "tezos-protocol-plugin-009-PsFLoren" diff --git a/opam/tezos-protocol-plugin-009-PsFLoren.opam b/opam/tezos-protocol-plugin-009-PsFLoren.opam index bb800ae86e02..2d961620d7ec 100644 --- a/opam/tezos-protocol-plugin-009-PsFLoren.opam +++ b/opam/tezos-protocol-plugin-009-PsFLoren.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-009-PsFLoren" ] diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam index f90907b9247f..e645a364d577 100644 --- a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam +++ b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-embedded-protocol-010-PtGRANAD" "tezos-protocol-plugin-010-PtGRANAD" diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD.opam b/opam/tezos-protocol-plugin-010-PtGRANAD.opam index acb75bb8d291..f6aea474fa4b 100644 --- a/opam/tezos-protocol-plugin-010-PtGRANAD.opam +++ b/opam/tezos-protocol-plugin-010-PtGRANAD.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-010-PtGRANAD" ] diff --git a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam index 79f9543fe043..f85f268c8aa7 100644 --- a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam +++ b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-embedded-protocol-011-PtHangz2" "tezos-protocol-plugin-011-PtHangz2" diff --git a/opam/tezos-protocol-plugin-011-PtHangz2.opam b/opam/tezos-protocol-plugin-011-PtHangz2.opam index 9fc7a79b120d..0f54b801f657 100644 --- a/opam/tezos-protocol-plugin-011-PtHangz2.opam +++ b/opam/tezos-protocol-plugin-011-PtHangz2.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-011-PtHangz2" ] diff --git a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam index ddd5c11f1000..6ec7e8eeb7a6 100644 --- a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam +++ b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-embedded-protocol-012-Psithaca" "tezos-protocol-plugin-012-Psithaca" diff --git a/opam/tezos-protocol-plugin-012-Psithaca.opam b/opam/tezos-protocol-plugin-012-Psithaca.opam index 982504686ce5..96633daf4e54 100644 --- a/opam/tezos-protocol-plugin-012-Psithaca.opam +++ b/opam/tezos-protocol-plugin-012-Psithaca.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-012-Psithaca" ] diff --git a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam index 1d9c71a6e4d2..3f540cad2b62 100644 --- a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam +++ b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-embedded-protocol-013-PtJakart" "tezos-protocol-plugin-013-PtJakart" diff --git a/opam/tezos-protocol-plugin-013-PtJakart.opam b/opam/tezos-protocol-plugin-013-PtJakart.opam index 7b3ed19687bb..46b010048945 100644 --- a/opam/tezos-protocol-plugin-013-PtJakart.opam +++ b/opam/tezos-protocol-plugin-013-PtJakart.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-013-PtJakart" ] diff --git a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam b/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam index ebc455bee887..831c43727c93 100644 --- a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam +++ b/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-embedded-protocol-014-PtKathma" "tezos-protocol-plugin-014-PtKathma" diff --git a/opam/tezos-protocol-plugin-014-PtKathma.opam b/opam/tezos-protocol-plugin-014-PtKathma.opam index 091806576b99..8b9422f98388 100644 --- a/opam/tezos-protocol-plugin-014-PtKathma.opam +++ b/opam/tezos-protocol-plugin-014-PtKathma.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-014-PtKathma" ] diff --git a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam b/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam index bdfe52631396..69d259bf47d5 100644 --- a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam +++ b/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-embedded-protocol-015-PtLimaPt" "tezos-protocol-plugin-015-PtLimaPt" diff --git a/opam/tezos-protocol-plugin-015-PtLimaPt-tests.opam b/opam/tezos-protocol-plugin-015-PtLimaPt-tests.opam index acc446768157..aef2bfb40c2d 100644 --- a/opam/tezos-protocol-plugin-015-PtLimaPt-tests.opam +++ b/opam/tezos-protocol-plugin-015-PtLimaPt-tests.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" {with-test} "tezos-base-test-helpers" {with-test} "alcotest-lwt" { with-test & >= "1.5.0" } diff --git a/opam/tezos-protocol-plugin-015-PtLimaPt.opam b/opam/tezos-protocol-plugin-015-PtLimaPt.opam index d603c8858629..852774bf464c 100644 --- a/opam/tezos-protocol-plugin-015-PtLimaPt.opam +++ b/opam/tezos-protocol-plugin-015-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-015-PtLimaPt" ] diff --git a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam b/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam index e313861c4764..f283e4ac00cb 100644 --- a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam +++ b/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-embedded-protocol-016-PtMumbai" "tezos-protocol-plugin-016-PtMumbai" diff --git a/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam b/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam index a66d2586a544..824b2f2614e3 100644 --- a/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam +++ b/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" {with-test} "tezos-base-test-helpers" {with-test} "alcotest-lwt" { with-test & >= "1.5.0" } diff --git a/opam/tezos-protocol-plugin-016-PtMumbai.opam b/opam/tezos-protocol-plugin-016-PtMumbai.opam index 475651d4b3af..c086b3fe6207 100644 --- a/opam/tezos-protocol-plugin-016-PtMumbai.opam +++ b/opam/tezos-protocol-plugin-016-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-016-PtMumbai" ] diff --git a/opam/tezos-protocol-plugin-alpha-registerer.opam b/opam/tezos-protocol-plugin-alpha-registerer.opam index 9683208a2d85..ec51b5b1d9c6 100644 --- a/opam/tezos-protocol-plugin-alpha-registerer.opam +++ b/opam/tezos-protocol-plugin-alpha-registerer.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-embedded-protocol-alpha" "tezos-protocol-plugin-alpha" diff --git a/opam/tezos-protocol-plugin-alpha-tests.opam b/opam/tezos-protocol-plugin-alpha-tests.opam index f0a6285bda34..06ae2a04291d 100644 --- a/opam/tezos-protocol-plugin-alpha-tests.opam +++ b/opam/tezos-protocol-plugin-alpha-tests.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" {with-test} "tezos-base-test-helpers" {with-test} "alcotest-lwt" { with-test & >= "1.5.0" } diff --git a/opam/tezos-protocol-plugin-alpha.opam b/opam/tezos-protocol-plugin-alpha.opam index ebb03f3aa42f..c0b87630da7a 100644 --- a/opam/tezos-protocol-plugin-alpha.opam +++ b/opam/tezos-protocol-plugin-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-alpha" ] diff --git a/opam/tezos-protocol-updater.opam b/opam/tezos-protocol-updater.opam index 7925acf2756c..17c8c4418562 100644 --- a/opam/tezos-protocol-updater.opam +++ b/opam/tezos-protocol-updater.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib-unix" "tezos-micheline" diff --git a/opam/tezos-proxy-server-config.opam b/opam/tezos-proxy-server-config.opam index 3cbe808fbc37..487d0ca6c5ab 100644 --- a/opam/tezos-proxy-server-config.opam +++ b/opam/tezos-proxy-server-config.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib-unix" "uri" { >= "3.1.0" } diff --git a/opam/tezos-proxy.opam b/opam/tezos-proxy.opam index bab3b94bd154..4579c0e5dc6e 100644 --- a/opam/tezos-proxy.opam +++ b/opam/tezos-proxy.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } "tezos-base" diff --git a/opam/tezos-requester.opam b/opam/tezos-requester.opam index 93c18473676b..99ffda04a0ba 100644 --- a/opam/tezos-requester.opam +++ b/opam/tezos-requester.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib-unix" "lwt-watcher" { = "0.2" } diff --git a/opam/tezos-rpc-http-client-unix.opam b/opam/tezos-rpc-http-client-unix.opam index 97d9516cc903..f4999936af61 100644 --- a/opam/tezos-rpc-http-client-unix.opam +++ b/opam/tezos-rpc-http-client-unix.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib-unix" "tezos-base" "cohttp-lwt-unix" { >= "4.0.0" } diff --git a/opam/tezos-rpc-http-client.opam b/opam/tezos-rpc-http-client.opam index de46831d2c43..cae42a15bb39 100644 --- a/opam/tezos-rpc-http-client.opam +++ b/opam/tezos-rpc-http-client.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "resto-cohttp-client" { >= "1.0" } "tezos-rpc" diff --git a/opam/tezos-rpc-http-server.opam b/opam/tezos-rpc-http-server.opam index 743df98189d2..ae270bee3757 100644 --- a/opam/tezos-rpc-http-server.opam +++ b/opam/tezos-rpc-http-server.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib-unix" "resto-cohttp-server" { >= "1.0" } diff --git a/opam/tezos-rpc-http.opam b/opam/tezos-rpc-http.opam index c021d4070658..fcf4611d0c49 100644 --- a/opam/tezos-rpc-http.opam +++ b/opam/tezos-rpc-http.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-rpc" "resto-cohttp" { >= "1.0" } diff --git a/opam/tezos-rpc.opam b/opam/tezos-rpc.opam index cfb5dfda10fd..512baf702eca 100644 --- a/opam/tezos-rpc.opam +++ b/opam/tezos-rpc.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "data-encoding" { >= "0.7.1" & < "1.0.0" } "tezos-error-monad" "resto" { >= "1.0" } diff --git a/opam/tezos-sapling.opam b/opam/tezos-sapling.opam index 8e0de96773a5..2fef032f3b5e 100644 --- a/opam/tezos-sapling.opam +++ b/opam/tezos-sapling.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "conf-rust" "integers" "integers_stubs_js" diff --git a/opam/tezos-scoru-wasm-benchmark.opam b/opam/tezos-scoru-wasm-benchmark.opam index 5cc2612fef3b..bf38c859dde2 100644 --- a/opam/tezos-scoru-wasm-benchmark.opam +++ b/opam/tezos-scoru-wasm-benchmark.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_deriving" "tezos-base" "tezt" { >= "3.0.0" } diff --git a/opam/tezos-scoru-wasm-fast-test.opam b/opam/tezos-scoru-wasm-fast-test.opam index e2b39a7b4c05..aa8ac0927403 100644 --- a/opam/tezos-scoru-wasm-fast-test.opam +++ b/opam/tezos-scoru-wasm-fast-test.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_import" {with-test} "ppx_deriving" {with-test} "tezos-base" {with-test} diff --git a/opam/tezos-scoru-wasm-fast.opam b/opam/tezos-scoru-wasm-fast.opam index 4366b64570fc..d626ee3b7b43 100644 --- a/opam/tezos-scoru-wasm-fast.opam +++ b/opam/tezos-scoru-wasm-fast.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-tree-encoding" "tezos-webassembly-interpreter" diff --git a/opam/tezos-scoru-wasm-helpers.opam b/opam/tezos-scoru-wasm-helpers.opam index 37e7398d8457..565d96de2e67 100644 --- a/opam/tezos-scoru-wasm-helpers.opam +++ b/opam/tezos-scoru-wasm-helpers.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_import" "ppx_deriving" "tezos-base" diff --git a/opam/tezos-scoru-wasm-test-helpers.opam b/opam/tezos-scoru-wasm-test-helpers.opam index 2edc0ec20eed..3187f3a60b67 100644 --- a/opam/tezos-scoru-wasm-test-helpers.opam +++ b/opam/tezos-scoru-wasm-test-helpers.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_import" "ppx_deriving" "tezos-base" diff --git a/opam/tezos-scoru-wasm-test.opam b/opam/tezos-scoru-wasm-test.opam index 6315306fcfe1..2e304f4099c6 100644 --- a/opam/tezos-scoru-wasm-test.opam +++ b/opam/tezos-scoru-wasm-test.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_import" {with-test} "ppx_deriving" {with-test} "tezos-base" {with-test} diff --git a/opam/tezos-scoru-wasm.opam b/opam/tezos-scoru-wasm.opam index fe3f882449a3..de5b5b93640c 100644 --- a/opam/tezos-scoru-wasm.opam +++ b/opam/tezos-scoru-wasm.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-tree-encoding" "tezos-lazy-containers" diff --git a/opam/tezos-shell-benchmarks.opam b/opam/tezos-shell-benchmarks.opam index 908b8212ebaa..6d258ca0076d 100644 --- a/opam/tezos-shell-benchmarks.opam +++ b/opam/tezos-shell-benchmarks.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-shell-context-test.opam b/opam/tezos-shell-context-test.opam index cc1dbcc277d5..994827cd2743 100644 --- a/opam/tezos-shell-context-test.opam +++ b/opam/tezos-shell-context-test.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-shell-context" {with-test} "alcotest-lwt" { with-test & >= "1.5.0" } "tezos-test-helpers" {with-test} diff --git a/opam/tezos-shell-context.opam b/opam/tezos-shell-context.opam index 86ac2ff9316a..ade5012e5110 100644 --- a/opam/tezos-shell-context.opam +++ b/opam/tezos-shell-context.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-protocol-environment" "tezos-context" diff --git a/opam/tezos-shell-services-test-helpers.opam b/opam/tezos-shell-services-test-helpers.opam index bc415ef9c1a1..b9fdfd33ce22 100644 --- a/opam/tezos-shell-services-test-helpers.opam +++ b/opam/tezos-shell-services-test-helpers.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-shell-services" "tezos-test-helpers" diff --git a/opam/tezos-shell-services.opam b/opam/tezos-shell-services.opam index fe38feb6a4ce..89861404495d 100644 --- a/opam/tezos-shell-services.opam +++ b/opam/tezos-shell-services.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-rpc" "tezos-p2p-services" diff --git a/opam/tezos-shell.opam b/opam/tezos-shell.opam index 828a0d2fddd2..9271dc436739 100644 --- a/opam/tezos-shell.opam +++ b/opam/tezos-shell.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "lwt-watcher" { = "0.2" } "lwt-canceler" { >= "0.3" & < "0.4" } diff --git a/opam/tezos-signer-backends.opam b/opam/tezos-signer-backends.opam index df8018365930..b5d6be435bd2 100644 --- a/opam/tezos-signer-backends.opam +++ b/opam/tezos-signer-backends.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib" "tezos-client-base" diff --git a/opam/tezos-signer-services.opam b/opam/tezos-signer-services.opam index 03e27b42b9c6..ff688997b9d4 100644 --- a/opam/tezos-signer-services.opam +++ b/opam/tezos-signer-services.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-rpc" "tezos-client-base" diff --git a/opam/tezos-smart-rollup-016-PtMumbai.opam b/opam/tezos-smart-rollup-016-PtMumbai.opam index 9f4fc25da478..f6b715dadb8e 100644 --- a/opam/tezos-smart-rollup-016-PtMumbai.opam +++ b/opam/tezos-smart-rollup-016-PtMumbai.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-protocol-016-PtMumbai" diff --git a/opam/tezos-smart-rollup-alpha.opam b/opam/tezos-smart-rollup-alpha.opam index 1cf36123b271..2804a275e256 100644 --- a/opam/tezos-smart-rollup-alpha.opam +++ b/opam/tezos-smart-rollup-alpha.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "tezos-base" "tezos-protocol-alpha" diff --git a/opam/tezos-stdlib-unix.opam b/opam/tezos-stdlib-unix.opam index 9414a21968c8..ec825979b16e 100644 --- a/opam/tezos-stdlib-unix.opam +++ b/opam/tezos-stdlib-unix.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "base-unix" "tezos-error-monad" "tezos-lwt-result-stdlib" diff --git a/opam/tezos-store.opam b/opam/tezos-store.opam index f87be3ea7b2b..595e676318c6 100644 --- a/opam/tezos-store.opam +++ b/opam/tezos-store.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-stdlib-unix" "tezos-base" "tezos-crypto" diff --git a/opam/tezos-test-helpers-extra.opam b/opam/tezos-test-helpers-extra.opam index 33f40e6ba07c..db9da3c8a400 100644 --- a/opam/tezos-test-helpers-extra.opam +++ b/opam/tezos-test-helpers-extra.opam @@ -9,7 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } - "ocaml" { >= "4.08" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-crypto" "tezos-test-helpers" diff --git a/opam/tezos-test-helpers.opam b/opam/tezos-test-helpers.opam index 8c901cfcdabe..4b5b3d0e31f7 100644 --- a/opam/tezos-test-helpers.opam +++ b/opam/tezos-test-helpers.opam @@ -9,7 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } - "ocaml" { >= "4.12" } + "ocaml" { >= "4.14" } "uri" { >= "3.1.0" } "fmt" { >= "0.8.7" } "qcheck-alcotest" { >= "0.20" } diff --git a/opam/tezos-tooling.opam b/opam/tezos-tooling.opam index 562eef4a6b7b..1ef38c9ec29b 100644 --- a/opam/tezos-tooling.opam +++ b/opam/tezos-tooling.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "bisect_ppx" { >= "2.7.0" } "ocamlformat" { = "0.21.0" } "ometrics" { >= "0.2.1" } diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam index 024c1a351982..444a9ad1d215 100644 --- a/opam/tezos-tps-evaluation.opam +++ b/opam/tezos-tps-evaluation.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "caqti" "caqti-dynload" diff --git a/opam/tezos-tree-encoding-test.opam b/opam/tezos-tree-encoding-test.opam index 7b40c94f3507..172a0f114278 100644 --- a/opam/tezos-tree-encoding-test.opam +++ b/opam/tezos-tree-encoding-test.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" {with-test} "tezos-tree-encoding" {with-test} "tezos-context" {with-test} diff --git a/opam/tezos-tree-encoding.opam b/opam/tezos-tree-encoding.opam index ab2798bf742f..28ae9f537494 100644 --- a/opam/tezos-tree-encoding.opam +++ b/opam/tezos-tree-encoding.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-lazy-containers" "tezos-lwt-result-stdlib" diff --git a/opam/tezos-tx-rollup-015-PtLimaPt.opam b/opam/tezos-tx-rollup-015-PtLimaPt.opam index 4e13beb1daa8..a00c3f89d953 100644 --- a/opam/tezos-tx-rollup-015-PtLimaPt.opam +++ b/opam/tezos-tx-rollup-015-PtLimaPt.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_expect" "index" { >= "1.6.0" & < "1.7.0" } "tezos-base" diff --git a/opam/tezos-validation.opam b/opam/tezos-validation.opam index 074b08617a06..201bcc3e50ba 100644 --- a/opam/tezos-validation.opam +++ b/opam/tezos-validation.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-crypto" "tezos-rpc" diff --git a/opam/tezos-version.opam b/opam/tezos-version.opam index c2de963b50a2..bfba3844cb01 100644 --- a/opam/tezos-version.opam +++ b/opam/tezos-version.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_deriving" "tezos-base" "dune-configurator" diff --git a/opam/tezos-wasmer.opam b/opam/tezos-wasmer.opam index 0dabe6b089e0..2b182944646e 100644 --- a/opam/tezos-wasmer.opam +++ b/opam/tezos-wasmer.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_deriving" "ctypes" { >= "0.18.0" } "ctypes-foreign" { >= "0.18.0" } diff --git a/opam/tezos-webassembly-interpreter-extra.opam b/opam/tezos-webassembly-interpreter-extra.opam index dcd8aca1af62..0f5bbc01b0a6 100644 --- a/opam/tezos-webassembly-interpreter-extra.opam +++ b/opam/tezos-webassembly-interpreter-extra.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "Apache-2.0" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-webassembly-interpreter" "lwt" { >= "5.6.0" } "tezos-lazy-containers" diff --git a/opam/tezos-workers.opam b/opam/tezos-workers.opam index 4cd118f89acb..56b6b8c74cf7 100644 --- a/opam/tezos-workers.opam +++ b/opam/tezos-workers.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib-unix" "tezos-stdlib" {with-test} diff --git a/opam/tezt-performance-regression.opam b/opam/tezt-performance-regression.opam index 2e5288c89099..4fa48ea18b46 100644 --- a/opam/tezt-performance-regression.opam +++ b/opam/tezt-performance-regression.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezt" { >= "3.0.0" } "uri" { >= "3.1.0" } "cohttp-lwt-unix" { >= "4.0.0" } diff --git a/opam/tezt-self-tests.opam b/opam/tezt-self-tests.opam index 44cf3116f368..9ebbafa57863 100644 --- a/opam/tezt-self-tests.opam +++ b/opam/tezt-self-tests.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezt" { >= "3.0.0" } "tezt-tezos" "base-unix" diff --git a/opam/tezt-tezos.opam b/opam/tezt-tezos.opam index 17c851d56625..25bdaf810f11 100644 --- a/opam/tezt-tezos.opam +++ b/opam/tezt-tezos.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezt" { >= "3.0.0" } "tezt-performance-regression" "uri" { >= "3.1.0" } -- GitLab