Bump the requirement for dune to 2.8

kit-ty-kate · kit-ty-kate · commit 9a614be7b87e · 2024-09-21T20:15:20.000+01:00
dune 2.6 has a bug that prevents opam-core from being built
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"}
 ]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-(lang dune 2.6)`
	`1`	`+(lang dune 2.8)`
`2`	`2`	`(name opam)`
`3`	`3`
`4`	`4`	`(implicit_transitive_deps true)`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ depends: [`
`35`	`35`	`"opam-repository" {= version}`
`36`	`36`	`"re" {>= "1.10.0"}`
`37`	`37`	`"cmdliner" {>= "1.1.0"}`
`38`		`- "dune" {>= "2.6.0"}`
	`38`	`+ "dune" {>= "2.8.0"}`
`39`	`39`	`]`
`40`	`40`	`conflicts: [`
`41`	`41`	`"extlib" {< "1.7.8"}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ depends: [`
`31`	`31`	`"ocaml" {>= "4.08.0"}`
`32`	`32`	`"opam-client" {= version}`
`33`	`33`	`"cmdliner" {>= "1.1.0"}`
`34`		`- "dune" {>= "2.6.0"}`
	`34`	`+ "dune" {>= "2.8.0"}`
`35`	`35`	`"conf-openssl" {with-test}`
`36`	`36`	`"conf-diffutils" {with-test}`
`37`	`37`	`]`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@ depends: [`
`32`	`32`	`"opam-core" {= version}`
`33`	`33`	`"opam-file-format" {>= "2.1.4"}`
`34`	`34`	`"re" {>= "1.9.0"}`
`35`		`- "dune" {>= "2.6.0"}`
	`35`	`+ "dune" {>= "2.8.0"}`
`36`	`36`	`]`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@ depends: [`
`33`	`33`	`"ocaml" {>= "4.08.0"}`
`34`	`34`	`"opam-format" {= version}`
`35`	`35`	`"cmdliner" {>= "0.9.8"}`
`36`		`- "dune" {>= "2.6.0"}`
	`36`	`+ "dune" {>= "2.8.0"}`
`37`	`37`	`]`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@ build: [`
`30`	`30`	`depends: [`
`31`	`31`	`"ocaml" {>= "4.08.0"}`
`32`	`32`	`"opam-format" {= version}`
`33`		`- "dune" {>= "2.6.0"}`
	`33`	`+ "dune" {>= "2.8.0"}`
`34`	`34`	`]`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ depends: [`
`34`	`34`	`"dose3" {>= "6.1"}`
`35`	`35`	`"cudf" {>= "0.7"}`
`36`	`36`	`"re" {>= "1.9.0"}`
`37`		`- "dune" {>= "2.6.0"}`
	`37`	`+ "dune" {>= "2.8.0"}`
`38`	`38`	`"opam-0install-cudf" {>= "0.5.0"}`
`39`	`39`	`]`
`40`	`40`	`depopts: [`