diff --git a/scripts/install_build_deps.sh b/scripts/install_build_deps.sh index 51661d5cb..2f7eea0b2 100755 --- a/scripts/install_build_deps.sh +++ b/scripts/install_build_deps.sh @@ -51,6 +51,7 @@ if "$pin"; then opam pin --yes add --no-action --dev-repo ocplib-json-typed opam pin --yes add --no-action --dev-repo ocplib-resto opam pin --yes add --no-action --dev-repo cohttp + opam pin --yes add --no-action ocp-build 1.99.18-beta ## TMP fix opam pin add typerex-build --dev --no-action ## Force opam to take account of the new `tezos-deps.opam` opam pin --yes remove tezos-deps diff --git a/src/Makefile.files b/src/Makefile.files index 1bc67514c..4b51d1f15 100644 --- a/src/Makefile.files +++ b/src/Makefile.files @@ -312,6 +312,7 @@ NODE_PACKAGES := \ ipv6-multicast \ irmin.unix \ ocplib-resto.directory \ + ssl \ EMBEDDED_NODE_PROTOCOLS := \ $(patsubst ${SRCDIR}/proto/%/,${SRCDIR}/proto/embedded_proto_%.cmxa, \ diff --git a/src/node/net/p2p_welcome.ml b/src/node/net/p2p_welcome.ml index 67d01ada6..21e9a1075 100644 --- a/src/node/net/p2p_welcome.ml +++ b/src/node/net/p2p_welcome.ml @@ -43,8 +43,7 @@ let rec worker_loop st = let create_listening_socket ~backlog ?(addr = Ipaddr.V6.unspecified) port = let main_socket = Lwt_unix.(socket PF_INET6 SOCK_STREAM 0) in Lwt_unix.(setsockopt main_socket SO_REUSEADDR true) ; - Lwt_unix.Versioned.bind_2 - main_socket + Lwt_unix.bind main_socket Unix.(ADDR_INET (Ipaddr_unix.V6.to_inet_addr addr, port)) >>= fun () -> Lwt_unix.listen main_socket backlog ; Lwt.return main_socket diff --git a/src/tezos-deps.opam b/src/tezos-deps.opam index 6d7d513d9..7e207c448 100644 --- a/src/tezos-deps.opam +++ b/src/tezos-deps.opam @@ -24,7 +24,7 @@ depends: [ "ipv6-multicast" "irmin-watcher" (* for `irmin.unix` *) "irmin" {>= "0.12" & < "1.0" } - "lwt" {>= "2.7.0" } + "lwt" {>= "3.0.0" } "lwt_ssl" "menhir" "mtime"