Skip to content

Commit

Permalink
Merge pull request #675 from psafont/up-next
Browse files Browse the repository at this point in the history
  • Loading branch information
psafont authored May 10, 2024
2 parents f2f5aa6 + 2ccab87 commit 18e002d
Show file tree
Hide file tree
Showing 50 changed files with 265 additions and 175 deletions.
1 change: 1 addition & 0 deletions .github/unused-upstream.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ocamlformat
ocamlformat-lib
ocp-indent
syslog-message
trace
tyre
tyxml
uuseg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "chrome-trace"
version: "3.14.0"
version: "3.15.2"
synopsis: "Chrome trace event generation library"
description:
"This library offers no backwards compatibility guarantees. Use at your own risk."
Expand All @@ -24,10 +24,10 @@ build: [
dev-repo: "git+https://github.com/ocaml/dune.git"
url {
src:
"https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
"https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
checksum: [
"sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
"sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
"sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
"sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
]
}
x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
1 change: 1 addition & 0 deletions packages/upstream-extra/conf-jq.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ flags: conf
build: ["jq" "--version"]
depexts: [
["jq"] {os-family = "debian"}
["jq"] {os-family = "ubuntu"}
["jq"] {os-distribution = "fedora"}
["jq"] {os-distribution = "rhel"}
["epel-release" "jq"] {os-distribution = "centos"}
Expand Down
2 changes: 2 additions & 0 deletions packages/upstream-extra/conf-ncurses.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ build:
os != "openbsd"}
depexts: [
["ncurses-dev"] {os-family = "debian"}
["lib64ncurses-dev"] {os-family = "ubuntu"}
["ncurses"] {os-distribution = "nixos"}
["ncurses-dev"] {os-distribution = "alpine"}
["ncurses-devel"] {os-distribution = "fedora"}
Expand All @@ -32,4 +33,5 @@ depexts: [
["ncurses-devel"] {os-family = "suse"}
["ncurses"] {os-distribution = "arch"}
["ncurses"] {os = "win32" & os-distribution = "cygwinports"}
["ncurses"] {os = "freebsd"}
]
2 changes: 2 additions & 0 deletions packages/upstream-extra/conf-ruby.1.0.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ depexts: [
["ruby"] {os-distribution = "arch"}
["ruby"] {os-distribution = "centos"}
["ruby"] {os-family = "debian"}
["ruby"] {os-family = "ubuntu"}
["ruby"] {os-distribution = "fedora"}
["dev-lang/ruby"] {os-distribution = "gentoo"}
["ruby"] {os-distribution = "homebrew" & os = "macos"}
["ruby"] {os = "freebsd"}
["ruby"] {os = "netbsd"}
["ruby"] {os-distribution = "nixos"}
["ruby"] {os = "openbsd"}
Expand Down
1 change: 1 addition & 0 deletions packages/upstream-extra/conf-xen.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ build: ["sh" "-exc" "cc -c $CFLAGS -I/usr/local/include test.c"]
depexts: [
["xen-dev"] {os-distribution = "alpine"}
["libxen-dev"] {os-family = "debian"}
["libxen-dev"] {os-family = "ubuntu"}
["xen-devel"] {os-distribution = "centos"}
["xen-devel"] {os-distribution = "fedora"}
["xen-devel"] {os-distribution = "rhel"}
Expand Down
2 changes: 1 addition & 1 deletion packages/upstream-extra/dot-merlin-reader.4.9/opam
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bug-reports: "https://github.com/ocaml/merlin/issues"
depends: [
"ocaml" {>= "4.08" & < "6.0"}
"dune" {>= "2.9.0"}
"merlin-lib" {>= "4.9"}
"merlin-lib" {>= "4.9" & < "4.14-502"}
"ocamlfind" {>= "1.6.0"}
]
build: [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "dune-rpc"
version: "3.14.0"
version: "3.15.2"
synopsis: "Communicate with dune using rpc"
description: "Library to connect and control a running dune instance"
maintainer: "Jane Street Group, LLC <opensource@janestreet.com>"
Expand Down Expand Up @@ -28,10 +28,10 @@ build: [
dev-repo: "git+https://github.com/ocaml/dune.git"
url {
src:
"https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
"https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
checksum: [
"sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
"sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
"sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
"sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
]
}
x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "ocamlc-loc"
version: "3.14.0"
version: "3.15.2"
synopsis: "Parse ocaml compiler output into structured form"
description:
"This library offers no backwards compatibility guarantees. Use at your own risk."
Expand Down Expand Up @@ -28,10 +28,10 @@ build: [
dev-repo: "git+https://github.com/ocaml/dune.git"
url {
src:
"https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
"https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
checksum: [
"sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
"sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
"sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
"sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
]
}
x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "ocamlformat-rpc-lib"
version: "0.26.1"
version: "0.26.2"
synopsis: "Auto-formatter for OCaml code (RPC mode)"
description:
"OCamlFormat is a tool to automatically format OCaml code in a uniform style. This package defines a RPC interface to OCamlFormat"
Expand Down Expand Up @@ -42,10 +42,10 @@ build: [
dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git"
url {
src:
"https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.1/ocamlformat-0.26.1.tbz"
"https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.2/ocamlformat-0.26.2.tbz"
checksum: [
"sha256=da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7"
"sha512=b7413f8dc47ba3a2372e89d59cae54f9a602ab81e31cd14ed986a831111080b79a5a3cc45dac04d8ffae5054c35bf29fe9559f145c76c87a30e191ed5400942a"
"sha256=2e4f596bf7aa367a844fe83ba0f6b0bf14b2a65179ddc082363fe9793d0375c5"
"sha512=b03d57462e65b11aa9f78dd5c4548251e8d1c5a1c9662f7502bdb10472aeb9df33c1d407350767a5223fbff9c01d53de85bafacd0274b49abc4b43701b159bee"
]
}
x-commit-hash: "6734dfc1992eb782f0a936ce3cd7c78b7c1d39d3"
x-commit-hash: "f5727b32127730a2722f86c7119eb6d8f884e26d"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "odoc-parser"
version: "2.4.1"
version: "2.4.2"
synopsis: "Parser for ocaml documentation comments"
description: """\
Odoc_parser is a library for parsing the contents of OCaml documentation
Expand Down Expand Up @@ -36,10 +36,10 @@ build: [
]
dev-repo: "git+https://github.com/ocaml/odoc.git"
url {
src: "https://github.com/ocaml/odoc/releases/download/2.4.1/odoc-2.4.1.tbz"
src: "https://github.com/ocaml/odoc/releases/download/2.4.2/odoc-2.4.2.tbz"
checksum: [
"sha256=b814a0b9020b503eb67f17d1d9a969d052b63d8cdc7cdfa5fb793b137558cedb"
"sha512=8ed2ed6ef705c00a2c90b7c57e7e5c747247e3406f1b7415a46db7cbd19d02678db40be761984d627f4fa2d9b38f696c77d8b5d40108e12563e101d07949821c"
"sha256=563cfdbb26ec8a30e737a9cf285a06e0bbae953f48e25bbb0f69f7a99c2ba40b"
"sha512=8d48c99e0c253791177dd65287ce5cee47e7c6805e33f3ae0cf6c8e7d349128f26eebbe36459c31429c11519ad5979dbe36fbcb9403a5fde199a69976a3fb3a6"
]
}
x-commit-hash: "0e671097a35ef938ea390a6bb894f25d8dc847a8"
x-commit-hash: "85644b01ca86d1061766908bba3653ced2c15ce4"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "odoc"
version: "2.4.1"
version: "2.4.2"
synopsis: "OCaml Documentation Generator"
description: """\
**odoc** is a powerful and flexible documentation generator for OCaml. It reads *doc comments*, demarcated by `(** ... *)`, and transforms them into a variety of output formats, including HTML, LaTeX, and man pages.
Expand Down Expand Up @@ -39,7 +39,7 @@ depends: [
"cppo" {build & >= "1.1.0"}
"dune" {>= "3.7.0"}
"fpath"
"ocaml" {>= "4.02.0" & < "5.2"}
"ocaml" {>= "4.02.0"}
"result"
"tyxml" {>= "4.4.0"}
"fmt"
Expand All @@ -49,7 +49,7 @@ depends: [
"conf-jq" {with-test}
"ppx_expect" {with-test}
"bos" {with-test}
"crunch" {> "1.1.0"}
"crunch" {> "2.0.0"}
("ocaml" {< "4.07.0" & with-test} | "bisect_ppx" {with-test & > "2.5.0"})
]
build: [
Expand All @@ -68,10 +68,10 @@ build: [
]
dev-repo: "git+https://github.com/ocaml/odoc.git"
url {
src: "https://github.com/ocaml/odoc/releases/download/2.4.1/odoc-2.4.1.tbz"
src: "https://github.com/ocaml/odoc/releases/download/2.4.2/odoc-2.4.2.tbz"
checksum: [
"sha256=b814a0b9020b503eb67f17d1d9a969d052b63d8cdc7cdfa5fb793b137558cedb"
"sha512=8ed2ed6ef705c00a2c90b7c57e7e5c747247e3406f1b7415a46db7cbd19d02678db40be761984d627f4fa2d9b38f696c77d8b5d40108e12563e101d07949821c"
"sha256=563cfdbb26ec8a30e737a9cf285a06e0bbae953f48e25bbb0f69f7a99c2ba40b"
"sha512=8d48c99e0c253791177dd65287ce5cee47e7c6805e33f3ae0cf6c8e7d349128f26eebbe36459c31429c11519ad5979dbe36fbcb9403a5fde199a69976a3fb3a6"
]
}
x-commit-hash: "0e671097a35ef938ea390a6bb894f25d8dc847a8"
x-commit-hash: "85644b01ca86d1061766908bba3653ced2c15ce4"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "qcheck-ounit"
version: "0.21.2"
version: "0.21.3"
synopsis: "OUnit backend for qcheck"
maintainer: "simon.cruanes.2007@m4x.org"
authors: "the qcheck contributors"
Expand All @@ -11,7 +11,6 @@ doc: "http://c-cube.github.io/qcheck/"
bug-reports: "https://github.com/c-cube/qcheck/issues"
depends: [
"dune" {>= "2.8.0"}
"base-bytes"
"base-unix"
"qcheck-core" {= version}
"ounit2"
Expand All @@ -25,9 +24,9 @@ build: [
]
dev-repo: "git+https://github.com/c-cube/qcheck.git"
url {
src: "https://github.com/c-cube/qcheck/archive/v0.21.2.tar.gz"
src: "https://github.com/c-cube/qcheck/archive/v0.21.3.tar.gz"
checksum: [
"md5=b8e3728fc1b534ee01e3c2b7e2b30bb3"
"sha512=67ff77a66ccf046dfede9123a322002f232a0a65b8ce1890795a4a4ba247bc5413f988e7cfd53412418036c2b907e4cbcd7dcd39d7f1fd2481aee60107b075cc"
"md5=8930042156873aa8dfa433d7c1bf8463"
"sha512=89d8a8a1990cfa8cd839e732f4cc89d68811ae0cc04732668e1e2691e1eb6e3c525f75936bdb261aebdaa3a8845eb717128b0bf21884bbda80d64ba957d2e6e1"
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "qcheck"
version: "0.21.2"
version: "0.21.3"
synopsis: "Compatibility package for qcheck"
maintainer: "simon.cruanes.2007@m4x.org"
authors: "the qcheck contributors"
Expand All @@ -11,7 +11,6 @@ doc: "http://c-cube.github.io/qcheck/"
bug-reports: "https://github.com/c-cube/qcheck/issues"
depends: [
"dune" {>= "2.8.0"}
"base-bytes"
"base-unix"
"qcheck-core" {= version}
"qcheck-ounit" {= version}
Expand All @@ -29,9 +28,9 @@ build: [
]
dev-repo: "git+https://github.com/c-cube/qcheck.git"
url {
src: "https://github.com/c-cube/qcheck/archive/v0.21.2.tar.gz"
src: "https://github.com/c-cube/qcheck/archive/v0.21.3.tar.gz"
checksum: [
"md5=b8e3728fc1b534ee01e3c2b7e2b30bb3"
"sha512=67ff77a66ccf046dfede9123a322002f232a0a65b8ce1890795a4a4ba247bc5413f988e7cfd53412418036c2b907e4cbcd7dcd39d7f1fd2481aee60107b075cc"
"md5=8930042156873aa8dfa433d7c1bf8463"
"sha512=89d8a8a1990cfa8cd839e732f4cc89d68811ae0cc04732668e1e2691e1eb6e3c525f75936bdb261aebdaa3a8845eb717128b0bf21884bbda80d64ba957d2e6e1"
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "xdg"
version: "3.14.0"
version: "3.15.2"
synopsis: "XDG Base Directory Specification"
description:
"https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html"
Expand All @@ -24,10 +24,10 @@ build: [
dev-repo: "git+https://github.com/ocaml/dune.git"
url {
src:
"https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
"https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
checksum: [
"sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
"sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
"sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
"sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
]
}
x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "batteries"
version: "3.7.2"
version: "3.8.0"
synopsis: "A community-maintained standard library extension"
maintainer: [
"Cedric Cellier <rixed@happyleptic.org>"
Expand All @@ -17,7 +17,7 @@ bug-reports:
"https://github.com/ocaml-batteries-team/batteries-included/issues"
depends: [
"dune" {>= "2.7"}
"ocaml" {>= "4.05" & < "5.2"}
"ocaml" {>= "4.05" & < "5.3"}
"camlp-streams"
"ocamlfind" {>= "1.5.3"}
"qtest" {with-test & >= "2.5"}
Expand Down Expand Up @@ -46,9 +46,9 @@ dev-repo:
"git+https://github.com/ocaml-batteries-team/batteries-included.git"
url {
src:
"https://github.com/ocaml-batteries-team/batteries-included/archive/refs/tags/v3.7.2.tar.gz"
"https://github.com/ocaml-batteries-team/batteries-included/archive/refs/tags/v3.8.0.tar.gz"
checksum: [
"md5=1fd7bddce07cf5d244fc9427f7b5e4d4"
"sha512=c0f2a0fdc8253e0ea999d8d4c58bfbf32b18d251a2e1d9656bf279de5f01a33e9aabac3af4d95f465f8b671e7711ebd37218043face233340a0c11b08fa62f78"
"md5=b691e5870f876c6e590d6aa51b4c5457"
"sha512=3b0643ff337cd70da8c4b77887d212e82d043a7163fca36588be12186bc86bbcf0d56b13349325f12eabb96c846204c88560786342f50af7bf4e20b9480d3964"
]
}
2 changes: 1 addition & 1 deletion packages/upstream/cohttp.5.2.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ homepage: "https://github.com/mirage/ocaml-cohttp"
doc: "https://mirage.github.io/ocaml-cohttp/"
bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
depends: [
"ocaml" {>= "4.08"}
("ocaml" {>= "4.08" & < "5.0"} | ("ocaml" {>= "5.0"} & "base-bytes"))
"dune" {>= "2.0"}
"re" {>= "1.9.0"}
"uri" {>= "2.0.0"}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "conduit-async"
version: "6.2.1"
version: "6.2.2"
synopsis: "A network connection establishment library for Async"
maintainer: "anil@recoil.org"
authors: [
Expand Down Expand Up @@ -34,10 +34,10 @@ build: [
dev-repo: "git+https://github.com/mirage/ocaml-conduit.git"
url {
src:
"https://github.com/mirage/ocaml-conduit/releases/download/v6.2.1/conduit-6.2.1.tbz"
"https://github.com/mirage/ocaml-conduit/releases/download/v6.2.2/conduit-6.2.2.tbz"
checksum: [
"sha256=59d5e7b62437be489b0b79ce11ff90ac04ef39c683e4cefca8587afdc2f55bbb"
"sha512=c8e12d843d73cc776850f1b77e805380ac64f6c81b7bc4516befdeacf4785aeb638a0ccc62d7c1990c66edda6bf679c59c93210ffefeafed9a5fa3ec1bfedeca"
"sha256=58eabf878fe2a5612f5a4f2b484ff749a5febbea3b3ceeb9af43ac235f2b2445"
"sha512=ab8ee5c2b9d879869181d5dfe111aefeefaa10063d89f21d5fc6023e8a7b83738b246dcadce7d583f5b8e918026cdb73cc66b32a8d5c2f874966fa37d5e67719"
]
}
x-commit-hash: "2977ef8b910d8283f6bd7f96305af5006ee7c7dd"
x-commit-hash: "18130daf3907388ecb03ab99192fd1ce98561ca8"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "conduit-lwt-unix"
version: "6.2.1"
version: "6.2.2"
synopsis: "A network connection establishment library for Lwt_unix"
maintainer: "anil@recoil.org"
authors: [
Expand Down Expand Up @@ -38,10 +38,10 @@ build: [
dev-repo: "git+https://github.com/mirage/ocaml-conduit.git"
url {
src:
"https://github.com/mirage/ocaml-conduit/releases/download/v6.2.1/conduit-6.2.1.tbz"
"https://github.com/mirage/ocaml-conduit/releases/download/v6.2.2/conduit-6.2.2.tbz"
checksum: [
"sha256=59d5e7b62437be489b0b79ce11ff90ac04ef39c683e4cefca8587afdc2f55bbb"
"sha512=c8e12d843d73cc776850f1b77e805380ac64f6c81b7bc4516befdeacf4785aeb638a0ccc62d7c1990c66edda6bf679c59c93210ffefeafed9a5fa3ec1bfedeca"
"sha256=58eabf878fe2a5612f5a4f2b484ff749a5febbea3b3ceeb9af43ac235f2b2445"
"sha512=ab8ee5c2b9d879869181d5dfe111aefeefaa10063d89f21d5fc6023e8a7b83738b246dcadce7d583f5b8e918026cdb73cc66b32a8d5c2f874966fa37d5e67719"
]
}
x-commit-hash: "2977ef8b910d8283f6bd7f96305af5006ee7c7dd"
x-commit-hash: "18130daf3907388ecb03ab99192fd1ce98561ca8"
Loading

0 comments on commit 18e002d

Please sign in to comment.