Add dune 3.22.0 conflict due to regression

sim642 · sim642 · commit b829838e17b4 · 2026-04-24T10:30:42.000+03:00
diff --git a/dune-project b/dune-project
@@ -77,6 +77,7 @@ Goblint includes analyses for assertions, overflows, deadlocks, etc and can be e
     memtrace
   )
   (conflicts
+    (dune (>= 3.22.0)) ; TODO: remove if fixed (https://github.com/ocaml/dune/issues/14085)
     (result (< 1.5)) ; transitive dependency, overrides standard Result module and doesn't have map_error, bind
     (apron (< v0.9.15)) ; lower bounds for depopts seem to not properly constrain in builtin-0install lower-bounds job, so upper bounds for conflicts instead
     (camlidl (< 1.13)) ; for stability (https://github.com/goblint/analyzer/issues/1520)
diff --git a/goblint.opam b/goblint.opam
@@ -74,6 +74,7 @@ depends: [
 ]
 depopts: ["apron" "z3" "domainslib" "memtrace"]
 conflicts: [
+  "dune" {>= "3.22.0"}
   "result" {< "1.5"}
   "apron" {< "v0.9.15"}
   "camlidl" {< "1.13"}
diff --git a/goblint.opam.locked b/goblint.opam.locked
@@ -136,6 +136,7 @@ build: [
 dev-repo: "git+https://github.com/goblint/analyzer.git"
 available: os-family != "bsd" & os-distribution != "alpine" & (arch != "arm64" | os = "macos")
 conflicts: [
+  "dune" {>= "3.22.0"}
   "result" {< "1.5"}
   "apron" {< "v0.9.15"}
   "camlidl" {< "1.13"}

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ Goblint includes analyses for assertions, overflows, deadlocks, etc and can be e`
`77`	`77`	`memtrace`
`78`	`78`	`)`
`79`	`79`	`(conflicts`
	`80`	`+ (dune (>= 3.22.0)) ; TODO: remove if fixed (https://github.com/ocaml/dune/issues/14085)`
`80`	`81`	`(result (< 1.5)) ; transitive dependency, overrides standard Result module and doesn't have map_error, bind`
`81`	`82`	`(apron (< v0.9.15)) ; lower bounds for depopts seem to not properly constrain in builtin-0install lower-bounds job, so upper bounds for conflicts instead`
`82`	`83`	`(camlidl (< 1.13)) ; for stability (https://github.com/goblint/analyzer/issues/1520)`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ depends: [`
`74`	`74`	`]`
`75`	`75`	`depopts: ["apron" "z3" "domainslib" "memtrace"]`
`76`	`76`	`conflicts: [`
	`77`	`+ "dune" {>= "3.22.0"}`
`77`	`78`	`"result" {< "1.5"}`
`78`	`79`	`"apron" {< "v0.9.15"}`
`79`	`80`	`"camlidl" {< "1.13"}`