From 2ba03233f73ea9e03c0939f18962b04b1fe63991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Basile=20Cl=C3=A9ment?= Date: Tue, 9 Sep 2025 16:15:08 +0200 Subject: [PATCH] fix: Specify dolmen as dev dependency And add it to the lockfile, so that the workflows that use a lock file can build (: --- alt-ergo-lib.opam | 12 ++++++------ alt-ergo-lib.opam.locked | 20 +++++++++++++++++--- alt-ergo-lib.opam.template | 6 +++--- dune-project | 6 +++--- 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/alt-ergo-lib.opam b/alt-ergo-lib.opam index cb1297673..1c457bfc7 100644 --- a/alt-ergo-lib.opam +++ b/alt-ergo-lib.opam @@ -17,9 +17,9 @@ depends: [ "ocaml" {>= "4.08.1"} "dune" {>= "3.14"} "dune-build-info" - "dolmen" {>= "0.10"} - "dolmen_type" {>= "0.10"} - "dolmen_loop" {>= "0.10"} + "dolmen" {>= "0.10" | = "dev"} + "dolmen_type" {>= "0.10" | = "dev"} + "dolmen_loop" {>= "0.10" | = "dev"} "ocplib-simplex" {>= "0.5.1"} "zarith" {>= "1.11"} "seq" @@ -63,15 +63,15 @@ license: [ pin-depends: [ [ - "dolmen.0.11" + "dolmen.dev" "git+https://github.com/Gbury/dolmen.git#a0f1bc66e7256fff1068ac0df525a2d23c1f3ea7" ] [ - "dolmen_loop.0.11" + "dolmen_loop.dev" "git+https://github.com/Gbury/dolmen.git#a0f1bc66e7256fff1068ac0df525a2d23c1f3ea7" ] [ - "dolmen_type.0.11" + "dolmen_type.dev" "git+https://github.com/Gbury/dolmen.git#a0f1bc66e7256fff1068ac0df525a2d23c1f3ea7" ] ] diff --git a/alt-ergo-lib.opam.locked b/alt-ergo-lib.opam.locked index d283df6dd..47385decc 100644 --- a/alt-ergo-lib.opam.locked +++ b/alt-ergo-lib.opam.locked @@ -23,9 +23,9 @@ depends: [ "conf-gmp" {= "5"} "conf-pkg-config" {= "4"} "cppo" {= "1.8.0"} - "dolmen" {= "0.10"} - "dolmen_loop" {= "0.10"} - "dolmen_type" {= "0.10"} + "dolmen" {= "dev"} + "dolmen_loop" {= "dev"} + "dolmen_type" {= "dev"} "dune" {= "3.19.1"} "dune-build-info" {= "3.19.1"} "fmt" {= "0.10.0"} @@ -79,3 +79,17 @@ conflicts: [ "ppxlib" {< "0.30.0"} "result" {< "1.5"} ] +pin-depends: [ + [ + "dolmen.dev" + "git+https://github.com/Gbury/dolmen.git#a0f1bc66e7256fff1068ac0df525a2d23c1f3ea7" + ] + [ + "dolmen_loop.dev" + "git+https://github.com/Gbury/dolmen.git#a0f1bc66e7256fff1068ac0df525a2d23c1f3ea7" + ] + [ + "dolmen_type.dev" + "git+https://github.com/Gbury/dolmen.git#a0f1bc66e7256fff1068ac0df525a2d23c1f3ea7" + ] +] diff --git a/alt-ergo-lib.opam.template b/alt-ergo-lib.opam.template index 64c2bd1f6..abf8631ec 100644 --- a/alt-ergo-lib.opam.template +++ b/alt-ergo-lib.opam.template @@ -9,15 +9,15 @@ license: [ pin-depends: [ [ - "dolmen.0.11" + "dolmen.dev" "git+https://github.com/Gbury/dolmen.git#a0f1bc66e7256fff1068ac0df525a2d23c1f3ea7" ] [ - "dolmen_loop.0.11" + "dolmen_loop.dev" "git+https://github.com/Gbury/dolmen.git#a0f1bc66e7256fff1068ac0df525a2d23c1f3ea7" ] [ - "dolmen_type.0.11" + "dolmen_type.dev" "git+https://github.com/Gbury/dolmen.git#a0f1bc66e7256fff1068ac0df525a2d23c1f3ea7" ] ] diff --git a/dune-project b/dune-project index 00127a312..590d143e5 100644 --- a/dune-project +++ b/dune-project @@ -53,9 +53,9 @@ See more details on http://alt-ergo.ocamlpro.com/" (ocaml (>= 4.08.1)) dune dune-build-info - (dolmen (>= 0.10)) - (dolmen_type (>= 0.10)) - (dolmen_loop (>= 0.10)) + (dolmen (or (>= 0.10) (= dev))) + (dolmen_type (or (>= 0.10) (= dev))) + (dolmen_loop (or (>= 0.10) (= dev))) (ocplib-simplex (>= 0.5.1)) (zarith (>= 1.11)) seq