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

package Coq 8.12.0 #16876

Merged
merged 3 commits into from
Jul 25, 2020
Merged
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
12 changes: 12 additions & 0 deletions packages/coq/coq.8.12.0/files/coq.install
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
bin: [
"bin/coqwc"
"bin/coqtop"
"bin/coqtop.byte"
"bin/coqdoc"
"bin/coqdep"
"bin/coqchk"
"bin/coqc"
"bin/coq_makefile"
"bin/coq-tex"
"bin/coqworkmgr"
]
52 changes: 52 additions & 0 deletions packages/coq/coq.8.12.0/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
opam-version: "2.0"
maintainer: "coqdev@inria.fr"
authors: "The Coq development team, INRIA, CNRS, and contributors."
homepage: "https://coq.inria.fr/"
bug-reports: "https://github.com/coq/coq/issues"
dev-repo: "git+https://github.com/coq/coq.git"
license: "LGPL-2.1-only"
synopsis: "Formal proof management system"
description: """
The Coq proof assistant 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 and the
Bedrock verified low-level programming library), the formalization of
mathematics (e.g., the full formalization of the Feit-Thompson theorem
and homotopy type theory) and teaching.
"""

depends: [
"ocaml" {>= "4.05.0" & < "4.12"}
"ocamlfind" {build}
"num"
"conf-findutils" {build}
]
build: [
[
"./configure"
"-configdir" "%{lib}%/coq/config"
"-prefix" prefix
"-mandir" man
"-docdir" doc
"-libdir" "%{lib}%/coq"
"-datadir" "%{share}%/coq"
"-coqide" "no"
]
[make "-j%{jobs}%"]
[make "-j%{jobs}%" "byte"]
]
install: [
[make "install"]
[make "install-byte"]
]

extra-files: [
["coq.install" "sha512=b501737b4dbd22adc1c0377d744448056fb1dc493caf72c05f57c8463cf23f758373605ab3a50b9f505e4c856c41039d0bd7f81f96ed62adc6a674179523e7d2"]
]

url {
src: "https://github.com/coq/coq/archive/V8.12.0.tar.gz"
checksum: "sha512=8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240"
}
9 changes: 9 additions & 0 deletions packages/coqide/coqide.8.12.0/files/coqide.install
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
bin: [
"bin/coqide"
]
share_root: [
"ide/coq.lang" {"coq/coq.lang"}
"ide/coq-ssreflect.lang" {"coq/coq-ssreflect.lang"}
"ide/coq.png" {"coq/coq.png"}
"ide/coq_style.xml" {"coq/coq_style.xml"}
]
49 changes: 49 additions & 0 deletions packages/coqide/coqide.8.12.0/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
opam-version: "2.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's remember to split CoqIDE out if there are problems in CI.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't follow... we want a CoqIDE package, no?
I consider creating two PRs and tracking their mutual dependencies to be just unnecessary work.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your call; I was just mentioning @palmskog's suggestion to avoid holding up Coq packages (IIRC because coqide held up some 8.11.* version for a long while). No strong opinion myself.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But again, no action needed if there are no problems in CI 🙂

maintainer: "coqdev@inria.fr"
authors: "The Coq development team, INRIA, CNRS, and contributors."
homepage: "https://coq.inria.fr/"
bug-reports: "https://github.com/coq/coq/issues"
dev-repo: "git+https://github.com/coq/coq.git"
license: "LGPL-2.1-only"
synopsis: "IDE of the Coq formal proof management system"
description: """
CoqIDE is a graphical user interface for interactive development
of mathematical definitions, executable algorithms, and proofs of theorems
using the Coq proof assistant.
"""

depends: [
"coq" {= version}
"lablgtk3-sourceview3" {>= "3.1.0"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RalfJung @ejgallego : Is there a good reason for the restriction to lablgtk 3.1.0? For a reason yet to be investigated this version does not build on windows, but 3.0.beta5 does and it seems to work fine.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Summing up: no, beta7 had to be banned only for coqide 8.10.*. No comment on potential other problems.
Coq 8.11.0 should be compatible with beta7 since coq/coq#11234.

=== Below the former comments which I dropped.

  1. That's from package Coq 8.12.0 #16876 (comment); there was a specific reason we banned beta7, but beta8 was fine again, and I suspect it was fixed on the Coq side as well.

  2. Sorry: that's to say "no, there's no strong reason for the restriction to be that strict".

  3. In fact, I should have searched the original issue. Indeed, beta7 needn't be blacklisted since
    [ide] Don't use -linkall for the GUI app. coq/coq#11234, which was merged in 8.11.0; only 8.10.* need the exclusion, as I noted in [build] don't link Gtk{Th,}Init static initializers into the main library garrigue/lablgtk#100 (comment).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I opened #16881 to relax the version bound.

"conf-findutils" {build}
"conf-gnome-icon-theme3"
]
build: [
[
"./configure"
"-configdir" "%{lib}%/coq/config"
"-prefix" prefix
"-mandir" man
"-docdir" doc
"-libdir" "%{lib}%/coq"
"-datadir" "%{share}%/coq"
]
[make "-j%{jobs}%" "coqide-files"]
[make "-j%{jobs}%" "coqide-opt"]
]
install: [
make
"install-ide-bin"
"install-ide-files"
"install-ide-info"
"install-ide-devfiles"
]

extra-files: [
["coqide.install" "sha512=0c59f0c3cf3453e92c02b29aceb31090020410d2b0dd2856172cd19b1b2b58b2a1d46047fb08a9c1d4767d87934c73ae6adfcb4204b1ea6a55a85ba75b2b812d"]
]

url {
src: "https://github.com/coq/coq/archive/V8.12.0.tar.gz"
checksum: "sha512=8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240"
}