From 7acc2f3844f0b6cd62e8d468db62f816da70e539 Mon Sep 17 00:00:00 2001 From: Kate Date: Thu, 22 Aug 2024 12:53:24 +0100 Subject: [PATCH 1/2] Update the out-of-date opam warning after the release of opam 2.2.1 --- repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo b/repo index b83a1c52159..a5bc751d5a9 100644 --- a/repo +++ b/repo @@ -4,7 +4,7 @@ upstream: "https://github.com/ocaml/opam-repository/tree/master/" announce: [ """ [WARNING] opam is out-of-date. Please consider updating it (https://opam.ocaml.org/doc/Install.html) -""" {(opam-version >= "2.1.0~~" & opam-version < "2.1.6") | opam-version < "2.0.10" | (opam-version >= "2.2.0~~" & opam-version < "2.2.0")} +""" {(opam-version >= "2.1.0~~" & opam-version < "2.1.6") | opam-version < "2.0.10" | (opam-version >= "2.2.0~~" & opam-version < "2.2.1")} """ [INFO] opam 2.1 and 2.2 include many performance improvements over 2.0; please consider upgrading (https://opam.ocaml.org/doc/Install.html) """ {opam-version >= "2.0.10" & opam-version < "2.1.0~~"} From bd0ca603654eabbe298b375346e43b0ec8f224bd Mon Sep 17 00:00:00 2001 From: Kate Date: Thu, 22 Aug 2024 18:22:00 +0100 Subject: [PATCH 2/2] Improve the announcement message inviting to upgrade opam when using opam 2.0 Co-authored-by: Anil Madhavapeddy --- repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo b/repo index a5bc751d5a9..4d98603e60d 100644 --- a/repo +++ b/repo @@ -6,7 +6,7 @@ announce: [ [WARNING] opam is out-of-date. Please consider updating it (https://opam.ocaml.org/doc/Install.html) """ {(opam-version >= "2.1.0~~" & opam-version < "2.1.6") | opam-version < "2.0.10" | (opam-version >= "2.2.0~~" & opam-version < "2.2.1")} """ -[INFO] opam 2.1 and 2.2 include many performance improvements over 2.0; please consider upgrading (https://opam.ocaml.org/doc/Install.html) +[INFO] opam 2.1 and 2.2 include many performance and security improvements over 2.0; please consider upgrading (https://opam.ocaml.org/doc/Install.html) """ {opam-version >= "2.0.10" & opam-version < "2.1.0~~"} """ [WARNING] please ensure to have GNU patch installed as `patch`. Otherwise update may fail silently (since it can't remove files).