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.

Sign up for GitHub

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

refresh coq dev packages via Coq's repo #2854

Merged
merged 1 commit into from
Dec 8, 2023
+43 −37
Merged

refresh coq dev packages via Coq's repo #2854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions core-dev/packages/coq-core/coq-core.dev/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "dev"
synopsis: "The Coq Proof Assistant -- Core Binaries and Tools"
description: """
Coq is a formal proof management system. It provides
Expand Down Expand Up @@ -31,14 +29,15 @@ depends: [
"ocaml" {>= "4.09.0"}
"ocamlfind" {>= "1.8.1"}
"zarith" {>= "1.11"}
"ounit2" {with-test}
"odoc" {with-doc}
]
conflicts: [
"coq" { < "8.17" }
]
depopts: ["coq-native"]
dev-repo: "git+https://github.com/coq/coq.git"
build: [
# Requires dune 2.8 due to https://github.com/ocaml/dune/issues/3219
# ["dune" "subst"] {pinned}
["dune" "subst"] {dev}
[ "./configure"
"-prefix" prefix
"-mandir" man
Expand All @@ -52,13 +51,13 @@ build: [
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"
depopts: ["coq-native"]

url {
src: "git+https://github.com/coq/coq.git#master"
Expand Down
24 changes: 8 additions & 16 deletions core-dev/packages/coq-stdlib/coq-stdlib.dev/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "dev"
synopsis: "The Coq Proof Assistant -- Standard Library"
description: """
Coq is a formal proof management system. It provides
Expand All @@ -25,34 +23,28 @@ bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "2.9"}
"coq-core" {= version}
"odoc" {with-doc}
]
depopts: ["coq-native"]
dev-repo: "git+https://github.com/coq/coq.git"
build: [
# Requires dune 2.8 due to https://github.com/ocaml/dune/issues/3219
# ["dune" "subst"] {pinned}
#
# XXX need to run configure as in coq-core, or else dunestrap will
# use the default rule in config
[ "./configure"
"-prefix" prefix
"-mandir" man
"-libdir" "%{lib}%/coq"
"-native-compiler" "yes" {coq-native:installed} "no" {!coq-native:installed}
]
[ make "dunestrap" "COQ_DUNE_EXTRA_OPT=-split" ]
["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]
]
dev-repo: "git+https://github.com/coq/coq.git"
depopts: ["coq-native"]

url {
src: "git+https://github.com/coq/coq.git#master"
Expand Down
16 changes: 12 additions & 4 deletions core-dev/packages/coq/coq.dev/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "dev"
synopsis: "The Coq Proof Assistant"
description: """
Coq is a formal proof management system. It provides
Expand All @@ -24,22 +22,32 @@ depends: [
"coq-core" {= version}
"coq-stdlib" {= version}
"coqide-server" {= version}
"ounit2" {with-test}
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/coq/coq.git"
build: [
["dune" "subst"] {pinned}
["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]
]
dev-repo: "git+https://github.com/coq/coq.git"

url {
src: "git+https://github.com/coq/coq.git#master"
Expand Down
27 changes: 17 additions & 10 deletions core-dev/packages/coqide-server/coqide-server.dev/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,32 @@ 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"
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" {>= "2.9"}
"coq-core" {= version}
"odoc" {with-doc}
]
build: [
"dune"
"build"
"-p"
name
"-j"
jobs
"@install"
"@doc" {with-doc}
["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"

Expand Down
Loading