From 29a2afee0b67516e1f25be3b97359b8c063177dc Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Tue, 29 Nov 2022 14:22:03 +0000 Subject: [PATCH] Update README for OCaml 5.0.0~beta2 --- Dockerfile | 6 ++---- README.md | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4c9b7a0cd..fc787ff39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,10 @@ FROM ocaml/opam:debian-11-ocaml-5.0 # Make sure we're using opam-2.1: RUN sudo ln -sf /usr/bin/opam-2.1 /usr/bin/opam -# Add the alpha repository with some required preview versions of dependencies: -RUN opam remote add alpha git+https://github.com/kit-ty-kate/opam-alpha-repository.git # Ensure opam-repository is up-to-date: -RUN cd opam-repository && git pull -q origin 7791c44928d6c1594479a50bb8051856fa2c0ca1 && opam update +RUN cd opam-repository && git pull -q origin 2b82c83694d8f1db63e504823646ffcb51562f75 && opam update # Switch to OCaml 5.0.0 (beta) -RUN opam pin remove ocaml-variants && opam install ocaml-base-compiler.5.0.0~beta1 --update-invariant +RUN opam pin remove ocaml-variants && opam install ocaml-base-compiler.5.0.0~beta2 --update-invariant # Install utop for interactive use: RUN opam install utop fmt # Install Eio's dependencies (adding just the opam files first to help with caching): diff --git a/README.md b/README.md index eeafd9091..2d88e0db1 100644 --- a/README.md +++ b/README.md @@ -109,17 +109,17 @@ Remember that you can always fall back to using Lwt libraries to provide missing ## Getting OCaml 5.0 -You'll need OCaml 5.0.0~beta1. +You'll need OCaml 5.0.0~beta2. You can either install it yourself or build the included [Dockerfile](./Dockerfile). To install it yourself: 1. Make sure you have opam 2.1 or later (run `opam --version` to check). -2. Use opam to install OCaml 5.0.0~beta1: +2. Use opam to install OCaml 5.0.0~beta2: ``` - opam switch create 5.0.0~beta1 --repo=default,alpha=git+https://github.com/kit-ty-kate/opam-alpha-repository.git + opam switch create 5.0.0~beta2 ``` ## Getting Eio