Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to opam-file-format 2.2.0 #6321

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ users)
## VCS

## Build
* Upgrade to opam-file-format 2.2.0 [#6321 @kit-ty-kate]
* Add menhir to the list of vendored packages [#6321 @kit-ty-kate]

## Infrastructure

Expand Down
2 changes: 1 addition & 1 deletion src_ext/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ifndef FETCH
endif
endif

SRC_EXTS = cppo base64 extlib re cmdliner ocamlgraph cudf dose3 opam-file-format seq stdlib-shims spdx_licenses opam-0install-cudf 0install-solver uutf jsonm sha swhid_core
SRC_EXTS = cppo base64 extlib re cmdliner ocamlgraph cudf dose3 opam-file-format seq stdlib-shims spdx_licenses opam-0install-cudf 0install-solver uutf jsonm sha swhid_core menhir

ifeq ($(MCCS_ENABLED),true)
SRC_EXTS := $(SRC_EXTS) mccs
Expand Down
7 changes: 5 additions & 2 deletions src_ext/Makefile.sources
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ MD5_opam-0install-cudf = 75419722aa839f518a25cae1b3c6efd4
URL_0install-solver = https://github.com/0install/0install/releases/download/v2.18/0install-2.18.tbz
MD5_0install-solver = 030edc9b1d3676c06d51397ffb5a737d

URL_opam-file-format = https://github.com/ocaml/opam-file-format/archive/refs/tags/2.1.6.tar.gz
MD5_opam-file-format = 706ce5fc3e77db746a4c8b11d79cefef
URL_opam-file-format = https://github.com/kit-ty-kate/opam-file-format/archive/menhir.tar.gz
MD5_opam-file-format = 39d8f84b4ff6ead0add227d5badea1f3

include Makefile.dune

Expand All @@ -56,3 +56,6 @@ MD5_sha = 08bc953d9a26380bc220b05d680791fb

URL_swhid_core = https://github.com/OCamlPro/swhid_core/archive/refs/tags/0.1.tar.gz
MD5_swhid_core = 77d88d4b1d96261c866f140c64d89af8

URL_menhir = https://gitlab.inria.fr/fpottier/menhir/-/archive/20231231/archive.tar.gz
MD5_menhir = 799748bc3b7a542798a85956c7863865