Skip to content

Commit

Permalink
[opam] Update opam files for 8.18 release
Browse files Browse the repository at this point in the history
  • Loading branch information
ejgallego committed Sep 14, 2023
1 parent 83c46e9 commit 4551ad1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 21 deletions.
10 changes: 4 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
COQ_BUILD_CONTEXT=../_build/default/coq

PKG_SET= \
vendor/coq/coq-core.install \
vendor/coq/coq-stdlib.install \
vendor/coq-serapi/coq-serapi.install \
coq-lsp.install
PKG_SET= coq-lsp.install

# Get the ocamlformat version from the .ocamlformat file
OCAMLFORMAT=ocamlformat.$$(awk -F = '$$1 == "version" {print $$2}' .ocamlformat)
Expand Down Expand Up @@ -55,7 +51,9 @@ vendor/coq/config/coq_config.ml:
&& cp user-contrib/Ltac2/dune.disabled user-contrib/Ltac2/dune

.PHONY: coq_boot
coq_boot: vendor/coq/config/coq_config.ml
coq_boot:
# We do nothing for released versions
# coq_boot: vendor/coq/config/coq_config.ml

.PHONY: clean
clean:
Expand Down
18 changes: 3 additions & 15 deletions coq-lsp.opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ doc: "https://ejgallego.github.io/coq-lsp/"

depends: [
"ocaml" { >= "4.11.0" }
"dune" { >= "3.5.0" & < "3.8.0" } # This is 3.2.0 for non-composed builds
"dune" { >= "3.5.0" }

# lsp dependencies
"cmdliner" { >= "1.1.0" }
Expand All @@ -31,21 +31,9 @@ depends: [
"menhir" { >= "20220210" }

# Uncomment this for releases
# "coq" { >= "8.17" < "8.18" }
# "coq-serapi" { >= "8.17" < "8.18" }
"coq" { >= "8.18" < "8.19" }
"coq-serapi" { >= "8.18" < "8.19" }

# coq deps: remove this for releases
"ocamlfind" {>= "1.8.1"}
"zarith" {>= "1.11"}

# serapi deps: remove this for releases
"ppx_deriving" { >= "4.2.1" }
"ppx_deriving_yojson" { >= "3.4" }
"ppx_import" { >= "1.5-3" }
"sexplib" { >= "v0.13.0" & < "v0.16.0" }
"ppx_sexp_conv" { >= "v0.13.0" & < "v0.16.0" }
"ppx_compare" { >= "v0.13.0" & < "v0.16.0" }
"ppx_hash" { >= "v0.13.0" & < "v0.16.0" }
]

build: [ [ "dune" "build" "-p" name "-j" jobs ] ]
Expand Down

0 comments on commit 4551ad1

Please sign in to comment.