From 5fe8bfbb7235d41f1607476db9c1bdd4375bc0e3 Mon Sep 17 00:00:00 2001 From: Andrii Sultanov Date: Tue, 23 Jun 2026 13:11:07 +0000 Subject: [PATCH] Update OCaml to 4.14.4 Signed-off-by: Andrii Sultanov --- .github/workflows/lcm.yml | 2 +- .github/workflows/release.yml | 2 +- .../opam | 24 +++++++++---------- .../opam | 21 +++++++++------- .../ocaml/{ocaml.4.14.2 => ocaml.4.14.4}/opam | 16 ++++++++----- tools/xs-opam-ci.env | 2 +- 6 files changed, 38 insertions(+), 29 deletions(-) rename packages/ocaml-base-compiler/{ocaml-base-compiler.4.14.2 => ocaml-base-compiler.4.14.4}/opam (73%) rename packages/ocaml-system/{ocaml-system.4.14.2 => ocaml-system.4.14.4}/opam (78%) rename packages/ocaml/{ocaml.4.14.2 => ocaml.4.14.4}/opam (70%) diff --git a/.github/workflows/lcm.yml b/.github/workflows/lcm.yml index 9b855378..5a91c360 100644 --- a/.github/workflows/lcm.yml +++ b/.github/workflows/lcm.yml @@ -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] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4daf10fa..3e2ef6a3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.2/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.4/opam similarity index 73% rename from packages/ocaml-base-compiler/ocaml-base-compiler.4.14.2/opam rename to packages/ocaml-base-compiler/ocaml-base-compiler.4.14.4/opam index 4d4c053c..2f8b6d2b 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.2/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.4/opam @@ -1,9 +1,9 @@ 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 Allsopp " "Florian Angeletti " ] authors: "Xavier Leroy and many contributors" @@ -11,20 +11,18 @@ 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" @@ -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" @@ -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" diff --git a/packages/ocaml-system/ocaml-system.4.14.2/opam b/packages/ocaml-system/ocaml-system.4.14.4/opam similarity index 78% rename from packages/ocaml-system/ocaml-system.4.14.2/opam rename to packages/ocaml-system/ocaml-system.4.14.4/opam index f0a09bd5..620b8906 100644 --- a/packages/ocaml-system/ocaml-system.4.14.2/opam +++ b/packages/ocaml-system/ocaml-system.4.14.4/opam @@ -1,9 +1,9 @@ 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 Allsopp " "Florian Angeletti " ] authors: "Xavier Leroy and many contributors" @@ -11,7 +11,7 @@ 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} @@ -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} @@ -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" diff --git a/packages/ocaml/ocaml.4.14.2/opam b/packages/ocaml/ocaml.4.14.4/opam similarity index 70% rename from packages/ocaml/ocaml.4.14.2/opam rename to packages/ocaml/ocaml.4.14.4/opam index e04ed7d7..d80e1c0d 100644 --- a/packages/ocaml/ocaml.4.14.2/opam +++ b/packages/ocaml/ocaml.4.14.4/opam @@ -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 " +maintainer: "David Allsopp " authors: [ "Xavier Leroy" "Damien Doligez" @@ -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: [ @@ -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" diff --git a/tools/xs-opam-ci.env b/tools/xs-opam-ci.env index 4c4e57c9..cb335fb2 100644 --- a/tools/xs-opam-ci.env +++ b/tools/xs-opam-ci.env @@ -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"