Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/alcotest/alcotest.1.9.0+ox/opam
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ depends: [
"cmdliner" {with-test & < "2.0.0"}
"re" {= "1.14.0+ox"}
"stdlib-shims"
"uutf" {= "1.0.3+ox"}
"uutf" {= "1.0.4+ox"}
"ocaml-syntax-shims"
"odoc" {with-doc}
]
Expand Down
4 changes: 2 additions & 2 deletions packages/async_ssl/async_ssl.v0.18~preview.130.76+222/opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ depends: [
"ppx_optcomp" {= "v0.18~preview.130.76+222"}
"stdio" {= "v0.18~preview.130.76+222"}
"conf-libssl"
"ctypes" {= "0.23.0+ox"}
"ctypes-foreign" {= "0.23.0+ox"}
"ctypes" {= "0.24.0+ox"}
"ctypes-foreign" {= "0.24.0+ox"}
"dune" {>= "3.17.0"}
"dune-configurator"
"integers"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/src/ctypes/ctypes_memory.ml
+++ b/src/ctypes/ctypes_memory.ml
@@ -301,7 +301,7 @@
ba_repr: f;
bigarray: b;
carray: c;
- dims: d > bigarray_class -> b -> (a, f) Bigarray.kind =
+ dims: d > bigarray_class -> b @ immutable -> (a, f) Bigarray.kind =
function
| Genarray -> Genarray.kind
| Array1 -> Array1.kind
59 changes: 59 additions & 0 deletions packages/ctypes-foreign/ctypes-foreign.0.24.0+ox/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
opam-version: "2.0"
synopsis: "Dynamic access to foreign C libraries using Ctypes"
description: """

This installs the `ctypes-foreign` interface which
uses `libffi` to provide dynamic access to foreign libraries."""
maintainer: ["Jeremy Yallop <yallop@gmail.com>"]
authors: ["Jeremy Yallop"]
license: "MIT"
tags: ["org:mirage"]
homepage: "https://github.com/yallop/ocaml-ctypes"
doc: "https://yallop.github.io/ocaml-ctypes/"
bug-reports: "https://github.com/yallop/ocaml-ctypes/issues"
depends: [
"dune" {>= "3.9"}
"ocaml" {>= "4.07.0"}
"integers" {with-test & >= "0.2.2"}
"ctypes" {= version}
"dune-configurator"
"conf-pkg-config"
"lwt" {with-test & >= "2.4.7"}
"ounit2" {with-test}
"conf-ncurses" {with-test}
"conf-fts" {with-test & os != "win32"}
"conf-libffi" {>= "2.0.0"}
"odoc" {with-doc}
]
build: [
["dune" "subst"] {dev}
[
"dune"
"build"
"-p"
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/yallop/ocaml-ctypes.git"
url {
src:
"https://github.com/yallop/ocaml-ctypes/archive/refs/tags/0.24.0.tar.gz"
checksum: [
"sha256=249c5604c8554659761a7282db4ad200aa8c0fdc408cdb53102bd70feeb51955"
"md5=064316aaf508a9db203f114bb8401dee"
]
}
patches: ["bigarray.patch"]
extra-files: [
[
"bigarray.patch"
"sha256=c5d59b4624382cd61ff8da5c9ec3153ada0880efc43fbb2a20491984bd509a3e"
]
]
11 changes: 11 additions & 0 deletions packages/ctypes/ctypes.0.24.0+ox/files/bigarray.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/src/ctypes/ctypes_memory.ml
+++ b/src/ctypes/ctypes_memory.ml
@@ -301,7 +301,7 @@
ba_repr: f;
bigarray: b;
carray: c;
- dims: d > bigarray_class -> b -> (a, f) Bigarray.kind =
+ dims: d > bigarray_class -> b @ immutable -> (a, f) Bigarray.kind =
function
| Genarray -> Genarray.kind
| Array1 -> Array1.kind
72 changes: 72 additions & 0 deletions packages/ctypes/ctypes.0.24.0+ox/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
opam-version: "2.0"
synopsis: "Combinators for binding to C libraries without writing any C"
description: """

ctypes is a library for binding to C libraries using pure OCaml. The primary
aim is to make writing C extensions as straightforward as possible.
The core of ctypes is a set of combinators for describing the structure of C
types -- numeric types, arrays, pointers, structs, unions and functions. You
can use these combinators to describe the types of the functions that you want
to call, then bind directly to those functions -- all without writing or
generating any C!

To install the optional `ctypes-foreign` interface (which uses `libffi` to
provide dynamic access to foreign libraries), you will need to also install
the `ctypes-foreign` package.

opam install ctypes-foreign

This will make the `ctypes-foreign` ocamlfind subpackage available."""
maintainer: ["Jeremy Yallop <yallop@gmail.com>"]
authors: ["Jeremy Yallop"]
license: "MIT"
tags: ["org:mirage"]
homepage: "https://github.com/yallop/ocaml-ctypes"
doc: "https://yallop.github.io/ocaml-ctypes/"
bug-reports: "https://github.com/yallop/ocaml-ctypes/issues"
depends: [
"dune" {>= "3.9"}
"ocaml" {>= "4.07.0"}
"integers"
"dune-configurator"
"ounit2" {with-test}
"conf-fts" {with-test & os != "win32"}
"conf-pkg-config" {with-test}
"odoc" {with-doc}
]
build: [
["dune" "subst"] {dev}
[
"dune"
"build"
"-p"
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/yallop/ocaml-ctypes.git"
url {
src:
"https://github.com/yallop/ocaml-ctypes/archive/refs/tags/0.24.0.tar.gz"
checksum: [
"sha256=249c5604c8554659761a7282db4ad200aa8c0fdc408cdb53102bd70feeb51955"
"md5=064316aaf508a9db203f114bb8401dee"
]
}
conflicts: [
"host-system-msvc"
]
x-maintenance-intent: ["(any).(any).(latest)"]
patches: ["bigarray.patch"]
extra-files: [
[
"bigarray.patch"
"sha256=c5d59b4624382cd61ff8da5c9ec3153ada0880efc43fbb2a20491984bd509a3e"
]
]
2 changes: 1 addition & 1 deletion packages/eio/eio.1.3+ox/opam
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@ x-extra-doc-deps: [
]
url {
src:
"git+https://github.com/oxcaml/eio.git#e6823784545a453af81493f744ddb2e73b8ea10a"
"git+https://github.com/oxcaml/eio.git#7de26f5331f1e7aac1c086a5ebe849dd940b5c3e"
}
2 changes: 1 addition & 1 deletion packages/eio_linux/eio_linux.1.3+ox/opam
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ x-extra-doc-deps: [
]
url {
src:
"git+https://github.com/oxcaml/eio.git#e6823784545a453af81493f744ddb2e73b8ea10a"
"git+https://github.com/oxcaml/eio.git#7de26f5331f1e7aac1c086a5ebe849dd940b5c3e"
}
2 changes: 1 addition & 1 deletion packages/eio_main/eio_main.1.3+ox/opam
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ x-extra-doc-deps: [
]
url {
src:
"git+https://github.com/oxcaml/eio.git#e6823784545a453af81493f744ddb2e73b8ea10a"
"git+https://github.com/oxcaml/eio.git#7de26f5331f1e7aac1c086a5ebe849dd940b5c3e"
}
2 changes: 1 addition & 1 deletion packages/eio_posix/eio_posix.1.3+ox/opam
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ x-extra-doc-deps: [
]
url {
src:
"git+https://github.com/oxcaml/eio.git#e6823784545a453af81493f744ddb2e73b8ea10a"
"git+https://github.com/oxcaml/eio.git#7de26f5331f1e7aac1c086a5ebe849dd940b5c3e"
}
4 changes: 2 additions & 2 deletions packages/hardcaml_c/hardcaml_c.v0.18~preview.130.76+222/opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ depends: [
"ppx_hardcaml" {= "v0.18~preview.130.76+222"}
"ppx_jane" {= "v0.18~preview.130.76+222"}
"ppx_rope" {= "v0.18~preview.130.76+222"}
"ctypes" {= "0.23.0+ox"}
"ctypes-foreign" {= "0.23.0+ox"}
"ctypes" {= "0.24.0+ox"}
"ctypes-foreign" {= "0.24.0+ox"}
"dune" {>= "3.17.0"}
]
available: arch != "arm32" & arch != "x86_32"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ depends: [
"ppx_hardcaml" {= "v0.18~preview.130.76+222"}
"ppx_jane" {= "v0.18~preview.130.76+222"}
"stdio" {= "v0.18~preview.130.76+222"}
"ctypes" {= "0.23.0+ox"}
"ctypes-foreign" {= "0.23.0+ox"}
"ctypes" {= "0.24.0+ox"}
"ctypes-foreign" {= "0.24.0+ox"}
"dune" {>= "3.17.0"}
]
available: arch != "arm32" & arch != "x86_32"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ depends: [
"ppxlib" {= "0.33.0+ox"}
"re" {with-test & = "1.14.0+ox"}
"cmdliner" {>= "1.1.0"}
"sedlex" {= "3.6+ox"}
"sedlex" {= "3.7+ox"}
"qcheck" {with-test}
"menhir"
"menhirLib"
Expand Down
2 changes: 1 addition & 1 deletion packages/lsp/lsp.1.19.0+ox/opam
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ depends: [
"ppx_yojson_conv"
"cinaps" {with-test}
"ppx_expect" {with-test}
"uutf" {= "1.0.3+ox"}
"uutf" {= "1.0.4+ox"}
"odoc" {with-doc}
"ocaml" {>= "4.14"}
]
Expand Down
2 changes: 1 addition & 1 deletion packages/notty-community/notty-community.0.2.4+ox/opam
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ depends: [
"dune" {>= "3.0"}
"ocaml" {>= "4.08.0"}
"cppo" {build & >= "1.1.0"}
"uutf" {= "1.0.3+ox"}
"uutf" {= "1.0.4+ox"}
"uucp" {with-dev-setup}
"lwt" {with-test}
"base"
Expand Down
12 changes: 6 additions & 6 deletions packages/ocaml-variants/ocaml-variants.5.2.0+ox/opam
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ conflicts: [
"base" {< "v0.18~"}
"alcotest" {!= "1.9.0+ox"}
"backoff" {!= "0.1.1+ox"}
"ctypes" {!= "0.23.0+ox"}
"ctypes-foreign" {!= "0.23.0+ox"}
"ctypes" {!= "0.24.0+ox"}
"ctypes-foreign" {!= "0.24.0+ox"}
"dot-merlin-reader" {!= "5.2.1-502+ox"}
"dune" {<= "3.20.2"}
"gen_js_api" {!= "1.1.2+ox"}
Expand All @@ -127,18 +127,18 @@ conflicts: [
"ocaml-compiler-libs" {!= "v0.17.0+ox"}
"ocaml-index" {!= "1.1+ox"}
"ocaml-lsp-server" {!= "1.19.0+ox"}
"ocamlbuild" {!= "0.15.0+ox"}
"ocamlbuild" {!= "0.16.1+ox"}
"ocamlformat" {!= "0.26.2+ox"}
"ocamlformat-lib" {!= "0.26.2+ox"}
"ojs" {!= "1.1.2+ox"}
"ppxlib" {!= "0.33.0+ox"}
"ppxlib_ast" {!= "0.33.0+ox"}
"re" {!= "1.14.0+ox"}
"sedlex" {!= "3.6+ox"}
"sedlex" {!= "3.7+ox"}
"spawn" {!= "v0.15.1+ox"}
"topkg" {!= "1.0.8+ox"}
"topkg" {!= "1.1.1+ox"}
"uTop" {!= "2.16.0+ox"}
"uutf" {!= "1.0.3+ox"}
"uutf" {!= "1.0.4+ox"}
"wasm_of_ocaml-compiler" {!= "6.0.1+ox"}
"zarith" {<"1.12"}
"zarith" {="1.12"}
Expand Down
47 changes: 47 additions & 0 deletions packages/ocamlbuild/ocamlbuild.0.16.1+ox/files/flambda2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
diff --git a/Makefile b/Makefile
index 3039625..1344f79 100644
--- a/Makefile
+++ b/Makefile
@@ -412,10 +412,22 @@ endif

# The generic rules

-%.cmo: %.ml
+src/%.cmo: src/%.ml
+ $(OCAMLC) -for-pack Ocamlbuild_pack $(OCB_COMPFLAGS) -c $<
+
+bin/%.cmo: bin/%.ml
+ $(OCAMLC) $(OCB_COMPFLAGS) -c $<
+
+plugin-lib/%.cmo: plugin-lib/%.ml
+ $(OCAMLC) $(OCB_COMPFLAGS) -c $<
+
+src/%.cmi: src/%.mli
+ $(OCAMLC) -for-pack Ocamlbuild_pack $(OCB_COMPFLAGS) -c $<
+
+bin/%.cmi: bin/%.mli
$(OCAMLC) $(OCB_COMPFLAGS) -c $<

-%.cmi: %.mli
+plugin-lib/%.cmi: plugin-lib/%.mli
$(OCAMLC) $(OCB_COMPFLAGS) -c $<

src/%.cmx: src/%.ml
diff --git a/src/configuration.ml b/src/configuration.ml
index a209df5..ec620d0 100644
--- a/src/configuration.ml
+++ b/src/configuration.ml
@@ -58,6 +58,14 @@ let apply_config s (config : t) init =
List.fold_left begin fun tags (key, v) ->
if key_match key s then
List.fold_right add v.plus_tags (List.fold_right remove v.minus_tags tags)
+ else if
+ List.mem (Filename.extension s) [".ml"; ".mli"]
+ && key_match key (Filename.remove_extension s ^ ".cmx")
+ then
+ let only_for_pack l =
+ List.filter (fun (tag, _) -> String.length tag >= 9 && String.sub tag 0 9 = "for-pack(") l
+ in
+ List.fold_right add (only_for_pack v.plus_tags) (List.fold_right remove (only_for_pack v.minus_tags) tags)
else tags
end init config
50 changes: 50 additions & 0 deletions packages/ocamlbuild/ocamlbuild.0.16.1+ox/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
opam-version: "2.0"
version: "0.16.1+ox"
name: "ocamlbuild"
synopsis:
"OCamlbuild is a build system with builtin rules to easily build most OCaml projects"
maintainer: "Gabriel Scherer <gabriel.scherer@gmail.com>"
authors: ["Nicolas Pouillard" "Berke Durak"]
license: "LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception"
homepage: "https://github.com/ocaml/ocamlbuild/"
doc: "https://github.com/ocaml/ocamlbuild/blob/master/manual/manual.adoc"
bug-reports: "https://github.com/ocaml/ocamlbuild/issues"
depends: [
"ocaml" {>= "4.08"}
"ocamlfind" {with-test}
"menhirLib" {with-test}
]
conflicts: [
"base-ocamlbuild"
"ocamlfind" {< "1.6.2"}
]
build: [
[
make
"-f"
"configure.make"
"all"
"OCAMLBUILD_PREFIX=%{prefix}%"
"OCAMLBUILD_BINDIR=%{bin}%"
"OCAMLBUILD_LIBDIR=%{lib}%"
"OCAMLBUILD_MANDIR=%{man}%"
"OCAML_NATIVE=%{ocaml:native}%"
"OCAML_NATIVE_TOOLS=%{ocaml:native}%"
]
[make "check-if-preinstalled" "all" "opam-install"]
]
dev-repo: "git+https://github.com/ocaml/ocamlbuild.git"

url {
src: "https://github.com/ocaml/ocamlbuild/archive/refs/tags/0.16.1.tar.gz"
checksum: [
"sha512=e918b9a0081f271e507c7a4f4d5d5a7cdf818ca51c52acec1bac85ddad5f6cad078cb3c568252fbcf5401c2d75323ed8f50fdd881bda1c9632840320408393ae"
]
}
patches: ["flambda2.patch"]
extra-files: [
[
"flambda2.patch"
"sha256=d9a4c6425c8b56ea6a878661abc5704810a73003fd76b97073b9f998619dce8a"
]
]
2 changes: 1 addition & 1 deletion packages/ocamlformat-lib/ocamlformat-lib.0.26.2+ox/opam
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ depends: [
"ocp-indent" {with-test = "false" & >= "1.8.0" | with-test & >= "1.8.1"}
"stdio"
"uuseg" {>= "10.0.0"}
"uutf" {= "1.0.3+ox"}
"uutf" {= "1.0.4+ox"}
"csexp" {>= "1.4.0"}
"astring"
"result"
Expand Down
Loading
Loading