CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-11-08 07:51:43 +03:00
Code Issues Projects Releases Wiki Activity

Use published conf-ninja package

Browse Source 
rather than hardcode the depexts
This commit is contained in:
Louis Gesbert 2024-01-15 11:20:31 +01:00
parent 55b69b1e55
commit bb2ae885be
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -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

6
catala.opam
View File

@ -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"}
]