From e65a26dc12a073fc8f24503970e2c8cedb5f21c6 Mon Sep 17 00:00:00 2001 From: Stephen Sherratt Date: Fri, 14 Nov 2025 19:58:05 +1100 Subject: [PATCH] Report that the opam version is 2.2.0 while solving Certain packages require that the opam version be 2.2.0 or above, and the solver will refuse to include those packages with the current opam version baked into dune, which is 2.2.0~alpha-vendored. Signed-off-by: Stephen Sherratt --- test/blackbox-tests/test-cases/pkg/just-print-solver-env.t | 6 +++--- vendor/opam/src/core/opamVersionInfo.ml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/blackbox-tests/test-cases/pkg/just-print-solver-env.t b/test/blackbox-tests/test-cases/pkg/just-print-solver-env.t index d00141a7077..13be43a35ab 100644 --- a/test/blackbox-tests/test-cases/pkg/just-print-solver-env.t +++ b/test/blackbox-tests/test-cases/pkg/just-print-solver-env.t @@ -44,14 +44,14 @@ Add some build contexts with different environments - with-dev-setup = false - with-doc = false Solver environment for lock directory dune.linux.lock: - - opam-version = 2.2.0~alpha-vendored + - opam-version = 2.2.0 - os = linux - post = true - with-dev-setup = false - with-doc = false Solver environment for lock directory dune.linux.no-doc.lock: - arch = x86_64 - - opam-version = 2.2.0~alpha-vendored + - opam-version = 2.2.0 - os = linux - os-distribution = ubuntu - os-family = ubuntu @@ -61,7 +61,7 @@ Add some build contexts with different environments - with-dev-setup = false - with-doc = false Solver environment for lock directory dune.lock: - - opam-version = 2.2.0~alpha-vendored + - opam-version = 2.2.0 - post = true - with-dev-setup = false - with-doc = false diff --git a/vendor/opam/src/core/opamVersionInfo.ml b/vendor/opam/src/core/opamVersionInfo.ml index 6c0168d9bdf..8b0a4bd8606 100644 --- a/vendor/opam/src/core/opamVersionInfo.ml +++ b/vendor/opam/src/core/opamVersionInfo.ml @@ -1 +1 @@ -let version = "2.2.0~alpha-vendored" +let version = "2.2.0"