Skip to content

Commit 2321246

Browse files
jmidjmid
committed
Merge remote-tracking branch 'upstream/master' into qcheck-version-align
2 parents ac2e54a + 13a873c commit 2321246

File tree

119 files changed

+1884
-87
lines changed
  • packages
    • bdd/bdd.0.3
    • bechamel-js/bechamel-js.0.5.0
    • bechamel-notty/bechamel-notty.0.5.0
    • bechamel-perf/bechamel-perf.0.5.0
    • bechamel/bechamel.0.5.0
    • bencode/bencode.2.0
    • bheap/bheap.1.0.0
    • conf-python-3/conf-python-3.9.0.0
    • containers-data
      • containers-data.3.0.1
      • containers-data.3.0
      • containers-data.3.1
      • containers-data.3.2
      • containers-data.3.3
      • containers-data.3.4
      • containers-data.3.5.1
      • containers-data.3.5
      • containers-data.3.6.1
      • containers-data.3.6
      • containers-data.3.7
    • containers-thread
      • containers-thread.3.0.1
      • containers-thread.3.0
      • containers-thread.3.1
      • containers-thread.3.2
      • containers-thread.3.3
      • containers-thread.3.4
      • containers-thread.3.5.1
      • containers-thread.3.5
      • containers-thread.3.6.1
      • containers-thread.3.6
      • containers-thread.3.7
    • containers
    • dolmen
    • eio_linux/eio_linux.0.13
    • eio_main/eio_main.0.13
    • eio_posix/eio_posix.0.13
    • eio_windows/eio_windows.0.13
    • eio/eio.0.13
    • fadbadml/fadbadml.0.1.2
    • ffmpeg-avcodec/ffmpeg-avcodec.1.1.9
    • ffmpeg-avdevice/ffmpeg-avdevice.1.1.9
    • ffmpeg-avfilter/ffmpeg-avfilter.1.1.9
    • ffmpeg-avutil/ffmpeg-avutil.1.1.9
    • ffmpeg-av/ffmpeg-av.1.1.9
    • ffmpeg-swresample/ffmpeg-swresample.1.1.9
    • ffmpeg-swscale/ffmpeg-swscale.1.1.9
    • ffmpeg/ffmpeg.1.1.9
    • fmlib_browser/fmlib_browser.0.5.7
    • fmlib_js/fmlib_js.0.5.7
    • fmlib_parse/fmlib_parse.0.5.7
    • fmlib_pretty/fmlib_pretty.0.5.7
    • fmlib_std/fmlib_std.0.5.7
    • fmlib/fmlib.0.5.7
    • forester/forester.2.5.1
    • gen
    • h2-async/h2-async.0.11.0
    • h2-eio/h2-eio.0.11.0
    • h2-lwt-unix/h2-lwt-unix.0.11.0
    • h2-lwt/h2-lwt.0.11.0
    • h2-mirage/h2-mirage.0.11.0
    • h2/h2.0.11.0
    • hashset/hashset.1.0.0
    • hpack/hpack.0.11.0
    • iter
    • learn-ocaml-client/learn-ocaml-client.0.16.0
    • learn-ocaml/learn-ocaml.0.16.0
    • lwd/lwd.0.3
    • lwt-pipe/lwt-pipe.0.1
    • lwt_eio/lwt_eio.0.5
    • mdx/mdx.1.11.0
    • minisat/minisat.0.6
    • mperf/mperf.0.5.0
    • mtime
    • mtl/mtl.1.0.0
    • olinq/olinq.0.3
    • oseq
    • preface
    • pyml/pyml.20231101
    • regenerate/regenerate.0.2
    • spelll/spelll.0.3
    • sqlite3_utils
      • sqlite3_utils.0.1
      • sqlite3_utils.0.2
      • sqlite3_utils.0.3.1
      • sqlite3_utils.0.3
      • sqlite3_utils.0.4
      • sqlite3_utils.0.5
    • sqlite3/sqlite3.3.0.0
    • syslog-message
      • syslog-message.1.0.0
      • syslog-message.1.1.0
      • syslog-message.1.2.0
    • tiny_httpd
    • topiary/topiary.0.3.0
    • yaml-sexp/yaml-sexp.3.2.0
    • yaml/yaml.3.2.0
    • zmq-async/zmq-async.5.2.2
    • zmq-lwt/zmq-lwt.5.2.2
    • zmq/zmq.5.2.2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+1884
-87
lines changed

‎packages/bdd/bdd.0.3/opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build: [
1212
remove: [
1313
["ocamlfind" "-remove" "bdd"]
1414
]
15-
depends: ["ocaml" "ocamlfind" "obuild"]
15+
depends: ["ocaml" {< "5.0.0"} "ocamlfind" "obuild"]
1616
install: ["obuild" "install"]
1717
synopsis:
1818
"Quick implementation of a Binary Decision Diagrams (BDD) library for OCaml"

‎packages/bechamel-js/bechamel-js.0.5.0/opam‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
opam-version: "2.0"
2+
maintainer: "Romain Calascibetta <[email protected]>"
3+
authors: "Romain Calascibetta <[email protected]>"
4+
homepage: "https://github.com/mirage/bechamel"
5+
bug-reports: "https://github.com/mirage/bechamel/issues"
6+
dev-repo: "git+https://github.com/mirage/bechamel.git"
7+
doc: "https://mirage.github.io/bechamel/"
8+
license: "MIT"
9+
synopsis: "HTML generator for bechamel's output"
10+
description: """A simple tool to generate a standalone HTML
11+
page which shows results from bechamel's benchmarks."""
12+
13+
build: [
14+
[ "dune" "build" "-p" name "-j" jobs ]
15+
[ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
16+
]
17+
18+
depends: [
19+
"ocaml" {>= "4.08.0"}
20+
"dune" {>= "2.0.0"}
21+
"bechamel" {= version}
22+
"rresult"
23+
"json-data-encoding"
24+
"jsonm"
25+
"fmt" {>= "0.9.0"}
26+
]
27+
url {
28+
src:
29+
"https://github.com/mirage/bechamel/releases/download/v0.5.0/bechamel-0.5.0.tbz"
30+
checksum: [
31+
"sha256=2f9aa544395fa62ea067352782988bf94d977162d4d3ee6e321e49a29c5ec868"
32+
"sha512=80af7d3015fd3e63514b6241190f7fc96a1329480d98526dc426c8e24fdf2f196917a9bdae72ac7234e21b2835c38a5ac989cfc00360d9530afe52f97f58c79f"
33+
]
34+
}
35+
x-commit-hash: "e6d903bcea41542dde87c5304317357065d1762c"

‎packages/bechamel-notty/bechamel-notty.0.5.0/opam‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
opam-version: "2.0"
2+
maintainer: "Romain Calascibetta <[email protected]>"
3+
authors: "Romain Calascibetta <[email protected]>"
4+
homepage: "https://github.com/mirage/bechamel"
5+
bug-reports: "https://github.com/mirage/bechamel/issues"
6+
dev-repo: "git+https://github.com/mirage/bechamel.git"
7+
doc: "https://mirage.github.io/bechamel/"
8+
license: "MIT"
9+
synopsis: "CLI generator for bechamel's output"
10+
description: """A simple tool to generate a CLI output with notty
11+
which shows results from bechamel's benchmarks (as core_bench)."""
12+
13+
build: [
14+
[ "dune" "build" "-p" name "-j" jobs ]
15+
[ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
16+
]
17+
18+
depends: [
19+
"ocaml" {>= "4.08.0"}
20+
"dune" {>= "2.0.0"}
21+
"bechamel" {= version}
22+
"notty"
23+
"fmt" {>= "0.9.0"}
24+
]
25+
url {
26+
src:
27+
"https://github.com/mirage/bechamel/releases/download/v0.5.0/bechamel-0.5.0.tbz"
28+
checksum: [
29+
"sha256=2f9aa544395fa62ea067352782988bf94d977162d4d3ee6e321e49a29c5ec868"
30+
"sha512=80af7d3015fd3e63514b6241190f7fc96a1329480d98526dc426c8e24fdf2f196917a9bdae72ac7234e21b2835c38a5ac989cfc00360d9530afe52f97f58c79f"
31+
]
32+
}
33+
x-commit-hash: "e6d903bcea41542dde87c5304317357065d1762c"

‎packages/bechamel-perf/bechamel-perf.0.5.0/opam‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
opam-version: "2.0"
2+
maintainer: "Romain Calascibetta <[email protected]>"
3+
authors: "Romain Calascibetta <[email protected]>"
4+
homepage: "https://github.com/mirage/bechamel"
5+
bug-reports: "https://github.com/mirage/bechamel/issues"
6+
dev-repo: "git+https://github.com/mirage/bechamel.git"
7+
doc: "https://mirage.github.io/bechamel/"
8+
license: "MIT"
9+
synopsis: "Linux perf's metrics for bechamel"
10+
description: """A simple layer on Linux perf's metrics for
11+
bechamel to record and analyze them."""
12+
13+
build: [
14+
[ "dune" "build" "-p" name "-j" jobs ]
15+
[ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
16+
]
17+
18+
depends: [
19+
"ocaml" {>= "4.08.0"}
20+
"dune" {>= "2.0.0"}
21+
"mperf"
22+
"bechamel" {= version}
23+
"fmt" {>= "0.9.0"}
24+
"base-unix"
25+
]
26+
url {
27+
src:
28+
"https://github.com/mirage/bechamel/releases/download/v0.5.0/bechamel-0.5.0.tbz"
29+
checksum: [
30+
"sha256=2f9aa544395fa62ea067352782988bf94d977162d4d3ee6e321e49a29c5ec868"
31+
"sha512=80af7d3015fd3e63514b6241190f7fc96a1329480d98526dc426c8e24fdf2f196917a9bdae72ac7234e21b2835c38a5ac989cfc00360d9530afe52f97f58c79f"
32+
]
33+
}
34+
x-commit-hash: "e6d903bcea41542dde87c5304317357065d1762c"

‎packages/bechamel/bechamel.0.5.0/opam‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
opam-version: "2.0"
2+
maintainer: "Romain Calascibetta <[email protected]>"
3+
authors: "Romain Calascibetta <[email protected]>"
4+
homepage: "https://github.com/mirage/bechamel"
5+
bug-reports: "https://github.com/mirage/bechamel/issues"
6+
dev-repo: "git+https://github.com/mirage/bechamel.git"
7+
doc: "https://mirage.github.io/bechamel/"
8+
license: "MIT"
9+
synopsis: "Yet Another Benchmark in OCaml"
10+
description: """BEnchmark for a CHAMEL/camel/caml which
11+
is agnostic to the system. It's a micro-benchmark tool
12+
which lets the user to re-analyzes and prints samples."""
13+
14+
build: [
15+
[ "dune" "build" "-p" name "-j" jobs ]
16+
[ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
17+
]
18+
19+
depends: [
20+
"ocaml" {>= "4.08.0"}
21+
"dune" {>= "2.0.0"}
22+
"fmt" {>= "0.9.0"}
23+
"alcotest" {with-test}
24+
]
25+
url {
26+
src:
27+
"https://github.com/mirage/bechamel/releases/download/v0.5.0/bechamel-0.5.0.tbz"
28+
checksum: [
29+
"sha256=2f9aa544395fa62ea067352782988bf94d977162d4d3ee6e321e49a29c5ec868"
30+
"sha512=80af7d3015fd3e63514b6241190f7fc96a1329480d98526dc426c8e24fdf2f196917a9bdae72ac7234e21b2835c38a5ac989cfc00360d9530afe52f97f58c79f"
31+
]
32+
}
33+
x-commit-hash: "e6d903bcea41542dde87c5304317357065d1762c"

‎packages/bencode/bencode.2.0/opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build: [
1414
depends: [
1515
"dune"
1616
"ounit" {with-test}
17-
"qcheck" {with-test}
17+
"qcheck" {with-test & >= "0.5.3"}
1818
"odoc" {with-doc}
1919
"ocaml" { >= "4.02.0"}
2020
]

‎packages/bheap/bheap.1.0.0/opam‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ remove: [
1616
["ocamlfind" "remove" "bheap"]
1717
]
1818
depends: [
19-
"ocaml"
19+
"ocaml" {< "5.0.0"}
2020
"ocamlfind"
21-
"obuild" {build}
21+
"obuild" {build & >= "0.1"}
2222
]
2323
synopsis: "Binary heap implementation"
2424
flags: light-uninstall

‎packages/conf-python-3/conf-python-3.9.0.0/opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ depexts: [
1919
["lang/python39"] {os = "netbsd"}
2020
["python3"] {os = "freebsd"}
2121
["python39"] {os-distribution = "macports" & os = "macos"} # this will not result in a python3 command but only a python3.9 command
22-
["python@3"] {os-distribution = "homebrew" & os = "macos"}
22+
["python@3.9"] {os-distribution = "homebrew" & os = "macos"}
2323
["system:python3"] {os-distribution = "cygwinports"}
2424
]
2525
synopsis: "Virtual package relying on Python-3 installation"

‎packages/containers-data/containers-data.3.0.1/opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ depends: [
1212
"containers" { = version }
1313
"seq"
1414
"qtest" { with-test }
15-
"qcheck" { with-test }
15+
"qcheck" { with-test & >= "0.9" }
1616
"ounit" { with-test }
1717
"iter" { with-test }
1818
"gen" { with-test }

‎packages/containers-data/containers-data.3.0/opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ depends: [
1212
"containers" { = version }
1313
"seq"
1414
"qtest" { with-test }
15-
"qcheck" { with-test }
15+
"qcheck" { with-test & >= "0.9" }
1616
"ounit" { with-test }
1717
"iter" { with-test }
1818
"gen" { with-test }

0 commit comments

Comments
 (0)