diff --git a/Dockerfile b/Dockerfile index b393ff27..f3537a6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # STAGE 1: setup an opam switch with all dependencies installed # # (only depends on the opam files) -FROM ocamlpro/ocaml:4.14-2023-12-24 AS dev-build-context +FROM ocamlpro/ocaml:4.14-2024-01-14 AS dev-build-context # Image from https://hub.docker.com/r/ocamlpro/ocaml RUN mkdir catala diff --git a/catala.opam b/catala.opam index 89621a08..45bc5f47 100644 --- a/catala.opam +++ b/catala.opam @@ -53,6 +53,7 @@ depends: [ "cpdf" {cataladevmode} "conf-diffutils" {cataladevmode} "z3" {catalaz3mode} + "conf-ninja" ] depopts: ["z3"] conflicts: [ @@ -80,9 +81,4 @@ depexts: [ {cataladevmode & os-distribution = "alpine"} ["groff" "latex-mk" "python-pygments" "pandoc"] {cataladevmode & os-family = "arch"} - # The following should be replaced by a dependency upon `conf-ninja` once that - # is published - ["ninja-build"] {os-family = "debian" | os-family = "fedora"} - ["samurai"] {os-distribution = "alpine"} - ["ninja"] {os-family = "arch" | os-family = "suse" | os-family = "opensuse" | os-family = "bsd"} ]