From 80aab0cd355ab935cb83451a14e6d2ea866a7758 Mon Sep 17 00:00:00 2001
From: Kate <kit-ty-kate@outlook.com>
Date: Sat, 21 Sep 2024 20:14:44 +0100
Subject: [PATCH] Bump the requirement for dune to 2.8

dune 2.6 has a bug that prevents opam-core from being built
---
 dune-project         | 2 +-
 master_changes.md    | 1 +
 opam-client.opam     | 2 +-
 opam-core.opam       | 2 +-
 opam-devel.opam      | 2 +-
 opam-format.opam     | 2 +-
 opam-installer.opam  | 2 +-
 opam-repository.opam | 2 +-
 opam-solver.opam     | 2 +-
 opam-state.opam      | 2 +-
 10 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/dune-project b/dune-project
index 15b75c2e8d0..e25aaf0d685 100644
--- a/dune-project
+++ b/dune-project
@@ -1,4 +1,4 @@
-(lang dune 2.6)
+(lang dune 2.8)
 (name opam)
 
 (implicit_transitive_deps true)
diff --git a/master_changes.md b/master_changes.md
index 10b180ac5a1..797601f240d 100644
--- a/master_changes.md
+++ b/master_changes.md
@@ -70,6 +70,7 @@ users)
 ## VCS
 
 ## Build
+  * Bump the requirement for dune to 2.8 [#6204 @kit-ty-kate]
 
 ## Infrastructure
 
diff --git a/opam-client.opam b/opam-client.opam
index ba8d870ca45..d0d3358aed3 100644
--- a/opam-client.opam
+++ b/opam-client.opam
@@ -35,7 +35,7 @@ depends: [
   "opam-repository" {= version}
   "re" {>= "1.10.0"}
   "cmdliner" {>= "1.1.0"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
 ]
 conflicts: [
   "extlib" {< "1.7.8"}
diff --git a/opam-core.opam b/opam-core.opam
index 57fba6b186b..e9ab6da90b8 100644
--- a/opam-core.opam
+++ b/opam-core.opam
@@ -26,7 +26,7 @@ depends: [
   "base-unix"
   "ocamlgraph"
   "re" {>= "1.9.0"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
   "sha" {>= "1.13"}
   "jsonm"
   "swhid_core"
diff --git a/opam-devel.opam b/opam-devel.opam
index a39c8985702..8bcffeda788 100644
--- a/opam-devel.opam
+++ b/opam-devel.opam
@@ -31,7 +31,7 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "opam-client" {= version}
   "cmdliner" {>= "1.1.0"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
 ]
diff --git a/opam-format.opam b/opam-format.opam
index 402b69910f4..a8e3f6a3481 100644
--- a/opam-format.opam
+++ b/opam-format.opam
@@ -32,5 +32,5 @@ depends: [
   "opam-core" {= version}
   "opam-file-format" {>= "2.1.4"}
   "re" {>= "1.9.0"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
 ]
diff --git a/opam-installer.opam b/opam-installer.opam
index 2523b72fd78..f4c5c7b8e4e 100644
--- a/opam-installer.opam
+++ b/opam-installer.opam
@@ -33,5 +33,5 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "opam-format" {= version}
   "cmdliner" {>= "0.9.8"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
 ]
diff --git a/opam-repository.opam b/opam-repository.opam
index 189d906fc50..96505f6887c 100644
--- a/opam-repository.opam
+++ b/opam-repository.opam
@@ -30,5 +30,5 @@ build: [
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-format" {= version}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
 ]
diff --git a/opam-solver.opam b/opam-solver.opam
index 00b1781b206..976771e42b3 100644
--- a/opam-solver.opam
+++ b/opam-solver.opam
@@ -34,7 +34,7 @@ depends: [
   "dose3" {>= "6.1"}
   "cudf" {>= "0.7"}
   "re" {>= "1.9.0"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
   "opam-0install-cudf" {>= "0.5.0"}
 ]
 depopts: [
diff --git a/opam-state.opam b/opam-state.opam
index 68763bfa725..85f79d0e7a5 100644
--- a/opam-state.opam
+++ b/opam-state.opam
@@ -32,5 +32,5 @@ depends: [
   "opam-repository" {= version}
   "re" {>= "1.9.0"}
   "spdx_licenses" {>= "1.0.0"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
 ]