Skip to content

Commit

Permalink
[dune] [opam] Disable dune subst in opam files until the upstream fix…
Browse files Browse the repository at this point in the history
… is propagated

`dune subst` is broken on unicode files, see
ocaml/dune#3879 and
ocaml/dune#3879

This is a frequent problem, so disabling pending on dune 2.8 being
released.
  • Loading branch information
ejgallego committed Dec 4, 2020
1 parent 4d21a08 commit 1e5d0d4
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 5 deletions.
3 changes: 2 additions & 1 deletion coq-doc.opam
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ depends: [
"coq" {build & = version}
]
build: [
["dune" "subst"] {pinned}
# Disabled until Dune 2.8 is available
# ["dune" "subst"] {pinned}
[
"dune"
"build"
Expand Down
3 changes: 2 additions & 1 deletion coq.opam
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ depends: [
"zarith" {>= "1.10"}
]
build: [
["dune" "subst"] {pinned}
# Disabled until Dune 2.8 is available
# ["dune" "subst"] {pinned}
[
"dune"
"build"
Expand Down
3 changes: 2 additions & 1 deletion coqide-server.opam
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ depends: [
"coq" {= version}
]
build: [
["dune" "subst"] {pinned}
# Disabled until Dune 2.8 is available
# ["dune" "subst"] {pinned}
[
"dune"
"build"
Expand Down
3 changes: 2 additions & 1 deletion coqide.opam
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ depends: [
"coqide-server" {= version}
]
build: [
["dune" "subst"] {pinned}
# Disabled until Dune 2.8 is available
# ["dune" "subst"] {pinned}
[
"dune"
"build"
Expand Down
5 changes: 4 additions & 1 deletion dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
(formatting
(enabled_for ocaml))

(generate_opam_files true)
; Pending on dune 2.8 as to avoid bug with dune subst
; see https://github.com/ocaml/dune/pull/3879 and
; https://github.com/ocaml/dune/pull/3879
; (generate_opam_files true)

(license LGPL-2.1-only)
(maintainers "The Coq development team <[email protected]>")
Expand Down

0 comments on commit 1e5d0d4

Please sign in to comment.