Skip to content

Commit b9a1d22

Browse files
mserimseri
authored
Merge branch 'master' into conf-ninja-centos
2 parents cfb011f + 7ef92b5 commit b9a1d22

File tree

13 files changed

+237
-24
lines changed
  • packages
    • catala/catala.1.0.0~alpha
    • conf-ninja/conf-ninja.1
    • dot-merlin-reader/dot-merlin-reader.5.4.2~5.4preview
    • gen_js_api/gen_js_api.1.1.6
    • merlin-lib/merlin-lib.5.4.2~5.4preview
    • merlin/merlin.5.4.2~5.4preview
    • ninja_utils/ninja_utils.1.0.0
    • ocaml-index/ocaml-index.5.4.2~5.4preview
    • ocaml-lsp-server/ocaml-lsp-server.1.22.1~5.4preview
    • ojs/ojs.1.1.6
    • opatch/opatch.3.0.1
    • otp/otp.0.2
    • ppxlib/ppxlib.0.37.0~5.4preview

13 files changed

+237
-24
lines changed

‎packages/catala/catala.1.0.0~alpha/opam‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ depends: [
4242
"alcotest" {>= "1.5.0"}
4343
"ninja_utils" {= "0.9.0"}
4444
"odoc" {with-doc}
45-
"ocamlformat" {cataladevmode & = "0.26.0"}
46-
"obelisk" {cataladevmode}
47-
"conf-npm" {cataladevmode}
48-
"conf-python-3-dev" {cataladevmode}
49-
"conf-openjdk" {cataladevmode}
50-
"cpdf" {cataladevmode}
51-
"conf-pandoc" {cataladevmode}
52-
"z3" {catalaz3mode}
45+
"ocamlformat" {?cataladevmode & cataladevmode & = "0.26.0"}
46+
"obelisk" {?cataladevmode & cataladevmode}
47+
"conf-npm" {?cataladevmode & cataladevmode}
48+
"conf-python-3-dev" {?cataladevmode & cataladevmode}
49+
"conf-openjdk" {?cataladevmode & cataladevmode}
50+
"cpdf" {?cataladevmode & cataladevmode}
51+
"conf-pandoc" {?cataladevmode & cataladevmode}
52+
"z3" {?catalaz3mode & catalaz3mode}
5353
"conf-ninja"
5454
"otoml" {>= "1.0"}
5555
]
@@ -71,9 +71,9 @@ build: [
7171
]
7272
depexts: [
7373
["groff"] {with-doc}
74-
["python3-pip"] {cataladevmode & os-family = "debian"}
75-
["py3-pip" "py3-pygments"] {cataladevmode & os-distribution = "alpine"}
76-
["python-pygments"] {cataladevmode & os-family = "arch"}
74+
["python3-pip"] {?cataladevmode & cataladevmode & os-family = "debian"}
75+
["py3-pip" "py3-pygments"] {?cataladevmode & cataladevmode & os-distribution = "alpine"}
76+
["python-pygments"] {?cataladevmode & cataladevmode & os-family = "arch"}
7777
]
7878
dev-repo: "git+https://github.com/CatalaLang/catala"
7979
url {

‎packages/conf-ninja/conf-ninja.1/opam‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ bug-reports: "https://github.com/ocaml/opam-repository/issues"
55
license: "Apache-2.0"
66
build: ["ninja" "--version"]
77
depexts: [
8-
["ninja-build"] {os-family = "debian" | os-family = "ubuntu" | os-family = "fedora" | os-distribution = "centos" | os-distribution = "ol" | os-family = "alpine"}
8+
["ninja-build"] {os-family = "debian" | os-family = "ubuntu" | os-family = "fedora" | os-distribution = "centos" | os-distribution = "ol"}
9+
["samurai"] {os-distribution = "alpine"}
910
["ninja"] {os-family = "arch" | os-family = "suse" | os-family = "opensuse" | os-family = "bsd"}
1011
["ninja"] {os = "macos" & ( os-distribution = "homebrew" | os-distribution = "macports" )}
1112
]

‎packages/dot-merlin-reader/dot-merlin-reader.5.4.2~5.4preview/opam‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ depends: [
1414
"merlin-lib" {= version}
1515
"ocamlfind" {>= "1.6.0"}
1616
]
17-
available: opam-version >= "2.1.0"
18-
flags: avoid-version
17+
available: false
1918
build: [
2019
["dune" "subst"] {dev}
2120
["dune" "build" "-p" name "-j" jobs]

‎packages/gen_js_api/gen_js_api.1.1.6/opam‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# This file is generated by dune, edit dune-project instead
2+
opam-version: "2.0"
3+
synopsis: "Easy OCaml bindings for JavaScript libraries"
4+
description: """
5+
6+
gen_js_api aims at simplifying the creation of OCaml bindings for
7+
JavaScript libraries. Authors of bindings write OCaml signatures for
8+
JavaScript libraries and the tool generates the actual binding code
9+
with a combination of implicit conventions and explicit annotations.
10+
11+
gen_js_api is to be used with the js_of_ocaml compiler.
12+
"""
13+
maintainer: ["Alain Frisch <[email protected]>"]
14+
authors: [
15+
"Alain Frisch <[email protected]>"
16+
"Sebastien Briais <[email protected]>"
17+
]
18+
license: "MIT"
19+
homepage: "https://github.com/LexiFi/gen_js_api"
20+
bug-reports: "https://github.com/LexiFi/gen_js_api/issues"
21+
depends: [
22+
"dune" {>= "3.0"}
23+
"ocaml" {>= "4.13"}
24+
"ppxlib" {>= "0.37"}
25+
"js_of_ocaml-compiler" {with-test}
26+
"ojs" {= version}
27+
"odoc" {with-doc}
28+
]
29+
conflicts: [
30+
"js_of_ocaml-compiler" {< "4.0.0"}
31+
]
32+
build: [
33+
["dune" "subst"] {dev}
34+
[
35+
"dune"
36+
"build"
37+
"-p"
38+
name
39+
"-j"
40+
jobs
41+
"@install"
42+
"@runtest" {with-test}
43+
"@doc" {with-doc}
44+
]
45+
]
46+
dev-repo: "git+https://github.com/LexiFi/gen_js_api.git"
47+
url {
48+
src: "https://github.com/LexiFi/gen_js_api/archive/refs/tags/v1.1.6.tar.gz"
49+
checksum: [
50+
"md5=b7c0cbd9f36c7750b0c981bdaccba948"
51+
"sha512=562c5276968885e8416c0f90c8ffa1bbf730a38130b22a516ed23a5fb893a7dfbc1f81d18f11280911de6b5b4da3bc3f07396d66306009d65c596668b1de6d8f"
52+
]
53+
}

‎packages/merlin-lib/merlin-lib.5.4.2~5.4preview/opam‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ depends: [
1818
"menhirLib" {dev & >= "20201216"}
1919
"menhirSdk" {dev & >= "20201216"}
2020
]
21-
available: opam-version >= "2.1.0"
22-
flags: avoid-version
21+
available: false
2322
build: [
2423
["dune" "subst"] {dev}
2524
["dune" "build" "-p" name "-j" jobs]

‎packages/merlin/merlin.5.4.2~5.4preview/opam‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ depends: [
2020
conflicts: [
2121
"seq" {!= "base"}
2222
]
23-
available: opam-version >= "2.1.0"
24-
flags: avoid-version
23+
available: false
2524
build: [
2625
["dune" "subst"] {dev}
2726
["dune" "build" "-p" name "-j" jobs]

‎packages/ninja_utils/ninja_utils.1.0.0/opam‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
opam-version: "2.0"
2+
synopsis:
3+
"Small library used to generate Ninja build files"
4+
description:
5+
"This library contains the implementations of utility functions used to generate Ninja build files -- see https://ninja-build.org. It's currently used by the Catala build system (see https://github.com/CatalaLang/catala/tree/master/build_system)"
6+
maintainer: ["[email protected]"]
7+
authors: ["Emile Rolley"]
8+
license: "Apache-2.0"
9+
homepage: "https://github.com/CatalaLang/ninja_utils"
10+
bug-reports: "https://github.com/CatalaLang/ninja_utils/issues"
11+
depends: [
12+
"dune" {>= "2.8"}
13+
"ocaml" {>= "4.12.0"}
14+
"re" {>= "1.10.3"}
15+
"odoc" {with-doc}
16+
]
17+
build: [
18+
["dune" "subst"] {dev}
19+
[
20+
"dune"
21+
"build"
22+
"-p"
23+
name
24+
"-j"
25+
jobs
26+
"@install"
27+
"@runtest" {with-test}
28+
"@doc" {with-doc}
29+
]
30+
]
31+
dev-repo: "git+https://github.com/CatalaLang/ninja_utils.git"
32+
url {
33+
src:
34+
"https://github.com/CatalaLang/ninja_utils/archive/refs/tags/1.0.0.tar.gz"
35+
checksum: [
36+
"md5=e71fe8fc11e3a25d6b0b742105035766"
37+
"sha512=6a3cd306742600eb5efc0b3bff8272a0948363ed1ff85ac76d45ebfafd0f188d86aea3103fa8cf72b6c4c97b9fbf19a27da1e3600273072f671e553b270698db"
38+
]
39+
}

‎packages/ocaml-index/ocaml-index.5.4.2~5.4preview/opam‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ depends: [
1313
"merlin-lib" {= version}
1414
"odoc" {with-doc}
1515
]
16-
available: opam-version >= "2.1.0"
17-
flags: avoid-version
16+
available: false
1817
build: [
1918
["dune" "subst"] {dev}
2019
[

‎packages/ocaml-lsp-server/ocaml-lsp-server.1.22.1~5.4preview/opam‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ depends: [
4747
"merlin-lib" {>= "5.4" & < "6.0"}
4848
"ppx_yojson_conv" {with-dev-setup}
4949
]
50-
available: opam-version >= "2.1.0"
51-
flags: avoid-version
50+
available: false
5251
build: [
5352
["dune" "subst"] {dev}
5453
["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}]

‎packages/ojs/ojs.1.1.6/opam‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This file is generated by dune, edit dune-project instead
2+
opam-version: "2.0"
3+
synopsis: "Runtime Library for gen_js_api generated libraries"
4+
description: "To be used in conjunction with gen_js_api"
5+
maintainer: ["Alain Frisch <[email protected]>"]
6+
authors: [
7+
"Alain Frisch <[email protected]>"
8+
"Sebastien Briais <[email protected]>"
9+
]
10+
license: "MIT"
11+
homepage: "https://github.com/LexiFi/gen_js_api"
12+
bug-reports: "https://github.com/LexiFi/gen_js_api/issues"
13+
depends: [
14+
"dune" {>= "3.0"}
15+
"ocaml" {>= "4.13"}
16+
"js_of_ocaml-compiler" {>= "4.0.0"}
17+
"odoc" {with-doc}
18+
]
19+
dev-repo: "git+https://github.com/LexiFi/gen_js_api.git"
20+
build: [
21+
["dune" "subst"] {dev}
22+
["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}]
23+
]
24+
url {
25+
src: "https://github.com/LexiFi/gen_js_api/archive/refs/tags/v1.1.6.tar.gz"
26+
checksum: [
27+
"md5=b7c0cbd9f36c7750b0c981bdaccba948"
28+
"sha512=562c5276968885e8416c0f90c8ffa1bbf730a38130b22a516ed23a5fb893a7dfbc1f81d18f11280911de6b5b4da3bc3f07396d66306009d65c596668b1de6d8f"
29+
]
30+
}

0 commit comments

Comments
 (0)