Skip to content
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: 1 addition & 1 deletion .github/workflows/lcm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ocaml-version: ["4.14.2"]
ocaml-version: ["4.14.4"]
runs-on: ["ubuntu-22.04"]
experimental: [false]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install opam
uses: ocaml/setup-ocaml@v3
with:
ocaml-compiler: "4.14.2"
ocaml-compiler: "4.14.4"
opam-repositories: |
xs-opam: "."
opam-pin: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
opam-version: "2.0"
name: "ocaml-base-compiler"
version: "4.14.2"
synopsis: "Official release 4.14.2"
version: "4.14.4"
synopsis: "Official release 4.14.4"
maintainer: [
"David Allsopp <david@tarides.com>"
"David Allsopp <dra27@dra27.uk>"
"Florian Angeletti <florian.angeletti@inria.fr>"
]
authors: "Xavier Leroy and many contributors"
license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
homepage: "https://ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
depends: [
"ocaml" {= "4.14.2" & post}
"ocaml" {= "4.14.4" & post}
"base-unix" {post}
"base-bigarray" {post}
"base-threads" {post}
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
(("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
"system-msvc")) |
("arch-x86_32" {os = "win32"} &
(("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
"system-msvc")) |
("system-mingw" | "system-msvc")) |
("arch-x86_32" {os = "win32"} & ("system-mingw" | "system-msvc")) |
"base-unix" {os != "win32" & post})
"ocaml-options-vanilla" {post}
"flexdll" {>= "0.36" & os = "win32"}
]
conflicts: ["relocatable"]
conflict-class: "ocaml-core-compiler"
flags: compiler
setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
Expand Down Expand Up @@ -53,13 +51,14 @@ install: [make "install"]
build-env: MSYS2_ARG_CONV_EXCL = "*"
dev-repo: "git+https://github.com/ocaml/ocaml#4.14"
url {
src: "https://github.com/ocaml/ocaml/archive/4.14.2.tar.gz"
src:
"https://github.com/ocaml/ocaml/releases/download/4.14.4/ocaml_4.14.4.tar.gz"
checksum:
"sha256=c2d706432f93ba85bd3383fa451d74543c32a4e84a1afaf3e8ace18f7f097b43"
"sha256=71415c000ebfce604defafaa584ab5ed10ad81ff180897db4e6fea8dac6e4b0d"
}
extra-source "ocaml-base-compiler.install" {
src:
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"
"https://raw.githubusercontent.com/ocaml/ocaml/8c17fd444391392c5f9801241374d749c080c1a8/ocaml-variants.install"
checksum: [
"sha256=79f2a1a5044a91350a0eb6ce12e261a72a2855c094c425cddf3860e58c486678"
"md5=3e969b841df1f51ca448e6e6295cb451"
Expand All @@ -68,3 +67,4 @@ extra-source "ocaml-base-compiler.install" {
x-env-path-rewrite: [
[CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
]
x-revision: "3"
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
opam-version: "2.0"
name: "ocaml-system"
version: "4.14.2"
version: "4.14.4"
synopsis: "The OCaml compiler (system version, from outside of opam)"
maintainer: [
"David Allsopp <david@tarides.com>"
"David Allsopp <dra27@dra27.uk>"
"Florian Angeletti <florian.angeletti@inria.fr>"
]
authors: "Xavier Leroy and many contributors"
license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
homepage: "https://ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
depends: [
"ocaml" {= "4.14.2" & post}
"ocaml" {= "4.14.4" & post}
"base-unix" {post}
"base-threads" {post}
"base-bigarray" {post}
Expand Down Expand Up @@ -40,9 +40,13 @@ depends: [
{?sys-ocaml-arch & sys-ocaml-arch = "i686" & sys-ocaml-libc = "msvc" &
sys-ocaml-cc = "cc" &
post}
"mingw-w64-shims"
{?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" &
os-distribution = "cygwin" &
"ocaml-env-mingw32"
{?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-arch = "i686" &
sys-ocaml-cc = "cc" &
post}
"ocaml-env-mingw64"
{?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-arch = "x86_64" &
sys-ocaml-cc = "cc" &
post}
"ocaml-env-msvc32"
{?sys-ocaml-arch & sys-ocaml-arch = "i686" & sys-ocaml-cc = "msvc" & post}
Expand All @@ -52,16 +56,17 @@ depends: [
]
conflict-class: "ocaml-core-compiler"
available:
sys-ocaml-version = "4.14.2" & (os != "win32" | sys-ocaml-libc = "msvc")
sys-ocaml-version = "4.14.4" & (os != "win32" | sys-ocaml-libc = "msvc")
flags: [compiler avoid-version]
build: ["ocaml" "gen_ocaml_config.ml"]
substs: "gen_ocaml_config.ml"
dev-repo: "git+https://github.com/ocaml/ocaml"
extra-source "gen_ocaml_config.ml.in" {
src:
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-system/gen_ocaml_config.ml.in"
"https://raw.githubusercontent.com/ocaml/ocaml/bcb802e851a1391ac6fff957d63b0edbf849225a/tools/opam/gen_ocaml-system_config.ml.in"
checksum: [
"sha256=71bcd3d35e28cbf71eda81991c8741268f4b87ced71573b2e75f64f136cebfc1"
"md5=093e7bec1ec95f9e4c6a313d73c5d840"
]
}
x-revision: "2"
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
opam-version: "2.0"
name: "ocaml"
version: "4.14.2"
version: "4.14.4"
synopsis: "The OCaml compiler (virtual package)"
description: """\
This package requires a matching implementation of OCaml,
and polls it to initialise specific variables like `ocaml:native-dynlink`"""
maintainer: "David Allsopp <david@tarides.com>"
maintainer: "David Allsopp <dra27@dra27.uk>"
authors: [
"Xavier Leroy"
"Damien Doligez"
Expand All @@ -19,10 +19,13 @@ homepage: "https://ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
depends: [
"ocaml-config" {>= "2"}
"ocaml-base-compiler" {>= "4.14.2~" & < "4.14.3~"} |
"ocaml-variants" {>= "4.14.2~" & < "4.14.3~"} |
"ocaml-system" {>= "4.14.2" & < "4.14.3~"} |
"dkml-base-compiler" {>= "4.14.2~" & < "4.14.3~"}
"ocaml-base-compiler" {>= "4.14.4~" & < "4.14.5~"} |
"ocaml-variants" {>= "4.14.4~" & < "4.14.5~"} |
"ocaml-system" {>= "4.14.4" & < "4.14.5~"} |
"dkml-base-compiler" {>= "4.14.4~" & < "4.14.5~"}
("ocaml-env-mingw64" {os = "win32"} | "ocaml-env-mingw32" {os = "win32"} |
"ocaml-env-msvc64" {os = "win32"} |
"ocaml-env-msvc32" {os = "win32"})
]
flags: conf
setenv: [
Expand All @@ -39,3 +42,4 @@ x-env-path-rewrite: [
[CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
[OCAMLTOP_INCLUDE_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
]
x-revision: "2"
2 changes: 1 addition & 1 deletion tools/xs-opam-ci.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export OCAML_VERSION="4.14"
export OCAML_VERSION_FULL="4.14.2"
export OCAML_VERSION_FULL="4.14.4"
export DISTRO="debian-10"
export BASE_REMOTE="https://github.com/xapi-project/xs-opam.git"
export BASE_REMOTE_BRANCH="6.99-lcm"
Expand Down
Loading