CP-40716: General update of dependencies

packages/upstream-extra/dot-merlin-reader.4.1/opam → packages/upstream-extra/dot-merlin-reader.4.5/opam

@@ -1,20 +1,20 @@
 opam-version: "2.0"
 name: "dot-merlin-reader"
-version: "4.1"
+version: "4.5"
 synopsis: "Reads config files for merlin"
 description:
   "Helper process: reads .merlin files and gives the normalized content to merlin"
 maintainer: "defree@gmail.com"
 authors: "The Merlin team"
+license: "MIT"
 homepage: "https://github.com/ocaml/merlin"
 bug-reports: "https://github.com/ocaml/merlin/issues"
 depends: [
-  "ocaml" {>= "4.06.1"}
-  "dune" {>= "2.7.0"}
+  "ocaml" {>= "4.08.0" & < "5.0.0"}
+  "dune" {>= "2.9.0"}
   "yojson" {>= "1.6.0"}
   "ocamlfind" {>= "1.6.0"}
-  "csexp" {>= "1.2.3"}
-  "result" {>= "1.5"}
+  "csexp" {>= "1.5.1"}
 ]
 build: [
   ["dune" "subst"] {dev}
@@ -23,10 +23,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/merlin.git"
 url {
   src:
-    "https://github.com/ocaml/merlin/releases/download/v4.1/dot-merlin-reader-v4.1.tbz"
+    "https://github.com/ocaml/merlin/releases/download/v4.6-413/merlin-4.6-413.tbz"
   checksum: [
-    "sha256=14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd"
-    "sha512=65fd4ab08904c05651a7ef8971802ffaa428daa920765dbcf162e3c56e8047e4c9e4356daa45efccce7c73a586635c8f6cf8118fd3059789de9aff68579bd436"
+    "sha256=f3dd371f84c4e85fefd8ac355e97297571222c875bf6595882de36cd247d90ee"
+    "sha512=fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56"
   ]
 }
-x-commit-hash: "ab02f60994c81166820791b5f465f467d752b8dc"
+x-commit-hash: "2f422293d26b16ccf934d6d340c7a02f76e444c9"

packages/upstream-extra/fileutils.0.6.3/opam

@@ -24,7 +24,7 @@ homepage: "https://github.com/gildor478/ocaml-fileutils"
 doc: "https://gildor478.github.io/ocaml-fileutils/"
 bug-reports: "https://github.com/gildor478/ocaml-fileutils/issues"
 depends: [
-  "ocaml" {>= "4.03"}
+  "ocaml" {>= "4.03" & < "5.0"}
   "base-unix"
   "base-bytes"
   "stdlib-shims"

packages/upstream-extra/lambda-term.3.1.0/opam → packages/upstream-extra/lambda-term.3.3.1/opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "lambda-term"
-version: "3.1.0"
+version: "3.3.1"
 synopsis: "Terminal manipulation library for OCaml"
 description: """\
 Lambda-term is a cross-platform library for manipulating the terminal. It
@@ -10,28 +10,43 @@ to provide a higher level functional interface to terminal manipulation than,
 for example, ncurses, by providing a native OCaml interface instead of bindings
 to a C library. Lambda-term integrates with zed to provide text edition
 facilities in console applications."""
-maintainer: "jeremie@dimino.org"
+maintainer: "opam-devel@lists.ocaml.org"
 authors: "Jérémie Dimino"
 license: "BSD-3-Clause"
 homepage: "https://github.com/ocaml-community/lambda-term"
 bug-reports: "https://github.com/ocaml-community/lambda-term/issues"
 depends: [
-  "ocaml" {>= "4.02.3"}
+  "dune" {>= "3.0"}
+  "ocaml" {>= "4.08.0"}
+  "logs"
   "lwt" {>= "4.2.0"}
-  "lwt_log"
-  "react"
-  "zed" {>= "3.1.0" & < "4.0"}
-  "camomile" {>= "1.0.1"}
   "lwt_react"
   "mew_vi" {>= "0.5.0" & < "0.6.0"}
-  "dune" {>= "1.1.0"}
+  "react"
+  "zed" {>= "3.2.0" & < "4.0"}
+  "odoc" {with-doc}
 ]
 build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
 dev-repo: "git+https://github.com/ocaml-community/lambda-term.git"
 url {
-  src: "https://github.com/ocaml-community/lambda-term/archive/3.1.0.tar.gz"
-  checksum: "md5=78180c04ecfc8060b23d7d0014f24196"
+  src:
+    "https://github.com/ocaml-community/lambda-term/releases/download/3.3.1/lambda-term-3.3.1.tbz"
+  checksum: [
+    "sha256=5b77cbe096d56ae9157cb1fb55fb4e9028c89e841b1d2bfad4f13d8a1395db3c"
+    "sha512=d7968ad000c9c7e899ffb7fdd0016009f41c71d9fad4897decbe66ea24140ab1ee8428fd550c7b8016e7f6343f41e7abd53b52b5f2bf6bb85b4de64f12ac9161"
+  ]
 }
+x-commit-hash: "f6b1940863e94d437a0578e19076a342bc9b5a70"

packages/upstream-extra/lwt_react.1.1.5/opam → packages/upstream-extra/lwt_react.1.2.0/opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "lwt_react"
-version: "1.1.5"
+version: "1.2.0"
 synopsis: "Helpers for using React with Lwt"
 maintainer: "Anton Bachin <antonbachin@yahoo.com>"
 authors: "Jérémie Dimino"
@@ -11,15 +11,16 @@ bug-reports: "https://github.com/ocsigen/lwt/issues"
 depends: [
   "dune" {>= "1.8.0"}
   "lwt" {>= "3.0.0"}
-  "ocaml"
+  "ocaml" {>= "4.08"}
   "react" {>= "1.0.0"}
+  "cppo" {build & >= "1.1.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/ocsigen/lwt.git"
 url {
-  src: "https://github.com/ocsigen/lwt/archive/refs/tags/5.5.0.tar.gz"
+  src: "https://github.com/ocsigen/lwt/archive/5.6.0.tar.gz"
   checksum: [
-    "md5=94272fac89c5bf21a89c102b8a8f35a5"
-    "sha512=8951b94555e930634375816d71815b9d85daad6ffb7dab24864661504d11be26575ab0b237196c54693efa372a9b69cdc1d5068a20a250dc0bbb4a3c03c5fda1"
+    "md5=e63979ee40a80d5b9e9e5545f33323b4"
+    "sha512=d616389bc9e0da11f25843ab7541ac2d40c9543700a89455f14115b339bbe58cef2b8acf0ae97fd54e15a4cb93149cfe1ebfda301aa93933045f76b7d9344160"
   ]
 }

packages/upstream-extra/merlin.4.4-413/opam → packages/upstream-extra/merlin.4.6-413/opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "merlin"
-version: "4.4-413"
+version: "4.6-413"
 synopsis:
   "Editor helper, provides completion, typing and source browsing in Vim and Emacs"
 description:
@@ -13,15 +13,17 @@ bug-reports: "https://github.com/ocaml/merlin/issues"
 depends: [
   "ocaml" {>= "4.13" & < "4.14"}
   "dune" {>= "2.9.0"}
-  "dot-merlin-reader" {>= "4.0"}
-  "yojson" {>= "1.6.0"}
+  "dot-merlin-reader" {>= "4.2"}
+  "yojson" {>= "2.0.0"}
   "conf-jq" {with-test}
-  "csexp" {>= "1.2.3"}
-  "result" {>= "1.5"}
+  "csexp" {>= "1.5.1"}
   "menhir" {dev}
   "menhirLib" {dev}
   "menhirSdk" {dev}
 ]
+conflicts: [
+  "seq" {!= "base"}
+]
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
@@ -69,10 +71,10 @@ See https://github.com/OCamlPro/opam-user-setup"""
 dev-repo: "git+https://github.com/ocaml/merlin.git"
 url {
   src:
-    "https://github.com/ocaml/merlin/releases/download/v4.4-413/merlin-4.4-413.tbz"
+    "https://github.com/ocaml/merlin/releases/download/v4.6-413/merlin-4.6-413.tbz"
   checksum: [
-    "sha256=609edc65b23b6ead83f98af0c90180e5c8f98b0619a9257828f9f18b9f8095c6"
-    "sha512=b0bf3c7d72dfc7c70e22d60afca5b7fee71a35127839181fdb46e1e15a230e58765960548c545bbef4fdab180291c738cacb724b9ecf284eee5640ebef07c4ff"
+    "sha256=f3dd371f84c4e85fefd8ac355e97297571222c875bf6595882de36cd247d90ee"
+    "sha512=fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56"
   ]
 }
-x-commit-hash: "7607238326a9352cbee9ecf612669e28ae9fa36e"
+x-commit-hash: "2f422293d26b16ccf934d6d340c7a02f76e444c9"

packages/upstream-extra/odoc.2.1.0/opam → packages/upstream-extra/odoc.2.1.1/opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "odoc"
-version: "2.1.0"
+version: "2.1.1"
 synopsis: "OCaml documentation generator"
 description: """\
 Odoc is a documentation generator for OCaml. It reads doc comments,
@@ -20,7 +20,7 @@ homepage: "https://github.com/ocaml/odoc"
 doc: "https://ocaml.github.io/odoc/"
 bug-reports: "https://github.com/ocaml/odoc/issues"
 depends: [
-  "odoc-parser" {>= "0.9.0"}
+  "odoc-parser" {>= "0.9.0" & < "2.0.0"}
   "astring"
   "cmdliner" {>= "1.0.0"}
   "cppo" {build & >= "1.1.0"}
@@ -31,7 +31,7 @@ depends: [
   "tyxml" {>= "4.3.0"}
   "fmt"
   "ocamlfind" {with-test}
-  "yojson" {with-test}
+  "yojson" {< "2.0.0" & with-test}
   ("ocaml" {< "4.04.1" & with-test} | "sexplib0" {with-test})
   "conf-jq" {with-test}
   "ppx_expect" {with-test}
@@ -45,10 +45,10 @@ build: [
 ]
 dev-repo: "git+https://github.com/ocaml/odoc.git"
 url {
-  src: "https://github.com/ocaml/odoc/releases/download/2.1.0/odoc-2.1.0.tbz"
+  src: "https://github.com/ocaml/odoc/releases/download/2.1.1/odoc-2.1.1.tbz"
   checksum: [
-    "sha256=65a2523a50ee368164f1f24f75866a6a36cdb0d00039c3006ec824351d4e4967"
-    "sha512=cf4d7e884b94a9b9c4bcb62d4423d7289d7bbbf2642c5eacf9577b76eb835cf6ecc79d2384d36d174d2e9d8f758b5082c0c4bf8f66b5c6db4e9805dc3fc9ee1a"
+    "sha256=f574dbd28cd0fc3a2b95525c4bb95ddf6d1f6408bb4fe12157fa537884f987fd"
+    "sha512=1c545c281a7022a167f028fff8cec6fb3f2f82da0881431be74e7a4281c5353ed83bfbdb4d9d9e08af6755dbe3505c052c5e5b58cdeb08c57aed5e89c0f15e91"
   ]
 }
-x-commit-hash: "d654ee2a4ff3e1465dcf92b882c26de71f7a9986"
+x-commit-hash: "f556f10aa67f80e83d1e3e66c4b478e8efe4e18d"

packages/upstream-extra/ppx_yojson_conv_lib.v0.14.0/opam → packages/upstream-extra/ppx_yojson_conv_lib.v0.15.0/opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_yojson_conv_lib"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Runtime lib for ppx_yojson_conv"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -19,6 +19,7 @@ build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_yojson_conv_lib.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_yojson_conv_lib-v0.14.0.tar.gz"
-  checksum: "md5=e23c5593a7211ad4fb09e26e9a74698a"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_yojson_conv_lib-v0.15.0.tar.gz"
+  checksum:
+    "sha256=f9d2c5eff4566ec1f1f379b186ed22c8ddd6be0909a160bc5a9ac7abc6a6b684"
 }

packages/upstream-extra/react.1.2.1/opam → packages/upstream-extra/react.1.2.2/opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "react"
-version: "1.2.1"
+version: "1.2.2"
 synopsis: "Declarative events and signals for OCaml"
 description: """\
 Release %%VERSION%%
@@ -11,23 +11,26 @@ events and signals. React doesn't define any primitive event or
 signal, it lets the client chooses the concrete timeline.
 
 React is made of a single, independent, module and distributed under
-the ISC license."""
+the ISC license.
+
+Homepage: <http://erratique.ch/software/react>"""
 maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
-authors: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+authors: "The react programmers"
 license: "ISC"
 tags: ["reactive" "declarative" "signal" "event" "frp" "org:erratique"]
-homepage: "http://erratique.ch/software/react"
-doc: "http://erratique.ch/software/react/doc/React"
+homepage: "https://erratique.ch/software/react"
+doc: "https://erratique.ch/software/react/doc/"
 bug-reports: "https://github.com/dbuenzli/react/issues"
 depends: [
-  "ocaml" {>= "4.01.0"}
+  "ocaml" {>= "4.08.0"}
   "ocamlfind" {build}
   "ocamlbuild" {build}
-  "topkg" {build & >= "0.9.0"}
+  "topkg" {build & >= "1.0.3"}
 ]
-build: ["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{pinned}%"]
-dev-repo: "git+http://erratique.ch/repos/react.git"
+build: ["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%"]
+dev-repo: "git+https://erratique.ch/repos/react.git"
 url {
-  src: "http://erratique.ch/software/react/releases/react-1.2.1.tbz"
-  checksum: "md5=ce1454438ce4e9d2931248d3abba1fcc"
+  src: "https://erratique.ch/software/react/releases/react-1.2.2.tbz"
+  checksum:
+    "sha512=18cdd544d484222ba02db6bd9351571516532e7a1c107b59bbe39193837298f5c745eab6754f8bc6ff125b387be7018c6d6e6ac99f91925a5e4f53af688522b1"
 }

packages/upstream-extra/utop.2.9.2/opam → packages/upstream-extra/utop.2.10.0/opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "utop"
-version: "2.9.2"
+version: "2.10.0"
 synopsis: "Universal toplevel for OCaml"
 description: """\
 utop is an improved toplevel (i.e., Read-Eval-Print Loop or REPL) for
@@ -19,9 +19,10 @@ depends: [
   "base-threads"
   "ocamlfind" {>= "1.7.2"}
   "lambda-term" {>= "3.1.0" & < "4.0"}
+  "logs"
   "lwt"
   "lwt_react"
-  "camomile"
+  "zed" {>= "3.2.0"}
   "react" {>= "1.0.0"}
   "cppo" {build & >= "1.1.2"}
   "dune" {>= "1.0"}
@@ -34,9 +35,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml-community/utop.git"
 url {
   src:
-    "https://github.com/ocaml-community/utop/releases/download/2.9.2/utop-2.9.2.tbz"
+    "https://github.com/ocaml-community/utop/releases/download/2.10.0/utop-2.10.0.tbz"
   checksum: [
-    "md5=abd1c592464ce5f31b17009954040d7c"
-    "sha512=db97275aa4bd7725a9eeec6d9155c239f3e48adf8d34b73f55caa2de32fde98862480db5e05dffc89e98efd12eb60e08d89ad34b9a92a8de0d37ccb32af07ddf"
+    "sha256=475d16a2f9ea61c602ac32673ee210c76cc768f7214987d70c069532c2782d00"
+    "sha512=becbbc3b6651978bc6729631ec8a17a4e93e21d85b00af499f10caa9553166378190e6f1b2495ce4b8c2b5952f315ca88923a761067de47b614ed16d0f0d77c4"
   ]
 }
+x-commit-hash: "e56a75d2826fbe0ba3bc27a6d19fe08e02c3216d"