From 2e86b4d508e56b2affe6458ef776e20b9b4ec253 Mon Sep 17 00:00:00 2001 From: Kate Date: Sat, 6 Sep 2025 20:28:14 +0100 Subject: [PATCH 1/2] Add ocaml-system for 5.4.0 and 5.5.0 with support for dev/alpha/beta versions --- packages/ocaml-system/ocaml-system.5.4.0/opam | 60 +++++++++++++++++++ packages/ocaml-system/ocaml-system.5.5.0/opam | 60 +++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 packages/ocaml-system/ocaml-system.5.4.0/opam create mode 100644 packages/ocaml-system/ocaml-system.5.5.0/opam diff --git a/packages/ocaml-system/ocaml-system.5.4.0/opam b/packages/ocaml-system/ocaml-system.5.4.0/opam new file mode 100644 index 000000000000..c3f9ea0a1d46 --- /dev/null +++ b/packages/ocaml-system/ocaml-system.5.4.0/opam @@ -0,0 +1,60 @@ +opam-version: "2.0" +synopsis: "The OCaml compiler (system version, from outside of opam)" +maintainer: [ + "David Allsopp " + "Florian Angeletti " +] +license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" +authors: "Xavier Leroy and many contributors" +homepage: "https://ocaml.org" +bug-reports: "https://github.com/ocaml/opam-repository/issues" +dev-repo: "git+https://github.com/ocaml/ocaml" +depends: [ + # This is OCaml 5.4.0 + "ocaml" {= "5.4.0" & post} + + # General base- packages + "base-unix" {post} + "base-bigarray" {post} + "base-threads" {post} + "base-domains" {post} + "base-nnp" {post} + "base-effects" {post} + + # Architecture (Windows-only at present) + "host-arch-x86_32" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} + "host-arch-x86_64" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} + "host-arch-unknown" {os = "win32" & (!(?sys-ocaml-arch) | + sys-ocaml-arch != "i686" & + sys-ocaml-arch != "x86_64") & post} + + # System (Windows-only at present) + "host-system-mingw" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "host-system-msvc" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} + "host-system-other" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} + + # Environment configuration (Windows-only) + # NB There are not "system" distributions of OCaml on Windows; the support + # here is intended for binary caching setups, choosing to install a build + # of OCaml external to opam, but still using opam to provide the C compiler + # configuration. + "conf-mingw-w64-gcc-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "conf-mingw-w64-gcc-i686" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "conf-mingw-w64-zstd-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "conf-mingw-w64-zstd-i686" {?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" & post} + "ocaml-env-msvc32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & sys-ocaml-cc = "msvc" & post} + "ocaml-env-msvc64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & sys-ocaml-cc = "msvc" & post} +] +conflict-class: "ocaml-core-compiler" +available: sys-ocaml-version >= "5.4.0~" & sys-ocaml-version < "5.4.1~" & (os != "win32" | sys-ocaml-libc = "msvc") +flags: [compiler avoid-version] +build: ["ocaml" "gen_ocaml_config.ml"] +substs: "gen_ocaml_config.ml" +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.after-5.4.0" + checksum: [ + "sha512=8d4a601d6899c6fa6d6287eb0a110d3986cb2b531f697ab48af07066817b9d278f12383fb1e1a86f904b925825d0eaaf8925865fc87dd98f4470c4dcba8187c1" + ] +} diff --git a/packages/ocaml-system/ocaml-system.5.5.0/opam b/packages/ocaml-system/ocaml-system.5.5.0/opam new file mode 100644 index 000000000000..a77d50dafcb7 --- /dev/null +++ b/packages/ocaml-system/ocaml-system.5.5.0/opam @@ -0,0 +1,60 @@ +opam-version: "2.0" +synopsis: "The OCaml compiler (system version, from outside of opam)" +maintainer: [ + "David Allsopp " + "Florian Angeletti " +] +license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" +authors: "Xavier Leroy and many contributors" +homepage: "https://ocaml.org" +bug-reports: "https://github.com/ocaml/opam-repository/issues" +dev-repo: "git+https://github.com/ocaml/ocaml" +depends: [ + # This is OCaml 5.5.0 + "ocaml" {= "5.5.0" & post} + + # General base- packages + "base-unix" {post} + "base-bigarray" {post} + "base-threads" {post} + "base-domains" {post} + "base-nnp" {post} + "base-effects" {post} + + # Architecture (Windows-only at present) + "host-arch-x86_32" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "i686" & post} + "host-arch-x86_64" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post} + "host-arch-unknown" {os = "win32" & (!(?sys-ocaml-arch) | + sys-ocaml-arch != "i686" & + sys-ocaml-arch != "x86_64") & post} + + # System (Windows-only at present) + "host-system-mingw" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "host-system-msvc" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post} + "host-system-other" {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post} + + # Environment configuration (Windows-only) + # NB There are not "system" distributions of OCaml on Windows; the support + # here is intended for binary caching setups, choosing to install a build + # of OCaml external to opam, but still using opam to provide the C compiler + # configuration. + "conf-mingw-w64-gcc-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "conf-mingw-w64-gcc-i686" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "conf-mingw-w64-zstd-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post} + "conf-mingw-w64-zstd-i686" {?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" & post} + "ocaml-env-msvc32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & sys-ocaml-cc = "msvc" & post} + "ocaml-env-msvc64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & sys-ocaml-cc = "msvc" & post} +] +conflict-class: "ocaml-core-compiler" +available: sys-ocaml-version >= "5.5.0~" & sys-ocaml-version < "5.5.1~" & (os != "win32" | sys-ocaml-libc = "msvc") +flags: [compiler avoid-version] +build: ["ocaml" "gen_ocaml_config.ml"] +substs: "gen_ocaml_config.ml" +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.after-5.4.0" + checksum: [ + "sha512=8d4a601d6899c6fa6d6287eb0a110d3986cb2b531f697ab48af07066817b9d278f12383fb1e1a86f904b925825d0eaaf8925865fc87dd98f4470c4dcba8187c1" + ] +} From 7b1e5461573e6892e8115396f172d80b9ef38a62 Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 10 Sep 2025 15:22:04 +0100 Subject: [PATCH 2/2] [to revert before merge] make it work --- packages/ocaml-system/ocaml-system.5.4.0/opam | 2 +- packages/ocaml-system/ocaml-system.5.5.0/opam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ocaml-system/ocaml-system.5.4.0/opam b/packages/ocaml-system/ocaml-system.5.4.0/opam index c3f9ea0a1d46..21d6f6bbc5ac 100644 --- a/packages/ocaml-system/ocaml-system.5.4.0/opam +++ b/packages/ocaml-system/ocaml-system.5.4.0/opam @@ -53,7 +53,7 @@ build: ["ocaml" "gen_ocaml_config.ml"] substs: "gen_ocaml_config.ml" 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.after-5.4.0" + "https://raw.githubusercontent.com/kit-ty-kate/opam-source-archives/main/patches/ocaml-system/gen_ocaml_config.ml.in.after-5.4.0" checksum: [ "sha512=8d4a601d6899c6fa6d6287eb0a110d3986cb2b531f697ab48af07066817b9d278f12383fb1e1a86f904b925825d0eaaf8925865fc87dd98f4470c4dcba8187c1" ] diff --git a/packages/ocaml-system/ocaml-system.5.5.0/opam b/packages/ocaml-system/ocaml-system.5.5.0/opam index a77d50dafcb7..cd8ce6550a3e 100644 --- a/packages/ocaml-system/ocaml-system.5.5.0/opam +++ b/packages/ocaml-system/ocaml-system.5.5.0/opam @@ -53,7 +53,7 @@ build: ["ocaml" "gen_ocaml_config.ml"] substs: "gen_ocaml_config.ml" 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.after-5.4.0" + "https://raw.githubusercontent.com/kit-ty-kate/opam-source-archives/main/patches/ocaml-system/gen_ocaml_config.ml.in.after-5.4.0" checksum: [ "sha512=8d4a601d6899c6fa6d6287eb0a110d3986cb2b531f697ab48af07066817b9d278f12383fb1e1a86f904b925825d0eaaf8925865fc87dd98f4470c4dcba8187c1" ]