Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ocaml-variants.5.1.1+flambda2 #26471

Merged
merged 26 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cb80c15
add ocaml-variants.5.1.1+flambda2
avsm May 23, 2024
7288185
Review suggestions
dra27 May 23, 2024
4a8a8fc
Use build-env everywhere instead of sh
dra27 May 23, 2024
b2ebe28
Put everything in ocaml-secondary-compiler
dra27 May 23, 2024
fdf0a47
Use 4.14.2 for ocaml-secondary-compiler
dra27 May 23, 2024
115cee0
support more opam versions for flambda2 variant
avsm Jun 17, 2024
715e05d
david as maintainer of menhir secondary
avsm Jun 17, 2024
5560d14
fix paths in secondary compilers with opam <2.1.5
avsm Jun 17, 2024
0c7853e
constrain 5.1.1+flambda to linux/x86_64 only until more support emerges
avsm Jun 17, 2024
f02f32d
Fix compiler version to 5.1.1minus-20
d-kalinichenko Sep 3, 2024
18c2db6
Refer to `janestreet-packages`
d-kalinichenko Sep 3, 2024
a4a14d6
Menhir 20231231
d-kalinichenko Sep 3, 2024
ea43437
Trunk JS compiler
d-kalinichenko Sep 3, 2024
2226d13
fix base-flambda2.base
d-kalinichenko Sep 3, 2024
7bac7b5
Delete packages/ocaml-variants/ocaml-variants.5.1.1+flambda2/files/li…
dkalinichenko-js Sep 3, 2024
bb3ac18
Delete packages/ocaml-variants/ocaml-variants.5.1.1+flambda2+trunk/fi…
dkalinichenko-js Sep 3, 2024
a7000b4
dune-secondary.3.16.0
dra27 Sep 5, 2024
5ee688b
Windows support for ocaml-secondary-compiler.4.14.2
dra27 Sep 5, 2024
7a5b111
Unconstrain dune-secondary
dra27 Sep 5, 2024
31df4ba
extlib is not compatible with OCaml 5.3
kit-ty-kate Sep 4, 2024
6a5ec0d
[new release] builder (0.4.0)
hannesm Sep 4, 2024
b9ace44
[new release] git (4 packages) (3.17.0)
hannesm Sep 4, 2024
ae749de
[new release] picos (8 packages) (0.5.0)
polytypic Sep 3, 2024
3cd8549
[new release] tls (6 packages) (1.0.2)
hannesm Sep 4, 2024
2a25e74
dune-secondary: conflict with ocaml<4.08
avsm Sep 5, 2024
ca4ac32
ocaml-variants for flambda2: remove unnecessary version field
avsm Sep 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions packages/base-flambda2/base-flambda2.base/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
opam-version: "2.0"
maintainer: "https://github.com/ocaml-flambda2/"
synopsis: "A pseudo library to indicate the present of Flambda2 features"
description: """
Flambda2-enhanced version of the OCaml compiler"
"""
depends: [
"ocaml-variants" {= "5.1.1+flambda2" | = "5.1.1+flambda2+trunk"}
]
53 changes: 53 additions & 0 deletions packages/builder/builder.0.4.0/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
opam-version: "2.0"
maintainer: "Robur <[email protected]>"
authors: ["Robur <[email protected]>"]
homepage: "https://github.com/robur-coop/builder"
dev-repo: "git+https://github.com/robur-coop/builder.git"
bug-reports: "https://github.com/robur-coop/builder/issues"
license: "ISC"

depends: [
"ocaml" {>= "4.13.0"}
"dune" {>= "2.0.0"}
"asn1-combinators" {>= "0.3.0"}
"bheap" {>= "2.0.0"}
"bos"
"cmdliner" {>= "1.1.0"}
"duration"
"fmt" {>= "0.8.7"}
"fpath"
"logs"
"lwt"
"ptime"
"uuidm"
"http-lwt-client" {>= "0.3.0"}
"base64"
]
build: [
["dune" "subst"] {dev}
["dune" "build" "-p" name "-j" jobs]
["sh" "-ex" "packaging/FreeBSD/create_package.sh"] {os = "freebsd"}
["sh" "-ex" "packaging/debian/create_package.sh"] {os-family = "debian"}
]

synopsis: "Scheduling and executing shell jobs"
description: """
The builder server has a schedule of jobs to be executed, stored persistently
on disk. Any number of workers can connect via TCP (using ASN.1 encoded
messages) that execute a single job -- usually contained in a sandbox (FreeBSD
jail or Docker container). A client is a command-line interface to modify the
schedule. Access control is out of scope - run it locally on your build host.
The server receives the output artifacts of each job, and either stores them
on the local file system or upload them to a remote server via http.

See https://builds.robur.coop for the live web frontend (builder-web).
"""
url {
src:
"https://github.com/robur-coop/builder/releases/download/v0.4.0/builder-0.4.0.tbz"
checksum: [
"sha256=1f178d643b23c9a24fb90cc09c034cb449ffcc49b537875d66af7455ca623609"
"sha512=d9e1c8d8ea653aaf22d25c747d4153cb3f07c33ec41be09ade025580e175503c02530a9a33f91685243f93cee04ddc33f42f006d2e2c2cc2a203e0b6690c90bf"
]
}
x-commit-hash: "fc5ea30494ebd309f66ee441a86ce8333c564dff"
49 changes: 49 additions & 0 deletions packages/dune-secondary/dune-secondary.3.16.0/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
opam-version: "2.0"
synopsis: "Fast, portable, and opinionated build system"
description: """

dune is a build system that was designed to simplify the release of
Jane Street packages. It reads metadata from "dune" files following a
very simple s-expression syntax.

dune is fast, has very low-overhead, and supports parallel builds on
all platforms. It has no system dependencies; all you need to build
dune or packages using dune is OCaml. You don't need make or bash
as long as the packages themselves don't use bash explicitly.

dune supports multi-package development by simply dropping multiple
repositories into the same directory.

It also supports multi-context builds, such as building against
several opam roots/switches simultaneously. This helps maintaining
packages across several versions of OCaml and gives cross-compilation
for free.
"""
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"
dev-repo: "git+https://github.com/ocaml/dune.git"
build-env: [PATH += "%{ocaml-secondary-compiler:share}%/bin"]
build: [
["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin:$PATH ocaml boot/bootstrap.ml -j %{jobs}%"] { opam-version < "2.1.5"}
["ocaml" "boot/bootstrap.ml" "-j" jobs] { opam-version >= "2.1.5" }
["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin:$PATH ./_boot/dune.exe build dune.install --release --profile dune-bootstrap -j %{jobs}%" ] { opam-version < "2.1.5" }
["./_boot/dune.exe" "build" "dune.install" "--release" "--profile" "dune-bootstrap" "-j" jobs] { opam-version >= "2.1.5" }
]
install: [
["./_boot/dune.exe" "install" "dune" "--prefix" "%{ocaml-secondary-compiler:share}%"] { opam-version >= "2.1.5" }
["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin:$PATH ./_boot/dune.exe install dune --prefix %{ocaml-secondary-compiler:share}%"] { opam-version < "2.1.5" }
]
depends: [
"ocaml-secondary-compiler" {>="4.14.2"}
]
url {
src: "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz"
checksum: [
"sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6"
"sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc"
]
}
61 changes: 61 additions & 0 deletions packages/dune-secondary/dune-secondary.3.8.1/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
opam-version: "2.0"
synopsis: "Fast, portable, and opinionated build system"
description: """

dune is a build system that was designed to simplify the release of
Jane Street packages. It reads metadata from "dune" files following a
very simple s-expression syntax.

dune is fast, has very low-overhead, and supports parallel builds on
all platforms. It has no system dependencies; all you need to build
dune or packages using dune is OCaml. You don't need make or bash
as long as the packages themselves don't use bash explicitly.

dune supports multi-package development by simply dropping multiple
repositories into the same directory.

It also supports multi-context builds, such as building against
several opam roots/switches simultaneously. This helps maintaining
packages across several versions of OCaml and gives cross-compilation
for free.
"""
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"
conflicts: [
"ocaml" {<"4.08"}
"merlin" {< "3.4.0"}
"ocaml-lsp-server" {< "1.3.0"}
"dune-configurator" {< "2.3.0"}
"odoc" {< "2.0.1"}
"dune-release" {< "1.3.0"}
"js_of_ocaml-compiler" {< "3.6.0"}
"jbuilder" {= "transition"}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
build-env: [PATH += "%{ocaml-secondary-compiler:share}%/bin"]
build: [
["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin:$PATH ocaml boot/bootstrap.ml -j %{jobs}%"] { opam-version < "2.1.5"}
["ocaml" "boot/bootstrap.ml" "-j" jobs] { opam-version >= "2.1.5" }
["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin:$PATH ./_boot/dune.exe build dune.install --release --profile dune-bootstrap -j %{jobs}%" ] { opam-version < "2.1.5" }
["./_boot/dune.exe" "build" "dune.install" "--release" "--profile" "dune-bootstrap" "-j" jobs] { opam-version >= "2.1.5" }
]
install: [
["./_boot/dune.exe" "install" "dune" "--prefix" "%{ocaml-secondary-compiler:share}%"] { opam-version >= "2.1.5" }
["sh" "-exc" "PATH=%{ocaml-secondary-compiler:share}%/bin:$PATH ./_boot/dune.exe install dune --prefix %{ocaml-secondary-compiler:share}%"] { opam-version < "2.1.5" }
]
depends: [
"ocaml-secondary-compiler" {>="4.14.1"}
"base-unix"
"base-threads"
]
url {
src: "https://github.com/ocaml/dune/releases/download/3.8.1/dune-3.8.1.tbz"
checksum: [
"sha256=9413a5d6eb9d7968a0463debb9d9f1be73025345809b827978d0c14db76cf914"
"sha512=6857b64e7ca8ba452937539d5996c8d0941b25d82313cfad9e1e6b835a04fb86605beccdc86400cc705ad6a969171524091ab6981df87629b542cc172b38746b"
]
}
2 changes: 1 addition & 1 deletion packages/extlib/extlib.1.7.9/opam
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ doc: "https://ygrek.org/p/extlib/doc/"
bug-reports: "https://github.com/ygrek/ocaml-extlib/issues"
depends: [
"dune" {>= "1.0"}
"ocaml" {>= "4.02"}
"ocaml" {>= "4.02" & < "5.3"}
"cppo" {build}
]
build: [
Expand Down
61 changes: 61 additions & 0 deletions packages/git-mirage/git-mirage.3.17.0/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
opam-version: "2.0"
synopsis: "A package to use ocaml-git with MirageOS backend"
maintainer: ["[email protected]" "[email protected]"]
authors: "Thomas Gazagnaire"
license: "ISC"
homepage: "https://github.com/mirage/ocaml-git"
doc: "https://mirage.github.io/ocaml-git/"
bug-reports: "https://github.com/mirage/ocaml-git/issues"
depends: [
"ocaml" {>= "4.08.0"}
"dune" {>= "2.8.0"}
"mimic"
"mimic-happy-eyeballs" {>= "0.0.5"}
"base64" {>= "3.5.0"}
"git" {= version}
"git-paf" {= version}
"awa" {>= "0.2.0"}
"awa-mirage" {>= "0.2.0"}
"dns" {>= "6.1.3"}
"dns-client" {>= "6.1.3"}
"tls" {>= "1.0.0"}
"tls-mirage" {>= "1.0.0"}
"uri"
"happy-eyeballs-mirage" {>= "0.1.2"}
"happy-eyeballs" {>= "0.1.2"}
"ca-certs-nss"
"mirage-crypto" {>= "1.0.0"}
"ptime"
"x509" {>= "1.0.0"}
"cstruct"
"tcpip" {>= "7.0.0"}
"domain-name" {>= "0.3.0"}
"fmt" {>= "0.8.9"}
"ipaddr" {>= "5.0.1"}
"lwt" {>= "5.3.0"}
"mirage-clock" {>= "3.1.0"}
"mirage-flow" {>= "4.0.0"}
"mirage-time" {>= "2.0.1"}
"rresult" {>= "0.7.0"}
"alcotest" {>= "1.2.3" & with-test}
"alcotest-lwt" {>= "1.2.3" & with-test}
"bigstringaf" {>= "0.9.0" & with-test}
"cstruct" {>= "6.0.0" & with-test}
"logs" {>= "0.7.0" & with-test}
"ke" {>= "0.4" & with-test}
]
conflicts: [ "result" {< "1.5"} ]
build: [
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs "--no-buffer"] {with-test}
]
dev-repo: "git+https://github.com/mirage/ocaml-git.git"
url {
src:
"https://github.com/mirage/ocaml-git/releases/download/3.17.0/git-3.17.0.tbz"
checksum: [
"sha256=ef200d0412ed1a538525d0501298890e0b893e020528094d6a3ae12359fd0265"
"sha512=793009a9bf9413147e6c43dfdc4bbe39b00129a5ea0f5d3df149ad2e27b4a3c641ca3b6857476a1cee325aad4d192625220647575470f00d02fb95f085bd9009"
]
}
x-commit-hash: "fd2b5c8b4125fa9091b1e51eb9082395f20af9f9"
46 changes: 46 additions & 0 deletions packages/git-paf/git-paf.3.17.0/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
opam-version: "2.0"
synopsis: "A package to use HTTP-based ocaml-git with MirageOS backend"
maintainer: ["[email protected]" "[email protected]"]
authors: "Thomas Gazagnaire"
license: "ISC"
homepage: "https://github.com/mirage/ocaml-git"
doc: "https://mirage.github.io/ocaml-git/"
bug-reports: "https://github.com/mirage/ocaml-git/issues"
depends: [
"ocaml" {>= "4.08.0"}
"dune" {>= "2.8.0"}
"git" {= version}
"mimic" {>= "0.0.4"}
"paf" {>= "0.7.0"}
"ca-certs-nss"
"fmt"
"ipaddr"
"logs"
"lwt"
"mirage-clock"
"tcpip" {>= "7.0.0"}
"mirage-time"
"rresult" {>= "0.7.0"}
"tls" {>= "1.0.0"}
"uri"
"bigstringaf"
"domain-name"
"httpaf"
"mirage-flow" {>= "4.0.0"}
"tls-mirage" {>= "1.0.0"}
]
conflicts: [ "result" {< "1.5"} ]
build: [
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs "--no-buffer"] {with-test}
]
dev-repo: "git+https://github.com/mirage/ocaml-git.git"
url {
src:
"https://github.com/mirage/ocaml-git/releases/download/3.17.0/git-3.17.0.tbz"
checksum: [
"sha256=ef200d0412ed1a538525d0501298890e0b893e020528094d6a3ae12359fd0265"
"sha512=793009a9bf9413147e6c43dfdc4bbe39b00129a5ea0f5d3df149ad2e27b4a3c641ca3b6857476a1cee325aad4d192625220647575470f00d02fb95f085bd9009"
]
}
x-commit-hash: "fd2b5c8b4125fa9091b1e51eb9082395f20af9f9"
61 changes: 61 additions & 0 deletions packages/git-unix/git-unix.3.17.0/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
opam-version: "2.0"
synopsis: "Virtual package to install and configure ocaml-git's Unix backend"
maintainer: ["[email protected]" "[email protected]"]
authors: "Thomas Gazagnaire"
license: "ISC"
homepage: "https://github.com/mirage/ocaml-git"
doc: "https://mirage.github.io/ocaml-git/"
bug-reports: "https://github.com/mirage/ocaml-git/issues"
depends: [
"ocaml" {>= "4.08.0"}
"dune" {>= "2.8.0"}
"git" {= version}
"git-mirage" {= version}
"happy-eyeballs-lwt" {>= "0.1.2"}
"rresult" {>= "0.7.0"}
"bigstringaf" {>= "0.9.0"}
"fmt" {>= "0.8.7"}
"bos"
"fpath"
"uri" {with-test}
"digestif" {>= "1.1.2"}
"logs"
"lwt" {>= "5.6.0"}
"base-unix"
"carton" {>= "0.7.2"}
"alcotest" {with-test & >= "1.1.0"}
"alcotest-lwt" {with-test & >= "1.1.0"}
"base64" {with-test & >= "3.0.0"}
"mirage-clock" {>= "4.1.0"}
"mirage-clock-unix" {>= "4.1.0"}
"astring" {>= "0.8.5"}
"mirage-time" {>= "2.0.0"}
"mirage-unix" {>= "5.0.0"}
"cmdliner" {>= "1.1.0"}
"decompress" {>= "1.4.0"}
"domain-name" {>= "0.3.0"}
"ipaddr" {>= "5.0.1"}
"mtime" {>= "1.2.0"}
"tcpip" {>= "7.0.0"}
"cstruct" {>= "6.0.0"}
"mirage-flow" {>= "4.0.0"}
"ke" {>= "0.4" & with-test}
"mirage-crypto-rng" {>= "1.0.0" & with-test}
"mimic" {>= "0.0.8"}
"tls" {>= "1.0.0"}
]
conflicts: [ "result" {< "1.5"} ]
build: [
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs "--no-buffer"] {with-test & os != "macos"}
]
dev-repo: "git+https://github.com/mirage/ocaml-git.git"
url {
src:
"https://github.com/mirage/ocaml-git/releases/download/3.17.0/git-3.17.0.tbz"
checksum: [
"sha256=ef200d0412ed1a538525d0501298890e0b893e020528094d6a3ae12359fd0265"
"sha512=793009a9bf9413147e6c43dfdc4bbe39b00129a5ea0f5d3df149ad2e27b4a3c641ca3b6857476a1cee325aad4d192625220647575470f00d02fb95f085bd9009"
]
}
x-commit-hash: "fd2b5c8b4125fa9091b1e51eb9082395f20af9f9"
Loading
Loading