Skip to content

Commit 9c6a246

Browse files
committed
Replace depopts lower bounds with conflicts upper bounds
Seems that opam's builtin-0install lower bounds downgrade violates the ones in depopts.
1 parent 4d0b671 commit 9c6a246

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

dune-project

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,14 @@ Goblint includes analyses for assertions, overflows, deadlocks, etc and can be e
7171
domain_shims
7272
)
7373
(depopts
74-
(apron (>= v0.9.15))
75-
(camlidl (>= 1.13)) ; for stability (https://github.com/goblint/analyzer/issues/1520)
74+
apron
7675
z3
7776
domainslib
7877
)
7978
(conflicts
8079
(result (< 1.5)) ; transitive dependency, overrides standard Result module and doesn't have map_error, bind
80+
(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
81+
(camlidl (< 1.13)) ; for stability (https://github.com/goblint/analyzer/issues/1520)
8182
(ez-conf-lib (= 1)) ; https://github.com/nberth/ez-conf-lib/issues/3
8283
)
8384
(sites

goblint.opam

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,11 @@ depends: [
7070
"domain-local-await"
7171
"domain_shims"
7272
]
73-
depopts: [
74-
"apron" {>= "v0.9.15"}
75-
"camlidl" {>= "1.13"}
76-
"z3"
77-
"domainslib"
78-
]
73+
depopts: ["apron" "z3" "domainslib"]
7974
conflicts: [
8075
"result" {< "1.5"}
76+
"apron" {< "v0.9.15"}
77+
"camlidl" {< "1.13"}
8178
"ez-conf-lib" {= "1"}
8279
]
8380
build: [

goblint.opam.locked

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ dev-repo: "git+https://github.com/goblint/analyzer.git"
135135
available: os-family != "bsd" & os-distribution != "alpine" & (arch != "arm64" | os = "macos")
136136
conflicts: [
137137
"result" {< "1.5"}
138+
"apron" {< "v0.9.15"}
139+
"camlidl" {< "1.13"}
138140
"ez-conf-lib" {= "1"}
139141
]
140142
post-messages: [

0 commit comments

Comments
 (0)