Merge pull request #619 from psafont/4.14

.github/duplicates-upstream-extra.txt

@@ -1,3 +1,9 @@
 ocaml
 ocaml-base-compiler
 ocaml-system
+merlin
+merlin-dot-reader
+ocaml-lsp-server
+ocamlformat
+ocamlformat-rpc-lib
+odoc-parser

.github/duplicates-xs-toolstack.txt

@@ -1,3 +1,5 @@
 ocaml
 ocaml-base-compiler
 ocaml-system
+ocamlformat
+odoc-parser

.github/unused-upstream.txt

@@ -1,5 +1,6 @@
 bisect_ppx
 conf-perl
+either
 fix
 logs-syslog
 memtrace

.github/workflows/main.yml

@@ -15,7 +15,12 @@ jobs:
       fail-fast: false
       matrix:
         ocaml-version: ["4.13.1"]
+        experimental: [false]
+        include:
+          - ocaml-version: "4.14.1"
+            experimental: true
 
+    continue-on-error: ${{ matrix.experimental }}
     env:
       OCAML_VERSION: ${{ matrix.ocaml-version }}
 

packages/ocaml/ocaml-base-compiler.4.14.1/files/ocaml-base-compiler.install

@@ -0,0 +1 @@
+share_root: ["config.cache" {"ocaml/config.cache"}]

packages/ocaml/ocaml-base-compiler.4.14.1/opam

@@ -0,0 +1,51 @@
+opam-version: "2.0"
+name: "ocaml-base-compiler"
+version: "4.14.1"
+synopsis: "Official release 4.14.1"
+maintainer: "[email protected]"
+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.1" & post}
+  "base-unix" {post}
+  "base-bigarray" {post}
+  "base-threads" {post}
+  "ocaml-options-vanilla" {post}
+]
+conflict-class: "ocaml-core-compiler"
+flags: compiler
+setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
+build: [
+  [
+    "./configure"
+    "--prefix=%{prefix}%"
+    "--docdir=%{doc}%/ocaml"
+    "-C"
+    "CC=cc" {os = "openbsd" | os = "macos"}
+    "ASPP=cc -c" {os = "openbsd" | os = "macos"}
+  ]
+  [make "-j%{jobs}%"]
+]
+install: [make "install"]
+post-messages: [
+  """\
+A failure in the middle of the build may be caused by build parallelism
+   (enabled by default).
+   Please file a bug report at https://github.com/ocaml/opam-repository/issues"""
+    {failure & jobs > "1"}
+  """\
+You can try installing again including --jobs=1
+   to force a sequential build instead."""
+    {failure & jobs > "1" & opam-version >= "2.0.5"}
+]
+dev-repo: "git+https://github.com/ocaml/ocaml"
+extra-files: [
+  "ocaml-base-compiler.install" "md5=3e969b841df1f51ca448e6e6295cb451"
+]
+url {
+  src: "https://github.com/ocaml/ocaml/archive/4.14.1.tar.gz"
+  checksum:
+    "sha256=776006e6f0b9bcfb6d9d74381c588e587432ca85562fde93bb80472a5145b028"
+}

packages/ocaml/ocaml-system.4.14.1/files/gen_ocaml_config.ml.in

@@ -0,0 +1,43 @@
+let () =
+  let exe = ".exe" in
+  let ocamlc =
+    let (base, suffix) =
+      let s = Sys.executable_name in
+      if Filename.check_suffix s exe then
+        (Filename.chop_suffix s exe, exe)
+      else
+        (s, "") in
+    base ^ "c" ^ suffix in
+  if Sys.ocaml_version <> "%{_:version}%" then
+    (Printf.eprintf
+       "ERROR: The compiler found at %%s has version %%s,\n\
+        and this package requires %{_:version}%.\n\
+        You should use e.g. 'opam switch create %{_:name}%.%%s' \
+        instead."
+       ocamlc Sys.ocaml_version Sys.ocaml_version;
+     exit 1)
+  else
+  let ocamlc_digest = Digest.to_hex (Digest.file ocamlc) in
+  let libdir =
+    if Sys.command (ocamlc^" -where > %{_:name}%.config") = 0 then
+      let ic = open_in "%{_:name}%.config" in
+      let r = input_line ic in
+      close_in ic;
+      Sys.remove "%{_:name}%.config";
+      r
+    else
+      failwith "Bad return from 'ocamlc -where'"
+  in
+  let graphics = Filename.concat libdir "graphics.cmi" in
+  let graphics_digest =
+    if Sys.file_exists graphics then
+      Digest.to_hex (Digest.file graphics)
+    else
+      String.make 32 '0'
+  in
+  let oc = open_out "%{_:name}%.config" in
+  Printf.fprintf oc "opam-version: \"2.0\"\n\
+                     file-depends: [ [ %%S %%S ] [ %%S %%S ] ]\n\
+                     variables { path: %%S }\n"
+    ocamlc ocamlc_digest graphics graphics_digest (Filename.dirname ocamlc);
+  close_out oc

packages/ocaml/ocaml-system.4.14.1/opam

@@ -0,0 +1,24 @@
+opam-version: "2.0"
+name: "ocaml-system"
+version: "4.14.1"
+synopsis: "The OCaml compiler (system version, from outside of opam)"
+maintainer: "[email protected]"
+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" {post}
+  "base-unix" {post}
+  "base-threads" {post}
+  "base-bigarray" {post}
+]
+conflict-class: "ocaml-core-compiler"
+available: sys-ocaml-version = "4.14.1"
+flags: compiler
+build: ["ocaml" "gen_ocaml_config.ml"]
+substs: "gen_ocaml_config.ml"
+dev-repo: "git+https://github.com/ocaml/ocaml"
+extra-files: [
+  "gen_ocaml_config.ml.in" "md5=093e7bec1ec95f9e4c6a313d73c5d840"
+]

packages/ocaml/ocaml.4.14.1/opam

@@ -0,0 +1,35 @@
+opam-version: "2.0"
+name: "ocaml"
+version: "4.14.1"
+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: "[email protected]"
+authors: [
+  "Xavier Leroy"
+  "Damien Doligez"
+  "Alain Frisch"
+  "Jacques Garrigue"
+  "Didier Rémy"
+  "Jérôme Vouillon"
+]
+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-config" {>= "2"}
+  "ocaml-base-compiler" {>= "4.14.1~" & < "4.14.2~"} |
+  "ocaml-variants" {>= "4.14.1~" & < "4.14.2~"} |
+  "ocaml-system" {>= "4.14.1" & < "4.14.2~"}
+]
+flags: conf
+setenv: [
+  [CAML_LD_LIBRARY_PATH = "%{_:stubsdir}%"]
+  [CAML_LD_LIBRARY_PATH += "%{lib}%/stublibs"]
+  [OCAML_TOPLEVEL_PATH = "%{toplevel}%"]
+]
+build: [
+  "ocaml" "%{ocaml-config:share}%/gen_ocaml_config.ml" _:version _:name
+]
+build-env: CAML_LD_LIBRARY_PATH = ""

packages/upstream-extra/chrome-trace.3.7.0/opam

@@ -0,0 +1,32 @@
+opam-version: "2.0"
+name: "chrome-trace"
+version: "3.7.0"
+synopsis: "Chrome trace event generation library"
+description:
+  "This library offers no backwards compatibility guarantees. Use at your own risk."
+maintainer: "Jane Street Group, LLC <[email protected]>"
+authors: "Jane Street Group, LLC <[email protected]>"
+license: "MIT"
+homepage: "https://github.com/ocaml/dune"
+doc: "https://dune.readthedocs.io/"
+bug-reports: "https://github.com/ocaml/dune/issues"
+depends: [
+  "dune" {>= "3.5"}
+  "ocaml" {>= "4.08.0"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  ["rm" "-rf" "vendor/csexp"]
+  ["rm" "-rf" "vendor/pp"]
+  ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}]
+]
+dev-repo: "git+https://github.com/ocaml/dune.git"
+url {
+  src: "https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz"
+  checksum: [
+    "sha256=e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8"
+    "sha512=586e47ee45cd53a8c13095bde0b47de99aad9462d0a52199362140b5b654ca862597fa9f27f729a8cc594684ac46858848f9fa76f8f06dc8dc8ab8b1186a3295"
+  ]
+}
+x-commit-hash: "d3d628f2eda2278bd2df6e37452d8693f367fcfd"

packages/upstream-extra/dot-merlin-reader.4.6/opam

@@ -0,0 +1,32 @@
+opam-version: "2.0"
+name: "dot-merlin-reader"
+version: "4.6"
+synopsis: "Reads config files for merlin"
+description: """\
+Helper process: reads .merlin files and outputs the normalized content to
+  stdout."""
+maintainer: "[email protected]"
+authors: "The Merlin team"
+license: "MIT"
+homepage: "https://github.com/ocaml/merlin"
+bug-reports: "https://github.com/ocaml/merlin/issues"
+depends: [
+  "ocaml" {>= "4.08"}
+  "dune" {>= "2.9.0"}
+  "merlin-lib" {>= "4.6"}
+  "ocamlfind" {>= "1.6.0"}
+]
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-p" name "-j" jobs]
+]
+dev-repo: "git+https://github.com/ocaml/merlin.git"
+url {
+  src:
+    "https://github.com/ocaml/merlin/releases/download/v4.6-414/merlin-4.6-414.tbz"
+  checksum: [
+    "sha256=02ebd70a3c77d8940163dbe4c40774a448ed145ea84e0ad3d5ff5324410393ce"
+    "sha512=7373fadf05c692c9f054c7fe6a7d4bdfeefe237b9df432024ef9923782ee72e09021c0c3fba869da8347728105cb2d3ff0aa94b0c5eb09811bb25aa8da9fb520"
+  ]
+}
+x-commit-hash: "be753d9412387aedcf32aba88a1be9bcd33d97ba"

packages/upstream-extra/dune-rpc.3.6.2/opam

@@ -0,0 +1,36 @@
+opam-version: "2.0"
+name: "dune-rpc"
+version: "3.6.2"
+synopsis: "Communicate with dune using rpc"
+description: "Library to connect and control a running dune instance"
+maintainer: "Jane Street Group, LLC <[email protected]>"
+authors: "Jane Street Group, LLC <[email protected]>"
+license: "MIT"
+homepage: "https://github.com/ocaml/dune"
+doc: "https://dune.readthedocs.io/"
+bug-reports: "https://github.com/ocaml/dune/issues"
+depends: [
+  "dune" {>= "3.5"}
+  "csexp"
+  "ordering"
+  "dyn"
+  "xdg"
+  "stdune" {= version}
+  "pp" {>= "1.1.0"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  ["rm" "-rf" "vendor/csexp"]
+  ["rm" "-rf" "vendor/pp"]
+  ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}]
+]
+dev-repo: "git+https://github.com/ocaml/dune.git"
+url {
+  src: "https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz"
+  checksum: [
+    "sha256=b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c"
+    "sha512=d0dd69ada2f1583319a2d6f679b8d49998059117c3258805ee69ae3e71d47bfab7a9c646f19b5fc43a6ccdef934eb87de5bb81205fcd60968bed8bf1790cf0a3"
+  ]
+}
+x-commit-hash: "c939c2b0f7a470cedd189988c61cd307a3cedace"

packages/upstream-extra/dyn.3.6.2/opam

@@ -0,0 +1,33 @@
+opam-version: "2.0"
+name: "dyn"
+version: "3.6.2"
+synopsis: "Dynamic type"
+description: "Dynamic type"
+maintainer: "Jane Street Group, LLC <[email protected]>"
+authors: "Jane Street Group, LLC <[email protected]>"
+license: "MIT"
+homepage: "https://github.com/ocaml/dune"
+doc: "https://dune.readthedocs.io/"
+bug-reports: "https://github.com/ocaml/dune/issues"
+depends: [
+  "dune" {>= "3.5"}
+  "ocaml" {>= "4.08.0"}
+  "ordering" {= version}
+  "pp" {>= "1.1.0"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  ["rm" "-rf" "vendor/csexp"]
+  ["rm" "-rf" "vendor/pp"]
+  ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}]
+]
+dev-repo: "git+https://github.com/ocaml/dune.git"
+url {
+  src: "https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz"
+  checksum: [
+    "sha256=b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c"
+    "sha512=d0dd69ada2f1583319a2d6f679b8d49998059117c3258805ee69ae3e71d47bfab7a9c646f19b5fc43a6ccdef934eb87de5bb81205fcd60968bed8bf1790cf0a3"
+  ]
+}
+x-commit-hash: "c939c2b0f7a470cedd189988c61cd307a3cedace"

packages/upstream-extra/fiber.3.6.2/opam

@@ -0,0 +1,34 @@
+opam-version: "2.0"
+name: "fiber"
+version: "3.6.2"
+synopsis: "Structured concurrency library"
+description:
+  "This library offers no backwards compatibility guarantees. Use at your own risk."
+maintainer: "Jane Street Group, LLC <[email protected]>"
+authors: "Jane Street Group, LLC <[email protected]>"
+license: "MIT"
+homepage: "https://github.com/ocaml/dune"
+doc: "https://dune.readthedocs.io/"
+bug-reports: "https://github.com/ocaml/dune/issues"
+depends: [
+  "dune" {>= "3.5"}
+  "ocaml" {>= "4.08.0"}
+  "stdune" {= version}
+  "dyn" {= version}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  ["rm" "-rf" "vendor/csexp"]
+  ["rm" "-rf" "vendor/pp"]
+  ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}]
+]
+dev-repo: "git+https://github.com/ocaml/dune.git"
+url {
+  src: "https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz"
+  checksum: [
+    "sha256=b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c"
+    "sha512=d0dd69ada2f1583319a2d6f679b8d49998059117c3258805ee69ae3e71d47bfab7a9c646f19b5fc43a6ccdef934eb87de5bb81205fcd60968bed8bf1790cf0a3"
+  ]
+}
+x-commit-hash: "c939c2b0f7a470cedd189988c61cd307a3cedace"