Skip to content

Commit

Permalink
Merge branch 'master' into update-elpi-2
Browse files Browse the repository at this point in the history
  • Loading branch information
gares committed Jun 26, 2024
2 parents 99e3843 + d51c8b5 commit 8bfac97
Show file tree
Hide file tree
Showing 313 changed files with 9,855 additions and 95 deletions.
5 changes: 3 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ before_script:
- apt-get install libgtksourceview2.0-dev -y || true # gone with Debian bullseye
- apt-get install build-essential -y # missing with Debian bullseye
- apt-get install unzip libgtksourceview-3.0-dev libncurses5-dev curl jq ruby bubblewrap time libgmp-dev coinor-csdp libstring-shellquote-perl libipc-system-simple-perl automake autoconf libtool wdiff -y # wdiff is used in test-suite of hierarchy-builder
- apt-get install clang -y
- test -e $OPAM_ROOT_CACHE || scripts/opam-coq-init
- curl -L https://github.com/ocaml/opam/releases/download/${OPAM_VERSION}/opam-${OPAM_VERSION}-x86_64-linux >/usr/local/bin/opam
- chmod +x /usr/local/bin/opam
Expand All @@ -32,9 +33,9 @@ before_script:
.opam-build:
stage: build
script: |
PR=${CI_BUILD_REF_NAME##pr-};
PR=${CI_COMMIT_REF_NAME##pr-};
echo "Github PR number: $PR";
SKIP=$(set +o pipefail; curl https://api.github.com/repos/coq/opam-coq-archive/issues/$PR | jq -rc .body | grep ^ci-skip: | cat );
SKIP=$(set +o pipefail; curl https://api.github.com/repos/coq/opam/issues/$PR | jq -rc .body | grep ^ci-skip: | cat );
echo "SKIP packages per user request: $SKIP";
scripts/opam-coq-list-pr-files | xargs scripts/opam-coq-install-remove $OPAM_ROOT_CACHE $SKIP --
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion core-dev/packages/coq-core/coq-core.8.19+rc1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "2.9" & < "3.14"}
"ocaml" {>= "4.09.0"}
"ocamlfind" {>= "1.8.1"}
"zarith" {>= "1.11"}
Expand Down
2 changes: 1 addition & 1 deletion core-dev/packages/coq-core/coq-core.8.19.dev/opam
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "2.9" & < "3.14"}
"ocaml" {>= "4.09.0"}
"ocamlfind" {>= "1.8.1"}
"zarith" {>= "1.11"}
Expand Down
65 changes: 65 additions & 0 deletions core-dev/packages/coq-core/coq-core.8.20.dev/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
opam-version: "2.0"
synopsis: "The Coq Proof Assistant -- Core Binaries and Tools"
description: """
Coq is a formal proof management system. It provides
a formal language to write mathematical definitions, executable
algorithms and theorems together with an environment for
semi-interactive development of machine-checked proofs.

Typical applications include the certification of properties of
programming languages (e.g. the CompCert compiler certification
project, or the Bedrock verified low-level programming library), the
formalization of mathematics (e.g. the full formalization of the
Feit-Thompson theorem or homotopy type theory) and teaching.

This package includes the Coq core binaries, plugins, and tools, but
not the vernacular standard library.

Note that in this setup, Coq needs to be started with the -boot and
-noinit options, as will otherwise fail to find the regular Coq
prelude, now living in the coq-stdlib package."""
maintainer: ["The Coq development team <[email protected]>"]
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
license: "LGPL-2.1-only"
homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "3.6.1" & < "3.14"}
"ocaml" {>= "4.09.0"}
"ocamlfind" {>= "1.8.1"}
"zarith" {>= "1.11"}
"conf-linux-libc-dev" {os = "linux"}
"odoc" {with-doc}
]
conflicts: [
"coq" { < "8.17" }
]
depopts: ["coq-native" "memprof-limits" "memtrace"]
dev-repo: "git+https://github.com/coq/coq.git"
build: [
["dune" "subst"] {dev}
[ "./configure"
"-prefix" prefix
"-mandir" man
"-libdir" "%{lib}%/coq"
"-native-compiler" "yes" {coq-native:installed} "no" {!coq-native:installed}
]
[
"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]
]

url {
src: "git+https://github.com/coq/coq.git#v8.20"
}
2 changes: 1 addition & 1 deletion core-dev/packages/coq-core/coq-core.dev/opam
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "2.9" & < "3.14"}
"ocaml" {>= "4.09.0"}
"ocamlfind" {>= "1.8.1"}
"zarith" {>= "1.11"}
Expand Down
51 changes: 51 additions & 0 deletions core-dev/packages/coq-stdlib/coq-stdlib.8.20.dev/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
opam-version: "2.0"
synopsis: "The Coq Proof Assistant -- Standard Library"
description: """
Coq is a formal proof management system. It provides
a formal language to write mathematical definitions, executable
algorithms and theorems together with an environment for
semi-interactive development of machine-checked proofs.

Typical applications include the certification of properties of
programming languages (e.g. the CompCert compiler certification
project, or the Bedrock verified low-level programming library), the
formalization of mathematics (e.g. the full formalization of the
Feit-Thompson theorem or homotopy type theory) and teaching.

This package includes the Coq Standard Library, that is to say, the
set of modules usually bound to the Coq.* namespace."""
maintainer: ["The Coq development team <[email protected]>"]
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
license: "LGPL-2.1-only"
homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "3.6"}
"coq-core" {= version}
"odoc" {with-doc}
]
depopts: ["coq-native"]
dev-repo: "git+https://github.com/coq/coq.git"
build: [
["dune" "subst"] {dev}
# We tell dunestrap to use coq-config from coq-core
[ make "dunestrap" "COQ_DUNE_EXTRA_OPT=-split" "DUNESTRAPOPT=-p coq-stdlib"]
[
"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]
]

url {
src: "git+https://github.com/coq/coq.git#v8.20"
}
56 changes: 56 additions & 0 deletions core-dev/packages/coq/coq.8.20.dev/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
opam-version: "2.0"
synopsis: "The Coq Proof Assistant"
description: """
Coq is a formal proof management system. It provides
a formal language to write mathematical definitions, executable
algorithms and theorems together with an environment for
semi-interactive development of machine-checked proofs.

Typical applications include the certification of properties of
programming languages (e.g. the CompCert compiler certification
project, or the Bedrock verified low-level programming library), the
formalization of mathematics (e.g. the full formalization of the
Feit-Thompson theorem or homotopy type theory) and teaching."""
maintainer: ["The Coq development team <[email protected]>"]
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
license: "LGPL-2.1-only"
homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "3.6"}
"coq-core" {= version}
"coq-stdlib" {= version}
"coqide-server" {= version}
"ounit2" {with-test}
"conf-python-3" {with-test}
"conf-time" {with-test}
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/coq/coq.git"
build: [
["dune" "subst"] {dev}
[ "./configure"
"-prefix" prefix
"-mandir" man
"-libdir" "%{lib}%/coq"
"-native-compiler" "yes" {coq-native:installed} "no" {!coq-native:installed}
] {with-test}
[
"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]
]

url {
src: "git+https://github.com/coq/coq.git#v8.20"
}
44 changes: 44 additions & 0 deletions core-dev/packages/coqide-server/coqide-server.8.20.dev/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
opam-version: "2.0"
synopsis: "The Coq Proof Assistant, XML protocol server"
description: """
Coq is a formal proof management system. It provides
a formal language to write mathematical definitions, executable
algorithms and theorems together with an environment for
semi-interactive development of machine-checked proofs.

This package provides the `coqidetop` language server, an
implementation of Coq's [XML protocol](https://github.com/coq/coq/blob/master/dev/doc/xml-protocol.md)
which allows clients, such as CoqIDE, to interact with Coq in a
structured way."""
maintainer: ["The Coq development team <[email protected]>"]
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
license: "LGPL-2.1-only"
homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "3.6"}
"coq-core" {= version}
"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/coq/coq.git"

url {
src: "git+https://github.com/coq/coq.git#v8.20"
}
46 changes: 46 additions & 0 deletions extra-dev/packages/coq-bignums/coq-bignums.9.0.0+coq8.20/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
opam-version: "2.0"
maintainer: "[email protected]"

homepage: "https://github.com/coq-community/bignums"
dev-repo: "git+https://github.com/coq-community/bignums.git"
bug-reports: "https://github.com/coq-community/bignums/issues"
license: "LGPL-2.1-only"

synopsis: "Bignums, the Coq library of arbitrarily large numbers"
description: """
This Coq library provides BigN, BigZ, and BigQ that used to
be part of the standard library."""

build: [make "-j%{jobs}%"]
install: [
[make "install"]
[make "-C" "tests" "-j%{jobs}%"] {with-test}
]
depends: [
"ocaml"
"coq" {>= "8.20" & < "8.21~"}
]

tags: [
"category:Miscellaneous/Coq Extensions"
"category:Mathematics/Arithmetic and Number Theory/Number theory"
"category:Mathematics/Arithmetic and Number Theory/Rational numbers"
"keyword:integer numbers"
"keyword:rational numbers"
"keyword:arithmetic"
"keyword:arbitrary precision"
"logpath:Bignums"
"date:2024-06-20"
]
authors: [
"Laurent Théry"
"Benjamin Grégoire"
"Arnaud Spiwack"
"Evgeny Makarov"
"Pierre Letouzey"
]

url {
src: "https://github.com/coq/bignums/archive/v9.0.0+coq8.20.tar.gz"
checksum: "sha512=2c83c5c4caf77b68280dd56ca658da176e4223794b1627e8ac86b9e310a6cc81082bd4e880449b1c330013f1540ff1f78ddfce7a8d4039c3b00ba59904273d61"
}
45 changes: 45 additions & 0 deletions extra-dev/packages/coq-certicoq/coq-certicoq.dev/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
opam-version: "2.0"
maintainer: "The CertiCoq Team"
homepage: "https://certicoq.org/"
dev-repo: "git+https://github.com/CertiCoq/certicoq"
bug-reports: "https://github.com/CertiCoq/certicoq/issues"
authors: ["Andrew Appel"
"Yannick Forster"
"Anvay Grover"
"Joomy Korkut"
"John Li"
"Zoe Paraskevopoulou"
"Matthieu Sozeau"
"Matthew Weaver"
"Abhishek Anand"
"Greg Morrisett"
"Randy Pollack"
"Olivier Savary Belanger"
]
license: "MIT"
build: [
["bash" "./configure.sh"]
[make "all"]
[make "plugins"]
[make "bootstrap"]
[make "-C" "benchmarks" "all"] {with-test}
[make "-C" "bootstrap" "tests"] {with-test}
]
install: [
[make "install"]
]
depends: [
"ocaml"
"stdlib-shims"
"coq" {>= "8.17" & < "8.18~"}
"coq-compcert" {= "3.12"}
"coq-equations" {= "1.3+8.17"}
"coq-metacoq-erasure-plugin" {= "8.17.dev"}
"coq-metacoq-safechecker-plugin" {= "8.17.dev"}
"coq-ext-lib" {>= "0.11.8"}
]

synopsis: "A Verified Compiler for Gallina, Written in Gallina "
url {
src: "git+https://github.com/CertiCoq/certicoq.git#master"
}
4 changes: 2 additions & 2 deletions extra-dev/packages/coq-elpi/coq-elpi.dev/opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ depends: [
"ocaml" {>= "4.09.0"}
"stdlib-shims"
"elpi" {>= "1.18.2" & < "1.20.0~"}
"coq" {>= "8.19"}
"coq" {= dev}
"ppx_optcomp"
"ocaml-lsp-server" {dev}
"odoc" {with-doc}
Expand All @@ -40,5 +40,5 @@ build: [
]
dev-repo: "git+https://github.com/LPCIC/coq-elpi.git"
url {
src: "git+https://github.com/LPCIC/coq-elpi.git#coq-master"
src: "git+https://github.com/LPCIC/coq-elpi.git"
}
Loading

0 comments on commit 8bfac97

Please sign in to comment.